SkyeYoung
diff --git a/‎.actions/ASF-Release.cfg‎
Lines changed: 10 additions & 10 deletions b/‎.actions/ASF-Release.cfg‎
Lines changed: 10 additions & 10 deletions
diff --git a/‎.asf.yaml‎
Lines changed: 0 additions & 1 deletion b/‎.asf.yaml‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎.dockerignore‎
Lines changed: 1 addition & 1 deletion b/‎.dockerignore‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/ISSUE_TEMPLATE‎
Lines changed: 0 additions & 23 deletions b/‎.github/ISSUE_TEMPLATE‎
Lines changed: 0 additions & 23 deletions
diff --git a/‎.github/ISSUE_TEMPLATE/bug-report.md‎
Lines changed: 36 additions & 0 deletions b/‎.github/ISSUE_TEMPLATE/bug-report.md‎
Lines changed: 36 additions & 0 deletions
diff --git a/‎.github/ISSUE_TEMPLATE/config.yml‎
Lines changed: 5 additions & 0 deletions b/‎.github/ISSUE_TEMPLATE/config.yml‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎.github/ISSUE_TEMPLATE/feature-request.md‎
Lines changed: 23 additions & 0 deletions b/‎.github/ISSUE_TEMPLATE/feature-request.md‎
Lines changed: 23 additions & 0 deletions
diff --git a/‎.github/workflows/backend-cli-test.yml‎
Lines changed: 31 additions & 0 deletions b/‎.github/workflows/backend-cli-test.yml‎
Lines changed: 31 additions & 0 deletions
diff --git a/‎.github/workflows/backend-e2e-test.yml‎
Lines changed: 33 additions & 0 deletions b/‎.github/workflows/backend-e2e-test.yml‎
Lines changed: 33 additions & 0 deletions
diff --git a/‎.github/workflows/backend-unit-test.yml‎
Lines changed: 74 additions & 0 deletions b/‎.github/workflows/backend-unit-test.yml‎
Lines changed: 74 additions & 0 deletions
@@ -68,16 +68,16 @@ ASFLicenseHeaderLua.txt
 .tox
 
 # Skip files containing MIT License
-scripts/verifyCommit.js
-src/components/HeaderDropdown/index.less
-src/components/HeaderDropdown/index.tsx
-src/components/NoticeIcon
-src/components/PageLoading/index.tsx
-src/components/RightContent
-src/e2e/__mocks__/antd-pro-merge-less.js
-src/e2e/baseLayout.e2e.js
-src/pages/404.tsx
-src/service-worker.js
+web/scripts/verifyCommit.js
+web/src/components/HeaderDropdown/index.less
+web/src/components/HeaderDropdown/index.tsx
+web/src/components/NoticeIcon
+web/src/components/PageLoading/index.tsx
+web/src/components/RightContent
+web/src/e2e/__mocks__/antd-pro-merge-less.js
+web/src/e2e/baseLayout.e2e.js
+web/src/pages/404.tsx
+web/src/service-worker.js
 api/build-tools/json.lua
 
 # Skip files containing Apache 2.0 License
 
@@ -24,7 +24,6 @@ github:
     - api-management
     - apisix
     - devops
-    - docker
 
   enabled_merge_buttons:
     squash: true
 
@@ -1 +1 @@
-node_modules
+**/node_modules
@@ -0,0 +1,36 @@
+---
+name: Bug report
+about: Create a bug report for the Apache APISIX Dashboard
+labels: "bug"
+---
+
+# Bug report
+
+## Describe the bug
+
+A clear and concise description of what the bug is.
+
+## How to Reproduce
+
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+## Expected behavior
+
+A clear and concise description of what you expected to happen.
+
+## Screenshots
+
+Add screenshots to help explain your problem if applicable.
+
+## System information
+
+- OS: [e.g. macOS, Windows]
+- Browser (if applies) [e.g. Chrome, Safari, Edge]
+- Version: [e.g. 2.0-rc3]
+
+## Additional context
+
+Add any other context about the problem here.
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Visit Apache APISIX
+    url: https://github.com/apache/apisix
+    about: Ask questions or discuss with other community members about Apache APISIX
@@ -0,0 +1,23 @@
+---
+name: Feature request
+about: Create a feature request for the Apache APISIX Dashboard
+labels: 'feature'
+---
+
+# Feature request
+
+## Please describe your feature
+
+A clear and concise description of what you want and what your use case is.
+
+## Describe the solution you'd like
+
+A clear and concise description of what you want to happen.
+
+## Describe alternatives you've considered
+
+A clear and concise description of any alternative solutions or features you've considered.
+
+## Additional context
+
+Add any other context or screenshots about the feature request here.
@@ -0,0 +1,31 @@
+name: Backend CLI Test
+
+on:
+  push:
+    branches:
+      - master
+      - v2.0
+  pull_request:
+    branches:
+      - master
+      - v2.0
+
+jobs:
+  run-test:
+    runs-on: ubuntu-latest
+
+    services:
+      etcd:
+        image: bitnami/etcd:3.4.13
+        ports:
+          - 2379:2379
+          - 2380:2380
+        env:
+          ALLOW_NONE_AUTHENTICATION: yes
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: run test
+        working-directory: ./api
+        run: sudo ./test/shell/cli_test.sh
@@ -0,0 +1,33 @@
+name: Backend E2E Test
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+      - v2.0
+
+jobs:
+  run-test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: setup go
+        uses: actions/setup-go@v1
+        with:
+          go-version: '1.13'
+
+      - name: run docker compose
+        working-directory: ./api/test/docker
+        run: |
+          docker-compose up -d
+          sleep 5
+          docker logs docker_managerapi_1
+
+      - name: run test
+        working-directory: ./api/test/e2e
+        run: go test
@@ -0,0 +1,74 @@
+name: Backend Unit Test
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+      - v2.0
+
+jobs:
+  run-test:
+    runs-on: ubuntu-latest
+
+    services:
+      etcd:
+        image: bitnami/etcd:3.4.13
+        ports:
+          - 2379:2379
+          - 2380:2380
+        env:
+          ALLOW_NONE_AUTHENTICATION: yes
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: get lua lib
+        run: |
+          wget https://github.com/api7/dag-to-lua/archive/v1.1.tar.gz
+          sudo mkdir -p ./api/dag-to-lua
+          tar -zxvf v1.1.tar.gz
+          sudo mv ./dag-to-lua-1.1/lib/* ./api/dag-to-lua/
+
+      - name: setup go
+        uses: actions/setup-go@v1
+        with:
+          go-version: '1.13'
+
+      - name: setup lua
+        run: |
+          sudo apt-get update
+          sudo apt-get install lua5.1
+
+      - name: run test
+        run: |
+          make api-test
+
+      - name: upload coverage profile
+        working-directory: ./api
+        run: |
+          bash <(curl -s https://codecov.io/bash)
+
+      - name: run with custom port
+        working-directory: ./api
+        run: |
+          export GO111MOUDULE=on
+          export APISIX_CONF_PATH=$PWD/conf
+          sed -i 's/8080/8088/' conf/conf.yaml
+          go build -o ./manager-api
+          ./manager-api > ./api.log 2>&1 &
+          sleep 2
+          cat ./api.log
+          cat conf/conf.yaml
+
+      - name: run with custom port
+        working-directory: ./api
+        run: |
+          curl http://127.0.0.1:8088/apisix/admin/user/login -X POST -i -d '{"username":"admin", "password": "admin"}'
+          code=$(curl -k -i -m 20 -o /dev/null -s -w %{http_code} http://127.0.0.1:8088/apisix/admin/user/login -X POST -i -d '{"username":"admin", "password": "admin"}')
+          if [ ! $code -eq 200 ]; then
+              echo "failed: failed to custom port"
+              exit 1
+          fi