From 346e4036fd473430fd347fb91019fce185f1ff5b Mon Sep 17 00:00:00 2001 From: TianYu <332368756@qq.com> Date: Thu, 8 Jun 2023 12:26:38 +0800 Subject: [PATCH 01/15] =?UTF-8?q?feat:=20=E8=BF=90=E8=A1=8C=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-admin/{.env.front => .env.test} | 4 ++-- yudao-ui-admin/package.json | 3 ++- yudao-ui-admin/src/settings.js | 2 +- yudao-ui-app/config/app.js | 8 ++++++++ yudao-ui-app/package.json | 17 +++++++++++++++++ 5 files changed, 30 insertions(+), 4 deletions(-) rename yudao-ui-admin/{.env.front => .env.test} (83%) diff --git a/yudao-ui-admin/.env.front b/yudao-ui-admin/.env.test similarity index 83% rename from yudao-ui-admin/.env.front rename to yudao-ui-admin/.env.test index d36aa63b6..894171859 100644 --- a/yudao-ui-admin/.env.front +++ b/yudao-ui-admin/.env.test @@ -1,11 +1,11 @@ # 开发环境配置 -ENV = 'development' +ENV = 'test' # 页面标题 VUE_APP_TITLE = 创盈商户管理系统 # 创盈管理系统/本地环境 -VUE_APP_BASE_API = 'http://api-dashboard.yudao.iocoder.cn' +VUE_APP_BASE_API = 'http://api.nnhwl.top' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/yudao-ui-admin/package.json b/yudao-ui-admin/package.json index 295c8e0f5..3adf5bf67 100644 --- a/yudao-ui-admin/package.json +++ b/yudao-ui-admin/package.json @@ -7,10 +7,11 @@ "scripts": { "local": "vue-cli-service serve --mode local", "dev": "vue-cli-service serve --mode dev", - "front": "vue-cli-service serve --mode front", + "test": "vue-cli-service serve --mode test", "build:prod": "vue-cli-service build --mode prod", "build:stage": "vue-cli-service build --mode stage", "build:dev": "vue-cli-service build --mode dev", + "build:test": "vue-cli-service build --mode test", "build:static": "vue-cli-service build --mode static", "preview": "node build/index.js --preview", "lint": "eslint --ext .js,.vue src", diff --git a/yudao-ui-admin/src/settings.js b/yudao-ui-admin/src/settings.js index c3be16571..7c73fb448 100644 --- a/yudao-ui-admin/src/settings.js +++ b/yudao-ui-admin/src/settings.js @@ -3,7 +3,7 @@ module.exports = { /** * 推广链接域名 */ - spreadDomain: 'http://h5.cyywl.top', + spreadDomain: process.env.ENV === 'production' ? 'http://h5.cyywl.top' : 'http://h5.nnhwl.top', /** * 推广码生成访问H5链接地址 diff --git a/yudao-ui-app/config/app.js b/yudao-ui-app/config/app.js index 605d8d33c..628415493 100644 --- a/yudao-ui-app/config/app.js +++ b/yudao-ui-app/config/app.js @@ -29,7 +29,15 @@ module.exports = { //分页最多显示条数 LIMIT: 10, // 推广链接域名 + // #ifdef DEV + SPREAD_DOMAIN: 'http://h5.nnhwl.top', + // #endif + // #ifdef TEST + SPREAD_DOMAIN: 'http://h5.nnhwl.top', + // #endif + // #ifdef PROD SPREAD_DOMAIN: 'http://h5.cyywl.top', + // #endif // 推广码生成访问H5链接地址 SPREAD_LINK: '/pages/member_application/index', }; diff --git a/yudao-ui-app/package.json b/yudao-ui-app/package.json index a991192ef..24d13dabf 100644 --- a/yudao-ui-app/package.json +++ b/yudao-ui-app/package.json @@ -22,6 +22,20 @@ "UNI_PLATFORM": "h5", "isVConsole": true, "APP_BASE_URL": "http://192.168.1.188:48080" + }, + "define": { + "DEV": true + } + }, + "test": { + "title": "测试版", + "env": { + "UNI_PLATFORM": "h5", + "isVConsole": true, + "APP_BASE_URL": "http://api.nnhwl.top" + }, + "define": { + "TEST": true } }, "prod": { @@ -30,6 +44,9 @@ "UNI_PLATFORM": "h5", "isVConsole": false, "APP_BASE_URL": "http://api.cyywl.top" + }, + "define": { + "PROD": true } } } -- 2.40.1 From a9284a9842b77ddfee59f150770e3a43a901e5bb Mon Sep 17 00:00:00 2001 From: TianYu <332368756@qq.com> Date: Thu, 8 Jun 2023 12:35:05 +0800 Subject: [PATCH 02/15] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-admin/.env.test | 3 +++ 1 file changed, 3 insertions(+) diff --git a/yudao-ui-admin/.env.test b/yudao-ui-admin/.env.test index 894171859..896364001 100644 --- a/yudao-ui-admin/.env.test +++ b/yudao-ui-admin/.env.test @@ -7,6 +7,9 @@ VUE_APP_TITLE = 创盈商户管理系统 # 创盈管理系统/本地环境 VUE_APP_BASE_API = 'http://api.nnhwl.top' +# 根据服务器或域名修改 +PUBLIC_PATH = 'http://admin.nnhwl.top' + # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true -- 2.40.1 From 0b32343112d423ba21ffac7db4b1c39f2d5c549e Mon Sep 17 00:00:00 2001 From: axzsd Date: Thu, 8 Jun 2023 14:19:58 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- builds/docker-compose-test.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/builds/docker-compose-test.yml b/builds/docker-compose-test.yml index bbc9e9322..290d59145 100644 --- a/builds/docker-compose-test.yml +++ b/builds/docker-compose-test.yml @@ -25,4 +25,10 @@ services: test: ["CMD", "curl", "-f", "http://localhost:48080/actuator/health"] timeout: 30s interval: 45s - retries: 3 \ No newline at end of file + retries: 3 + networks: + - app_net +networks: + app_net: + external: true + name: cyywlnet \ No newline at end of file -- 2.40.1 From 9b0f586317d33162336116318b8b128f4e552c96 Mon Sep 17 00:00:00 2001 From: TianYu <332368756@qq.com> Date: Thu, 8 Jun 2023 15:15:08 +0800 Subject: [PATCH 04/15] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=8E=A8?= =?UTF-8?q?=E5=B9=BF=E5=91=98=E6=B3=A8=E5=86=8C=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-app/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-ui-app/App.vue b/yudao-ui-app/App.vue index 053700573..90948cb41 100644 --- a/yudao-ui-app/App.vue +++ b/yudao-ui-app/App.vue @@ -186,7 +186,7 @@ methods: { async initLoad() { this.isQRCode() - // this.isProperty() + this.isProperty() this.setSpreadId() if (this.$store.getters.isLogin && !this.$Cache.get('USER_INFO')) { await this.$store.dispatch('USERINFO'); -- 2.40.1 From 34ef8b1ed89cbf7d457b2df5d16e228c2a748b60 Mon Sep 17 00:00:00 2001 From: perry <292303709@qq.com> Date: Thu, 8 Jun 2023 15:21:35 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-server/src/main/resources/application-test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yudao-server/src/main/resources/application-test.yaml b/yudao-server/src/main/resources/application-test.yaml index d3e646ff2..0e3694b2c 100644 --- a/yudao-server/src/main/resources/application-test.yaml +++ b/yudao-server/src/main/resources/application-test.yaml @@ -169,8 +169,8 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta private-key-path: classpath:/test/apiclient_key.pem key-path: classpath:/test/apiclient_cert.p12 cert-serial-no: 47F04D51F958FFEF56A6DFC25BDE83CF89353E19 - notify-url: https://yuxy.perrymake.com/app-api/pay/wxpay/pay_notify - refund-notify-url: https://yuxy.perrymake.com/app-api/pay/wxpay/refund_notify + notify-url: http://api.nnhwl.top/app-api/pay/wxpay/pay_notify + refund-notify-url: http://api.nnhwl.top/app-api/pay/wxpay/refund_notify two: enabled: true app-id: wxb1826c88da21d81e -- 2.40.1 From 8b773d5366d1f6149af270530d3d9406300e8980 Mon Sep 17 00:00:00 2001 From: perry <292303709@qq.com> Date: Thu, 8 Jun 2023 15:26:43 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-server/src/main/resources/application-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-server/src/main/resources/application-test.yaml b/yudao-server/src/main/resources/application-test.yaml index 0e3694b2c..636f16edb 100644 --- a/yudao-server/src/main/resources/application-test.yaml +++ b/yudao-server/src/main/resources/application-test.yaml @@ -223,5 +223,5 @@ wx: database: 16 # 数据库索引 password: 20221122@dev # 密码，建议生产环境开启 phone: - query-url: http://192.168.1.94:4006/cyywl-phone-query-api/ + query-url: https://cmx.bskies.cc:8000/cyywl-phone-query-api/ token: eyIwLnR5cCI6IkpXVCIsImFsZyI6IkhTNTEyIn0 \ No newline at end of file -- 2.40.1 From dac91acc100b3be7f081cccb21845ee6749a4240 Mon Sep 17 00:00:00 2001 From: TianYu <332368756@qq.com> Date: Thu, 8 Jun 2023 15:26:48 +0800 Subject: [PATCH 07/15] =?UTF-8?q?fix:=20=E5=BE=AE=E4=BF=A1=E5=85=AC?= =?UTF-8?q?=E4=BC=97=E5=8F=B7APPID=E5=8C=BA=E5=88=86=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-app/App.vue | 8 +++++--- yudao-ui-app/config/app.js | 10 ++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/yudao-ui-app/App.vue b/yudao-ui-app/App.vue index 90948cb41..124bad61b 100644 --- a/yudao-ui-app/App.vue +++ b/yudao-ui-app/App.vue @@ -9,7 +9,9 @@ fetchMemberChangeSpreadId } from "@/api/api"; import { - HTTP_REQUEST_URL + HTTP_REQUEST_URL, + SPREAD_LINK, + WX_APP_ID } from './config/app'; import Auth from './libs/wechat.js'; import Routine from './libs/routine.js'; @@ -211,9 +213,9 @@ if (redirectUrl) { const tenantId = this.$route.query.tenantId || '' const spreadId = this.$route.query.spreadId || '' - const wechatUrl = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx7e503d9cded34c07' + const wechatUrl = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=' + WX_APP_ID location.href = - `${wechatUrl}&redirect_uri=${redirectUrl}/pages/member_application/index?tenantId=${tenantId}&spreadId=${spreadId}&response_type=code&scope=snsapi_base#wechat_redirect` + `${wechatUrl}&redirect_uri=${redirectUrl}${SPREAD_LINK}?tenantId=${tenantId}&spreadId=${spreadId}&response_type=code&scope=snsapi_base#wechat_redirect` } }, // 是否扫物业二维码 diff --git a/yudao-ui-app/config/app.js b/yudao-ui-app/config/app.js index 628415493..5e8ad7275 100644 --- a/yudao-ui-app/config/app.js +++ b/yudao-ui-app/config/app.js @@ -40,4 +40,14 @@ module.exports = { // #endif // 推广码生成访问H5链接地址 SPREAD_LINK: '/pages/member_application/index', + // 公众号APPID + // #ifdef DEV + WX_APP_ID: 'wx3b3b17449cc13a8a', + // #endif + // #ifdef TEST + WX_APP_ID: 'wx3b3b17449cc13a8a', + // #endif + // #ifdef PROD + WX_APP_ID: 'wx7e503d9cded34c07', + // #endif }; -- 2.40.1 From 1692521b7790c073df21cf731503a2e86239fe74 Mon Sep 17 00:00:00 2001 From: TianYu <332368756@qq.com> Date: Thu, 8 Jun 2023 15:45:38 +0800 Subject: [PATCH 08/15] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=B3=A8=E5=86=8C=E6=8E=A8?= =?UTF-8?q?=E5=B9=BF=E5=91=98=E9=A1=B5=E9=9D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-app/App.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yudao-ui-app/App.vue b/yudao-ui-app/App.vue index 124bad61b..1f295eb28 100644 --- a/yudao-ui-app/App.vue +++ b/yudao-ui-app/App.vue @@ -213,9 +213,10 @@ if (redirectUrl) { const tenantId = this.$route.query.tenantId || '' const spreadId = this.$route.query.spreadId || '' + const isProperty = this.$route.query.isProperty || '' const wechatUrl = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=' + WX_APP_ID location.href = - `${wechatUrl}&redirect_uri=${redirectUrl}${SPREAD_LINK}?tenantId=${tenantId}&spreadId=${spreadId}&response_type=code&scope=snsapi_base#wechat_redirect` + `${wechatUrl}&redirect_uri=${redirectUrl}${SPREAD_LINK}?tenantId=${tenantId}&spreadId=${spreadId}&isProperty=${isProperty}&response_type=code&scope=snsapi_base#wechat_redirect` } }, // 是否扫物业二维码 -- 2.40.1 From 0ff7ebece8c27244fd3e5ed28dfd61152948fbb9 Mon Sep 17 00:00:00 2001 From: tangqian Date: Thu, 8 Jun 2023 15:51:57 +0800 Subject: [PATCH 09/15] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=8E=A8?= =?UTF-8?q?=E5=B9=BF=E5=91=98=20=20=E6=96=B0=E5=A2=9E=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/controller/admin/promoter/vo/PromoterPageReqVO.java | 1 + 1 file changed, 1 insertion(+) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterPageReqVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterPageReqVO.java index 44939b62e..fe60cd55d 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterPageReqVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterPageReqVO.java @@ -24,6 +24,7 @@ public class PromoterPageReqVO extends PageParam { @Schema(description = "推广员手机号", example = "15601691300") private String mobile; + private String sourceType; /** * 帐号状态 -- 2.40.1 From acbce105f1e2c369cb10aae2fea12fb18cf22674 Mon Sep 17 00:00:00 2001 From: tangqian Date: Thu, 8 Jun 2023 15:58:57 +0800 Subject: [PATCH 10/15] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=8E=A8?= =?UTF-8?q?=E5=B9=BF=E5=91=98=20=20=E6=96=B0=E5=A2=9E=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/promoter/PromoterMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/promoter/PromoterMapper.xml b/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/promoter/PromoterMapper.xml index d1a4216e1..8f7e417de 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/promoter/PromoterMapper.xml +++ b/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/promoter/PromoterMapper.xml @@ -10,7 +10,7 @@ --> -- 2.40.1 From c3b086273576c24b69be1fd7302afd2004dc063c Mon Sep 17 00:00:00 2001 From: Jruome <2559028966@qq.com> Date: Thu, 8 Jun 2023 16:00:06 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E6=8E=A8?= =?UTF-8?q?=E5=B9=BF=E5=91=98=E6=96=B0=E5=A2=9E=E6=B3=A8=E5=86=8C=E6=9D=A5?= =?UTF-8?q?=E6=BA=90=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-admin/src/views/member/promoter/index.vue | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/yudao-ui-admin/src/views/member/promoter/index.vue b/yudao-ui-admin/src/views/member/promoter/index.vue index e73389f91..67716639b 100644 --- a/yudao-ui-admin/src/views/member/promoter/index.vue +++ b/yudao-ui-admin/src/views/member/promoter/index.vue @@ -2,7 +2,7 @@
- + + + + + + + @@ -50,6 +56,11 @@ + + +