feat: 工单系统优化 - 修复自动跳转问题并添加用户筛选功能 #18

Merged
shiran merged 94 commits from master into deploy 2026-06-02 17:54:48 +08:00
2 changed files with 19 additions and 9 deletions
Showing only changes of commit 9974a82ac8 - Show all commits
+10 -5
View File
@@ -28,12 +28,15 @@ jobs:
run: |
pnpm build
- name: Compress artifacts
run: |
tar -czf dist.tar.gz -C ./dist .
- name: Save artifact
uses: actions/upload-artifact@v3
with:
name: vue3-build
path: |
./dist
path: dist.tar.gz
deploy:
needs: build
@@ -49,9 +52,11 @@ jobs:
mkdir -p ~/.ssh
echo "${{ secrets.PUBLICT_PRIVATE_KEY }}" > ~/.ssh/id_rsa
chmod 600 ~/.ssh/id_rsa
ssh-keyscan -H ${{ vars.WEB_SERVICE_SERVER_IP }} >> ~/.ssh/known_hosts
- name: Deploy to server
run: |
ssh-keyscan -H ${{ vars.WEB_SERVICE_SERVER_IP }} >> ~/.ssh/known_hosts
scp -o StrictHostKeyChecking=no -r ./* ${{ vars.ROOT_USER_NAME }}@${{ vars.WEB_SERVICE_SERVER_IP }}:/home/www/web-online/admin.007yjs.com/
DEPLOY_DIR="/home/www/web-online/admin.007yjs.com/"
ssh ${{ vars.ROOT_USER_NAME }}@${{ vars.WEB_SERVICE_SERVER_IP }} "mkdir -p $DEPLOY_DIR"
scp -o StrictHostKeyChecking=no dist.tar.gz ${{ vars.ROOT_USER_NAME }}@${{ vars.WEB_SERVICE_SERVER_IP }}:$DEPLOY_DIR
ssh ${{ vars.ROOT_USER_NAME }}@${{ vars.WEB_SERVICE_SERVER_IP }} "cd $DEPLOY_DIR && tar -xzf dist.tar.gz && rm -f dist.tar.gz"
+9 -4
View File
@@ -24,12 +24,15 @@ jobs:
run: |
pnpm build
- name: Compress artifacts
run: |
tar -czf dist.tar.gz -C ./dist .
- name: Save artifact
uses: actions/upload-artifact@v3
with:
name: vue3-build
path: |
./dist
path: dist.tar.gz
deploy:
needs: build
@@ -49,5 +52,7 @@ jobs:
- name: Deploy to server
run: |
scp -o StrictHostKeyChecking=no -r ./* ${{ vars.ROOT_USER_NAME }}@${{ vars.WEB_TEST_SERVER_IP }}:/www/wwwroot/apiserver_admin.s1f.ren/
DEPLOY_DIR="/www/wwwroot/apiserver_admin.s1f.ren/"
ssh ${{ vars.ROOT_USER_NAME }}@${{ vars.WEB_TEST_SERVER_IP }} "mkdir -p $DEPLOY_DIR"
scp -o StrictHostKeyChecking=no dist.tar.gz ${{ vars.ROOT_USER_NAME }}@${{ vars.WEB_TEST_SERVER_IP }}:$DEPLOY_DIR
ssh ${{ vars.ROOT_USER_NAME }}@${{ vars.WEB_TEST_SERVER_IP }} "cd $DEPLOY_DIR && tar -xzf dist.tar.gz && rm -f dist.tar.gz"