Merge remote-tracking branch 'origin/test' into test

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
+      retries: 3
+    networks:
+      - app_net
+networks:
+  app_net:
+    external: true
+    name: cyywlnet

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
@@ -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

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';
@@ -186,7 +188,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');
@@ -211,9 +213,10 @@
         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 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}/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}&isProperty=${isProperty}&response_type=code&scope=snsapi_base#wechat_redirect`
         }
       },
       // 是否扫物业二维码

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
 };