From a57d598b57b04862a947ac903c53f6fef2875c93 Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Wed, 12 Jan 2022 08:54:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?ci:=20=E6=9B=B4=E6=96=B0drone.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 45 ++++++++++----------------------------------- CHANGELOG.md | 3 ++- manifest.json | 8 +++++--- 3 files changed, 17 insertions(+), 39 deletions(-) diff --git a/.drone.yml b/.drone.yml index 406b920..4be8218 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,13 +19,11 @@ volumes: steps: - name: restore-cache image: drillster/drone-volume-cache + restore: true + mount: + - ./node_modules volumes: - - name: cache - path: /cache - settings: - restore: true - mount: - - ./node_modules + - /var/local/drone-cache:/cache - name: build image: node:latest @@ -34,18 +32,17 @@ steps: - name: cache path: /root/.m2 commands: + - npm config set registry http://registry.npm.taobao.org - npm i - npm run build:dev - name: rebuild-cache image: drillster/drone-volume-cache + rebuild: true + mount: + - ./node_modules volumes: - - name: cache - path: /cache - settings: - rebuild: true - mount: - - ./node_modules + - /var/local/drone-cache:/cache - name: deploy-scp image: appleboy/drone-scp @@ -91,7 +88,7 @@ steps: password: #邮箱密码 from_secret: orgsecret_password_mail_devops from: devops@ccsens.com - recipients: weizezhao@ccsens.com #收件人，多个用，隔开 + recipients: fengjun@ccsens.com #收件人，多个用，隔开 when: #执行条件 status: - success @@ -124,25 +121,3 @@ steps: trigger: branch: develop - # - name: notify-dingtalk - # image: lddsb/drone-dingtalk-message - # environment: - # PASSWORD: - # from_secret: password_mail_devops - # settings: - # token: your-dingtalk-robot-access-token - # type: markdown - # message_color: true - # message_pic: true - # sha_link: true - - # -name: notify-slack - # image: plugins/slack - # webhook: https://hooks.slack.com/ www.dijiuyy.com services/xxx/xxx/xxx - # channel: dev - # template: > - # {{#success build.status}} - # build {{build.number}} succeeded. Good job. - # {{else}} - # build {{build.number}} failed. Fix me please. - # {{/success}} diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f3f357..cc48ae0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 1.0.0 (2022-01-11) +# 1.0.0 (2022-01-12) ### 🌟 新功能 范围|描述|commitId @@ -40,6 +40,7 @@ ### 📦 持续集成 范围|描述|commitId --|--|-- + - | 修改.drone.yml | [f5b52e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f5b52e3) - | 添加drone.yml | [9fbae89](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9fbae89) diff --git a/manifest.json b/manifest.json index 5dc57cd..1dd6e2c 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { - "name" : "tall-4-project", - "appid" : "__UNI__1EC8558", + "name" : "时物链条", + "appid" : "__UNI__3CBCFFF", "description" : "", "versionName" : "1.0.0", "versionCode" : "100", @@ -43,7 +43,9 @@ /* ios打包配置 */ "ios" : {}, /* SDK配置 */ - "sdkConfigs" : {} + "sdkConfigs" : { + "ad" : {} + } } }, /* 快应用特有相关 */ From 63ec5a30915f6c02aaa579696a370e272a84c112 Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Wed, 12 Jan 2022 08:58:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?ci:=20=E6=9B=B4=E6=96=B0drone.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- CHANGELOG.md | 37 ++++++++++++++++++++----------------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4be8218..092e9f5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,7 +23,7 @@ steps: mount: - ./node_modules volumes: - - /var/local/drone-cache:/cache + - /var/lib/cache - name: build image: node:latest diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a9bbc4..db25820 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,56 +3,59 @@ ### 🌟 新功能 范围|描述|commitId --|--|-- - - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e) - - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc) - - | 日历页首页 | [561c8e6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/561c8e6) + - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a) + - | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de) + project | 日常任务面板添加 | [b3f16ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b3f16ff) + theme | theme demo | [9175758](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9175758) + - | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad) + - | 使用uview完成api请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8) + - | 手机号登录 | [565585b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/565585b) - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91) + - | 日历页首页 | [561c8e6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/561c8e6) + - | 时间轴展示 | [8b1b380](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8b1b380) - | 时间轴接口 | [a95d005](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a95d005) - | 时间轴页面 | [e926b75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e926b75) - - | 时间轴展示 | [8b1b380](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8b1b380) - - | 使用uview完成api请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8) - - | 手机号登录 | [565585b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/565585b) + - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc) - | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b) - - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e) + - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e) + - | 账户名密码登录 | [ebf456e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf456e) - | 项目列表 | [a52e6d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a52e6d5) - | 项目列表新 | [88cf48d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/88cf48d) - - | 账户名密码登录 | [ebf456e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf456e) - - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a) - - | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de) - project | 日常任务面板添加 | [b3f16ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b3f16ff) - theme | theme demo | [9175758](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9175758) - - | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad) + - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e) ### 🎨 代码样式 范围|描述|commitId --|--|-- - - | 细节调整 | [bdd5f87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bdd5f87) - | calender格式及细节调整 | [db9602b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/db9602b) + - | 细节调整 | [bdd5f87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bdd5f87) ### 🐛 Bug 修复 范围|描述|commitId --|--|-- - - | 修复一些内容 | [3cdb1ce](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3cdb1ce) app.vue | 修复获取token报错的问题 | [9120d54](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9120d54) createTask | 修复createTask v-model的问题 | [b20d3f0](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b20d3f0) - | defineExpose, defineEmits不需要引入 | [902cacc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/902cacc) + - | 修复一些内容 | [3cdb1ce](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3cdb1ce) + - | 插件接口修改 | [53c6b90](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/53c6b90) + - | 时间轴任务 | [98abdf6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/98abdf6) + - | 解决warning | [dcb0079](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/dcb0079) ### 📦 持续集成 范围|描述|commitId --|--|-- - | 修改.drone.yml | [f5b52e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f5b52e3) + - | 更新drone.yml | [a57d598](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a57d598) - | 添加drone.yml | [9fbae89](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9fbae89) - - | 修改.drone.yml | [f5b52e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f5b52e3) ### 🔨 代码重构 范围|描述|commitId --|--|-- - - | 重构project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df) - | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87) + - | 重构project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df) ### 🚀 性能优化 From 6ab95f8a815930a2f1bdef193a4f3c16e8c1ef1f Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Wed, 12 Jan 2022 09:02:02 +0800 Subject: [PATCH 3/4] =?UTF-8?q?ci:=20=E6=B5=8B=E8=AF=95ci?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- CHANGELOG.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 092e9f5..4be8218 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,7 +23,7 @@ steps: mount: - ./node_modules volumes: - - /var/lib/cache + - /var/local/drone-cache:/cache - name: build image: node:latest diff --git a/CHANGELOG.md b/CHANGELOG.md index db25820..237fc48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,6 +47,7 @@ 范围|描述|commitId --|--|-- - | 修改.drone.yml | [f5b52e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f5b52e3) + - | 更新drone.yml | [63ec5a3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/63ec5a3) - | 更新drone.yml | [a57d598](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a57d598) - | 添加drone.yml | [9fbae89](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9fbae89) From d25f2a7ec851fdb12c193a7754d3b552e03f310f Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Wed, 12 Jan 2022 09:12:28 +0800 Subject: [PATCH 4/4] =?UTF-8?q?ci:=20=E6=B5=8B=E8=AF=95ci'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 44 +++++++++++++++++++++++++++++++++++--------- CHANGELOG.md | 1 + 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4be8218..3d2c558 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,11 +19,13 @@ volumes: steps: - name: restore-cache image: drillster/drone-volume-cache - restore: true - mount: - - ./node_modules volumes: - - /var/local/drone-cache:/cache + - name: cache + path: /cache + settings: + restore: true + mount: + - ./node_modules - name: build image: node:latest @@ -38,11 +40,13 @@ steps: - name: rebuild-cache image: drillster/drone-volume-cache - rebuild: true - mount: - - ./node_modules volumes: - - /var/local/drone-cache:/cache + - name: cache + path: /cache + settings: + rebuild: true + mount: + - ./node_modules - name: deploy-scp image: appleboy/drone-scp @@ -88,7 +92,7 @@ steps: password: #邮箱密码 from_secret: orgsecret_password_mail_devops from: devops@ccsens.com - recipients: fengjun@ccsens.com #收件人，多个用，隔开 + recipients: weizezhao@ccsens.com #收件人，多个用，隔开 when: #执行条件 status: - success @@ -121,3 +125,25 @@ steps: trigger: branch: develop + # - name: notify-dingtalk + # image: lddsb/drone-dingtalk-message + # environment: + # PASSWORD: + # from_secret: password_mail_devops + # settings: + # token: your-dingtalk-robot-access-token + # type: markdown + # message_color: true + # message_pic: true + # sha_link: true + + # -name: notify-slack + # image: plugins/slack + # webhook: https://hooks.slack.com/ www.dijiuyy.com services/xxx/xxx/xxx + # channel: dev + # template: > + # {{#success build.status}} + # build {{build.number}} succeeded. Good job. + # {{else}} + # build {{build.number}} failed. Fix me please. + # {{/success}} diff --git a/CHANGELOG.md b/CHANGELOG.md index 237fc48..e8bb4c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,7 @@ - | 修改.drone.yml | [f5b52e3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f5b52e3) - | 更新drone.yml | [63ec5a3](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/63ec5a3) - | 更新drone.yml | [a57d598](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a57d598) + - | 测试ci | [6ab95f8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/6ab95f8) - | 添加drone.yml | [9fbae89](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9fbae89)