From 0b32343112d423ba21ffac7db4b1c39f2d5c549e Mon Sep 17 00:00:00 2001
From: axzsd <atva725@qq.com>
Date: Thu, 8 Jun 2023 14:19:58 +0800
Subject: [PATCH 1/6] =?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

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 2/6] =?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');

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 3/6] =?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

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 4/6] =?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

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 5/6] =?UTF-8?q?fix:=20=E5=BE=AE=E4=BF=A1=E5=85=AC=E4=BC=97?=
 =?UTF-8?q?=E5=8F=B7APPID=E5=8C=BA=E5=88=86=E8=BF=90=E8=A1=8C=E7=8E=AF?=
 =?UTF-8?q?=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
 };

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 6/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=B3=A8=E5=86=8C=E6=8E=A8=E5=B9=BF?=
 =?UTF-8?q?=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`
         }
       },
       // 是否扫物业二维码