Merge remote-tracking branch 'origin/master'

tmerclub-admin/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS_HOST:192.168.193.128}:${NACOS_PORT:8848}
-        username: nacos
-        password: ${NACOS_PASSWORD:hn02le.34lkdLKD}
+        server-addr: ${NACOS_HOST:101.37.204.35}:${NACOS_PORT:8848}
+        username: ${NACOS_USERNAME:nacos}
+        password: ${NACOS_PASSWORD:BYzL!Z3C}
         namespace: ${NACOS_NAMESPACE:}
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
@@ -25,5 +25,5 @@ logging:
 #  dubbo端口：默认为服务端口+2000
 dubbo:
   protocol:
-    port: ${tmerclub_DUBBO_PORT:9512}
+    port: ${tmerclub_DUBBO_PORT:11101}