From 77f6c498a66c6f930d0f689bc64cba2619d13851 Mon Sep 17 00:00:00 2001 From: YuanHuakk <1751826683@qq.com> Date: Fri, 8 Mar 2024 18:16:34 +0800 Subject: [PATCH 1/8] ci(custom): --- drone.yml => .drone.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename drone.yml => .drone.yml (100%) diff --git a/drone.yml b/.drone.yml similarity index 100% rename from drone.yml rename to .drone.yml From 66c4c607bcee7208f99e479ea149c26817c0a3c3 Mon Sep 17 00:00:00 2001 From: YuanHuakk <1751826683@qq.com> Date: Fri, 8 Mar 2024 18:23:02 +0800 Subject: [PATCH 2/8] ci(custom): --- .drone.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 84e91a5..d946acf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -137,6 +137,10 @@ steps: - name: 微信通知 image: plugins/webhook + # 等待构建完成再发送通知 + depends_on: + - 测试服-部署 + - 正式服-部署 settings: urls: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=a2065e21-4f92-4f5b-a432-2c0cd1d965b5 content_type: application/json @@ -151,7 +155,6 @@ steps: >**提交标识**: {{ build.commit }} >**提交发起**: {{ build.author }} >**提交信息**: {{ build.message }} - >**构建耗时**: {{ job.started }}s " } } From 1c729f1e35d31c8991a99ea206b35f1fe986f476 Mon Sep 17 00:00:00 2001 From: YuanHuakk <1751826683@qq.com> Date: Fri, 8 Mar 2024 18:30:20 +0800 Subject: [PATCH 3/8] ci(custom): update .drone.yml --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index d946acf..122a122 100644 --- a/.drone.yml +++ b/.drone.yml @@ -137,10 +137,10 @@ steps: - name: 微信通知 image: plugins/webhook - # 等待构建完成再发送通知 - depends_on: - - 测试服-部署 - - 正式服-部署 + when: + status: + - success + - failure settings: urls: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=a2065e21-4f92-4f5b-a432-2c0cd1d965b5 content_type: application/json From 93bda1fa29ef2816279f9ba9e75604dee6e59a28 Mon Sep 17 00:00:00 2001 From: YuanHuakk <1751826683@qq.com> Date: Fri, 8 Mar 2024 18:48:37 +0800 Subject: [PATCH 4/8] ci(custom): update cicd --- .drone.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 122a122..670e694 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,6 +8,7 @@ platform: steps: - name: 测试服-依赖安装&&编译打包 + pull: if-not-exists image: node:20-alpine when: branch: @@ -22,6 +23,7 @@ steps: - tar -zcvf dist.tar ./dist ./default.conf ./Dockerfile - name: 正式服-依赖安装&&编译打包 + pull: if-not-exists image: node:20-alpine when: branch: @@ -36,6 +38,7 @@ steps: - tar -zcvf dist.tar ./dist ./default.conf ./Dockerfile - name: 测试服-产物上传 + pull: if-not-exists image: appleboy/drone-scp when: branch: @@ -54,6 +57,7 @@ steps: - ./dist.tar - name: 测试服-部署 + pull: if-not-exists image: appleboy/drone-ssh when: branch: @@ -81,11 +85,12 @@ steps: - else - echo "容器不存在" - fi - - docker run -d -p 8082:80 --restart=always --name jdt-admin-dev jdt-admin-dev + - docker run -d -p 8085:80 --restart=always --name jdt-admin-dev jdt-admin-dev - cd .. - rm -rf jdt-admin-dev - name: 正式服-产物上传 + pull: if-not-exists image: appleboy/drone-scp when: branch: @@ -104,6 +109,7 @@ steps: - ./dist.tar - name: 正式服-部署 + pull: if-not-exists image: appleboy/drone-ssh when: branch: @@ -135,7 +141,8 @@ steps: - cd .. - rm -rf jdt-admin-prod - - name: 微信通知 + - name: 企业微信通知 + pull: if-not-exists image: plugins/webhook when: status: From eb3c1042596afa7cbdec1ff3d7fd159033811b26 Mon Sep 17 00:00:00 2001 From: YuanHuakk <1751826683@qq.com> Date: Fri, 8 Mar 2024 18:50:55 +0800 Subject: [PATCH 5/8] ci(custom): update .drone.yml --- .drone.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.drone.yml b/.drone.yml index 670e694..1f75e1c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -145,6 +145,9 @@ steps: pull: if-not-exists image: plugins/webhook when: + branch: + - test + - main status: - success - failure From 52ef8900ff20b646bda08669c644619716b35336 Mon Sep 17 00:00:00 2001 From: YuanHuakk <1751826683@qq.com> Date: Fri, 8 Mar 2024 19:15:03 +0800 Subject: [PATCH 6/8] ci(custom): --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 1f75e1c..928c3ad 100644 --- a/.drone.yml +++ b/.drone.yml @@ -27,7 +27,7 @@ steps: image: node:20-alpine when: branch: - - master + - main commands: - npm config set registry https://registry.npmmirror.com/ - npm install -g pnpm From d1b8a8fc61866fb4c551d53c733ddb3afb3f0b0a Mon Sep 17 00:00:00 2001 From: YuanHuakk <1751826683@qq.com> Date: Fri, 8 Mar 2024 20:53:26 +0800 Subject: [PATCH 7/8] ci(custom): --- .drone.yml | 12 ---- .idea/.gitignore | 5 -- .idea/admin.iml | 12 ---- .idea/codeStyles/Project.xml | 65 -------------------- .idea/codeStyles/codeStyleConfig.xml | 5 -- .idea/git_toolbox_prj.xml | 15 ----- .idea/inspectionProfiles/Project_Default.xml | 6 -- .idea/jsLibraryMappings.xml | 6 -- .idea/jsLinters/eslint.xml | 6 -- .idea/modules.xml | 8 --- .idea/prettier.xml | 6 -- .idea/vcs.xml | 6 -- 12 files changed, 152 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/admin.iml delete mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/codeStyles/codeStyleConfig.xml delete mode 100644 .idea/git_toolbox_prj.xml delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/jsLibraryMappings.xml delete mode 100644 .idea/jsLinters/eslint.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/prettier.xml delete mode 100644 .idea/vcs.xml diff --git a/.drone.yml b/.drone.yml index 928c3ad..fb39dd7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -77,14 +77,8 @@ steps: - rm -rf dist.tar - cd jdt-admin-dev - docker build -t jdt-admin-dev . - - target_container="jdt-admin-dev" - - if docker ps -a --format '{{.Names}}' | grep -q "^$target_container$"; then - - echo "容器存在，执行操作..." - docker stop jdt-admin-dev - docker rm jdt-admin-dev - - else - - echo "容器不存在" - - fi - docker run -d -p 8085:80 --restart=always --name jdt-admin-dev jdt-admin-dev - cd .. - rm -rf jdt-admin-dev @@ -129,14 +123,8 @@ steps: - rm -rf dist.tar - cd jdt-admin-prod - cd docker build -t jdt-admin-prod . - - target_container="jdt-admin-prod" - - if docker ps -a --format '{{.Names}}' | grep -q "^$target_container$"; then - - echo "容器存在，执行操作..." - docker stop jdt-admin-prod - docker rm jdt-admin-prod - - else - - echo "容器不存在" - - fi - docker run -d -p 8085:80 --restart=always --name jdt-admin-prod jdt-admin-prod - cd .. - rm -rf jdt-admin-prod diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 10b731c..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# 默认忽略的文件 -/shelf/ -/workspace.xml -# 基于编辑器的 HTTP 客户端请求 -/httpRequests/ diff --git a/.idea/admin.iml b/.idea/admin.iml deleted file mode 100644 index 0b872d8..0000000 --- a/.idea/admin.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 7b84c3a..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index 307554b..0000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/git_toolbox_prj.xml b/.idea/git_toolbox_prj.xml deleted file mode 100644 index 38839fe..0000000 --- a/.idea/git_toolbox_prj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 03d9549..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml deleted file mode 100644 index 63326a8..0000000 --- a/.idea/jsLibraryMappings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/jsLinters/eslint.xml b/.idea/jsLinters/eslint.xml deleted file mode 100644 index e94fc66..0000000 --- a/.idea/jsLinters/eslint.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 00e73a1..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/prettier.xml b/.idea/prettier.xml deleted file mode 100644 index 8bc49dc..0000000 --- a/.idea/prettier.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index c8397c9..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From 84afb82cca13b9cd67b789c1d086988dab94b70f Mon Sep 17 00:00:00 2001 From: YuanHuakk <1751826683@qq.com> Date: Fri, 15 Mar 2024 16:02:56 +0800 Subject: [PATCH 8/8] =?UTF-8?q?feat(custom):=20=E6=96=B0=E5=A2=9E=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- src/views/system/agreement/api.js | 6 ++++ src/views/system/agreement/index.vue | 43 ++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 src/views/system/agreement/api.js create mode 100644 src/views/system/agreement/index.vue diff --git a/.drone.yml b/.drone.yml index fb39dd7..a20150a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -122,7 +122,7 @@ steps: - tar -xzvf dist.tar -C /www/builder/jdt-admin-prod - rm -rf dist.tar - cd jdt-admin-prod - - cd docker build -t jdt-admin-prod . + - docker build -t jdt-admin-prod . - docker stop jdt-admin-prod - docker rm jdt-admin-prod - docker run -d -p 8085:80 --restart=always --name jdt-admin-prod jdt-admin-prod diff --git a/src/views/system/agreement/api.js b/src/views/system/agreement/api.js new file mode 100644 index 0000000..74e1cab --- /dev/null +++ b/src/views/system/agreement/api.js @@ -0,0 +1,6 @@ +import { request } from '@/utils' + +export default { + getAgreement: () => request.post('/agreement'), + updateAgreement: (data) => request.post('/edit/agreement', data), +} diff --git a/src/views/system/agreement/index.vue b/src/views/system/agreement/index.vue new file mode 100644 index 0000000..70d51d2 --- /dev/null +++ b/src/views/system/agreement/index.vue @@ -0,0 +1,43 @@ + + + + +