diff --git a/drone.yml b/.drone.yml similarity index 84% rename from drone.yml rename to .drone.yml index 84e91a5..a20150a 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,10 +23,11 @@ steps: - tar -zcvf dist.tar ./dist ./default.conf ./Dockerfile - name: 正式服-依赖安装&&编译打包 + pull: if-not-exists image: node:20-alpine when: branch: - - master + - main commands: - npm config set registry https://registry.npmmirror.com/ - npm install -g pnpm @@ -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: @@ -73,19 +77,14 @@ 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 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 +103,7 @@ steps: - ./dist.tar - name: 正式服-部署 + pull: if-not-exists image: appleboy/drone-ssh when: branch: @@ -122,21 +122,23 @@ 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 . - - target_container="jdt-admin-prod" - - if docker ps -a --format '{{.Names}}' | grep -q "^$target_container$"; then - - echo "容器存在，执行操作..." + - docker build -t jdt-admin-prod . - 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 - - name: 微信通知 + - name: 企业微信通知 + pull: if-not-exists image: plugins/webhook + when: + branch: + - test + - main + status: + - success + - failure settings: urls: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=a2065e21-4f92-4f5b-a432-2c0cd1d965b5 content_type: application/json @@ -151,7 +153,6 @@ steps: >**提交标识**: {{ build.commit }} >**提交发起**: {{ build.author }} >**提交信息**: {{ build.message }} - >**构建耗时**: {{ job.started }}s " } } 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 5464eeb..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,68 +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 a24f320..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - -<<<<<<< HEAD - -======= - ->>>>>>> test - - - \ 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 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 @@ + + + + +