Merge remote-tracking branch 'refs/remotes/origin/dev' into dev_user0622

# Conflicts:
#	mhd-user-center/src/main/resources/bootstrap.yml

mhd-user-center/src/main/resources/bootstrap.yml

@@ -18,19 +18,19 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 127.0.0.1:8848
+#        server-addr: 127.0.0.1:8848
         # 线上测试环境配置 容器名+端口号
 #        server-addr: 10.33.0.129:6010
-#        server-addr: 10.102.192.31:6848
-#        username: nacos
-#        password: manhuoda@2023
+        server-addr: 10.102.192.30:6848
+        username: nacos
+        password: manhuoda@2023
       config:
-        server-addr: 127.0.0.1:8848
+#        server-addr: 127.0.0.1:8848
         # 线上测试环境配置 容器名+端口号
 #        server-addr: 10.33.0.129:6010
-#        server-addr: 10.102.192.31:6848
-#        username: nacos
-#        password: manhuoda@2023
+        server-addr: 10.102.192.30:6848
+        username: nacos
+        password: manhuoda@2023
         group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
         file-extension: yml   #默认properties
         # 共享配置
@@ -42,8 +42,4 @@ spring:
       max-request-size: 50MB
 mybatis-plus:
   configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-wechat:
-  miniapp:
-    appId: wxc9dd2810a77e4e30
-    appSecret: 9354ff1215a82785ef14f2355fbf2185
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl