Merge remote-tracking branch 'origin/yjzx_test' into yjzx_dev

build/env/env.prod

@@ -8,7 +8,7 @@ namespace="wd"
 
 # 服务配置
 ## 部署节点的内网IP
-internal_ip=192.168.0.229
+internal_ip=server-1-95-67-224.ciglobal.cn
 ## 数据挂载根目录
 root_dir="/zzsn"
 ## 需根据日志配置填写，比如：logback-spring.xml
@@ -18,12 +18,12 @@ svc_env="prod"
 ## 服务名
 svc_name="think-tank"
 ## 服务端口
-svc_port="9099"
+svc_port="9098"
 
 # nacos配置
 ## 往nacos注册IP，配置文件使用变量 NACOS_REGISTER_IP
 ## nacos服务地址, 配置文件使用 NACOS_SERVER
-nacos_server="192.168.0.249:8848"
+nacos_server="server-1-95-77-159.ciglobal.cn:8848"
 ## nacos命名空间, 配置文件使用 NACOS_NAMESPACE
 nacos_namespace="smartProd"
 

build/env/env.test

@@ -8,7 +8,7 @@ namespace="wd"
 
 # 服务配置
 ## 部署节点的内网IP
-internal_ip=("192.168.0.19" "192.168.0.249")
+internal_ip=server-1-95-77-159.ciglobal.cn
 ## 数据挂载根目录
 root_dir="/zzsn"
 ## 需根据日志配置填写，比如：logback-spring.xml
@@ -23,7 +23,7 @@ svc_port="9099"
 # nacos配置
 ## 往nacos注册IP，配置文件使用变量 NACOS_REGISTER_IP
 ## nacos服务地址, 配置文件使用 NACOS_SERVER
-nacos_server="192.168.0.249:8848"
+nacos_server="server-1-95-77-159.ciglobal.cn:8848"
 ## nacos命名空间, 配置文件使用 NACOS_NAMESPACE
 nacos_namespace="smartTest"
 

src/main/resources/application-dev.yml

 server:
   port: 9099
+  tomcat:
+    max-connections: 20000
+    max-threads: 1000
+    accept-count: 800
 spring:
   cloud:
     nacos:

src/main/resources/application-prod.yml

 server:
   port: 9098
+  tomcat:
+    max-connections: 20000
+    max-threads: 1000
+    accept-count: 800
 spring:
   cloud:
     nacos:

src/main/resources/application-test.yml

 server:
   port: 9099
+  tomcat:
+    max-connections: 20000
+    max-threads: 1000
+    accept-count: 800
 spring:
   cloud:
     nacos:

src/main/resources/application.yml

@@ -37,27 +37,20 @@ spring:
       primary: master
       datasource:
         master:
-          url: jdbc:mysql://1.95.14.228:3306/clb_project?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&useSSL=false&allowMultiQueries=true
+          url: jdbc:mysql://server-1-95-14-228.ciglobal.cn:3306/clb_project?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&useSSL=false&allowMultiQueries=true
           username: ZZSN(FbEHhqzrUVSuInnt5QsXNDK7k5qR5sTIuSs7Q5766kyOpc+cmoen+H440dp8OtGB)
           password: ZZSN(w+QcMJsUKP++LPd1TZV4gGCBIu63q3/sV/tPiPnU5pNz7K490noBgohAtHOSFJS3)
           driver-class-name: com.mysql.jdbc.Driver
         slave:
-          url: jdbc:mysql://1.95.14.228:3306/clb_system?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&useSSL=false
+          url: jdbc:mysql://server-1-95-14-228.ciglobal.cn:3306/clb_system?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&useSSL=false
           username: ZZSN(FbEHhqzrUVSuInnt5QsXNDK7k5qR5sTIuSs7Q5766kyOpc+cmoen+H440dp8OtGB)
           password: ZZSN(w+QcMJsUKP++LPd1TZV4gGCBIu63q3/sV/tPiPnU5pNz7K490noBgohAtHOSFJS3)
           driver-class-name: com.mysql.jdbc.Driver
   redis:
     database: 0
-    host: 1.95.69.2
+    host: server-1-95-69-2.ciglobal.cn
     password: ZZSN(cUb0CIVzKp86PFpQXCoC0tSxQL34jLeMTTUS2j04hZoz7hp0kSpoZAUfzOIAzzXd)
     port: 6380
-  kafka:
-    bootstrap-servers: 1.95.78.131:9092
-    consumer:
-      group-id: groupName
-      auto-offset-reset: earliest
-      key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
-      value-deserializer: org.apache.kafka.common.serialization.StringDeserializer
 
 mybatis-plus:
   mapper-locations: mapper/*.xml
@@ -67,11 +60,11 @@ mybatis-plus:
 
 #生产es集群
 es1:
-  endpoint1: 1.95.38.69
+  endpoint1: server-1-95-38-69.ciglobal.cn
   endpoint1port: 9700
-  endpoint2: 1.95.3.121
+  endpoint2: server-1-95-3-121.ciglobal.cn
   endpoint2port: 9200
-  endpoint3: 1.95.87.177
+  endpoint3: server-1-95-87-177.ciglobal.cn
   endpoint3port: 9700
   username: ZZSN(2+idGBfetdfz0WDsVCeIqgauTL+BRJQl7HhgBGnpHA0I/cWg0Ztg75pxEB4CpBVb)
   password: ZZSN(BbWBiYf7Yl4QINlRP7YXxJJdhZE4+0pNlwsWTThaiVh5StDaBIqVsVN9KjcUt6Q2)