Merge remote-tracking branch 'origin/master'

csm-service/cms-service-user/src/main/resources/application-dev.yml

@@ -38,12 +38,12 @@ spring:
   #        login-password: druid
   redis:
     database: 1
-    host: redis.default
+    host: 172.24.1.207
     password: ${REDIS_PASSWORD}
     port: 6379
   #rabbitMQ
   rabbitmq:
-    host: amqp-cn-zvp2ozhnj001.cn-shenzhen.amqp-0.vpc.mq.amqp.aliyuncs.com
+    host: 172.24.1.207
     port: 5672
     username: MjphbXFwLWNuLXp2cDJvemhuajAwMTpMVEFJNEZ6Q3B5ckEzM1BlZ254V1M2WFY=
     password: ${RABBITMQ_PASSWORD}
@@ -82,15 +82,15 @@ third-party:
     domain: https://saas.xzsz.ltd
     position: 市场推广
     taxFundId: 0b0376083af4435885bd5d5cd3d63053
-    authNotify: https://test.iuav.shop/userapp/xz/xzAuthNotify
-    withdrawNotify: https://test.iuav.shop/userapp/xz/xzWithdrawNotify
+    authNotify: https://test.iuav.com/userapp/xz/xzAuthNotify
+    withdrawNotify: https://test.iuav.com/userapp/xz/xzWithdrawNotify
 
 fdd:
   appid: 407664
   appkey: q146q3Cjmi7Y6BVl8jtZK9pH
   version: 2
   host: https://testapi06.fadada.com/api/
-  mmc-url: https://test.iuav.shop/userapp/
+  mmc-url: https://test.iuav.com/userapp/
 
 iuav:
   pay:

csm-service/cms-service-user/src/main/resources/application-local.yml

@@ -10,12 +10,12 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
   redis:
     database: 1
-    host: r-wz9ke310fs684hacn1pd.redis.rds.aliyuncs.com
+    host: 172.24.1.207
     port: 6379
     password: MMC@2022&REDIS
   #rabbitMQ
   rabbitmq:
-    host: amqp-cn-zvp2ozhnj001.cn-shenzhen.amqp-0.net.mq.amqp.aliyuncs.com
+    host: 172.24.1.207
     port: 5672
     username: MjphbXFwLWNuLXp2cDJvemhuajAwMTpMVEFJNEZ6Q3B5ckEzM1BlZ254V1M2WFY=
     password: RTg3OUMxQzk4NzU0NDQ4RkQ1RDg4MkEzQjY4M0M3MkQxOTM2QkEyNDoxNjUyNDA4NDk0NDg4
@@ -46,15 +46,15 @@ third-party:
     domain: https://uat.xzsz.ltd/
     position: 销售推广
     taxFundId: 8ae605f565884a1f9a5e91d5a661ce58
-    authNotify: https://test.iuav.shop/userapp/xz/xzAuthNotify
-    withdrawNotify: https://test.iuav.shop/userapp/xz/xzWithdrawNotify
+    authNotify: https://test.iuav.com/userapp/xz/xzAuthNotify
+    withdrawNotify: https://test.iuav.com/userapp/xz/xzWithdrawNotify
 
 fdd:
   appid: 407664
   appkey: q146q3Cjmi7Y6BVl8jtZK9pH
   version: 2
   host: https://testapi06.fadada.com/api/
-  mmc-url: https://test.iuav.shop/userapp/
+  mmc-url: https://test.iuav.com/userapp/
 
 iuav:
   pay:

csm-service/cms-service-user/src/main/resources/application-prod.yml

@@ -38,12 +38,12 @@ spring:
   #        login-password: druid
   redis:
     database: 5
-    host: redis.default
+    host: 172.24.1.207
     password: ${REDIS_PASSWORD}
     port: 6379
   #rabbitMQ
   rabbitmq:
-    host: amqp-cn-zvp2ozhnj001.cn-shenzhen.amqp-0.vpc.mq.amqp.aliyuncs.com
+    host: 172.24.1.207
     port: 5672
     username: MjphbXFwLWNuLXp2cDJvemhuajAwMTpMVEFJNEZ6Q3B5ckEzM1BlZ254V1M2WFY=
     password: ${RABBITMQ_PASSWORD}
@@ -74,15 +74,15 @@ third-party:
     domain: https://saas.xzsz.ltd
     position: 市场推广
     taxFundId: 0b0376083af4435885bd5d5cd3d63053
-    authNotify: https://www.iuav.shop/userapp/xz/xzAuthNotify
-    withdrawNotify: https://www.iuav.shop/userapp/xz/xzWithdrawNotify
+    authNotify: https://www.iuav.com/userapp/xz/xzAuthNotify
+    withdrawNotify: https://www.iuav.com/userapp/xz/xzWithdrawNotify
 
 fdd:
   appid: 502624
   appkey: mDWdQ0jnx0iEJuJkLdKJsc0l
   version: 2
   host: https://textapi06.fadada.com/api2/
-  mmc-url: https://www.iuav.shop/userapp/
+  mmc-url: https://www.iuav.com/userapp/
 
 iuav:
   pay: