合并研究中心配置

src/main/resources/application-pro.yml

@@ -45,22 +45,27 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://1.95.14.228:3306/clb_project?useUnicode=true&characterEncoding=utf-8&AllowPublicKeyRetrieval=True&serverTimezone=Asia/Shanghai&autoReconnect=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://1.95.78.131:3306/clb_project_yjzx?useUnicode=true&characterEncoding=utf-8&AllowPublicKeyRetrieval=True&serverTimezone=Asia/Shanghai&autoReconnect=true&rewriteBatchedStatements=true
           username: ciglobal
-          password: _PSuWVQ4CLpX
+          password: qwer@9988&zzsn
           driver-class-name: com.mysql.cj.jdbc.Driver
         multi-datasource1:
-          url: jdbc:mysql://1.95.78.131:3306/clb_xxl_job?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://1.95.78.131:3306/clb_xxl_job_yjzx?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: ciglobal
           password: qwer@9988&zzsn
           driver-class-name: com.mysql.cj.jdbc.Driver
         multi-datasource2:
-          url: jdbc:mysql://1.95.14.228:3306/clb_system?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://1.95.78.131:3306/clb_system_yjzx?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: ciglobal
-          password: _PSuWVQ4CLpX
+          password: qwer@9988&zzsn
           driver-class-name: com.mysql.cj.jdbc.Driver
+        multi-datasource-clb:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://1.95.14.228:3306/clb_project?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
+          username: ciglobal
+          password: _PSuWVQ4CLpX
   elasticsearch:
-    uris: ["192.168.0.24:9700","192.168.0.150:9200","192.168.0.81:9700"]
+    uris: ["1.95.38.69:9700","1.95.3.121:9200","1.95.87.177:9700"] # ["192.168.0.24:9700","192.168.0.150:9200","192.168.0.81:9700"]
     username: elastic
     password: zzsn9988
     connection-timeout: 300000
@@ -69,12 +74,12 @@ spring:
     stream:
       kafka:
         binder:
-          brokers: 192.168.0.180:7092
-          zkNodes: 192.168.0.180:12181
+          brokers: 1.95.78.131:9092
+          zkNodes: 1.95.78.131:2181
           requiredAcks: 1
   redis:
     database: 0
-    host: 114.116.90.53
+    host: 1.95.69.2
     lettuce:
       pool:
         max-active: 8   #最大连接数据库连接数,设 0 为没有限制
@@ -85,7 +90,7 @@ spring:
     port: 6380
     password: RPHZgkDQ4zGJ
   kafka:
-    bootstrap-servers: 192.168.0.180:7092
+    bootstrap-servers: 1.95.78.131:9092
     producer: # 生产者
       retries: 3 # 设置大于0的值，则客户端会将发送失败的记录重新发送
       batch-size: 16384
@@ -97,15 +102,9 @@ spring:
       value-serializer: org.apache.kafka.common.serialization.StringSerializer
       properties:
         max.request.size: 335544324 #32M
-        security:
-          protocol: SASL_PLAINTEXT
-          sasl:
-            mechanism: PLAIN
-            jaas:
-              config: org.apache.kafka.common.security.plain.PlainLoginModule required username="admin" password="admin-zzsn9988";
     consumer:
       #用于标识此使用者所属的使用者组的唯一字符串
-      group-id: event-analysis-group
+      group-id: event-analysis-group-yjzx
       #当Kafka中没有初始偏移量或者服务器上不再存在当前偏移量时该怎么办，默认值为latest，表示自动将偏移重置为最新的偏移量
       #可选的值为latest, earliest, none
       auto-offset-reset: latest
@@ -117,13 +116,6 @@ spring:
       key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
       #值的反序列化器类，实现类实现了接口org.apache.kafka.common.serialization.Deserializer
       value-deserializer: org.apache.kafka.common.serialization.StringDeserializer
-      properties:
-        security:
-          protocol: SASL_PLAINTEXT
-        sasl:
-          mechanism: PLAIN
-          jaas:
-            config: org.apache.kafka.common.security.plain.PlainLoginModule required username="admin" password="admin-zzsn9988";
   main:
     allow-circular-references: true
 mybatis-plus:
@@ -135,19 +127,17 @@ obs:
   sk: heR353lvSWVPNU8pe2QxDtd8GDsO5L6PGH5eUoQY
   endPoint: https://obs.cn-north-1.myhuaweicloud.com
 scheduling:
-  enable: true
+  enable: false
   yjzxEnable: false
 serviceProject:
   url: https://clb.ciglobal.cn/clb-api/datapull/
-checkToken:
-  url: https://clb.ciglobal.cn/clb-api/sys/checkToken
 scoreRule:
   weekScore: 10
   monthScore: 5
   yearScore: 3
   beforeYearScore: 1
 translate:
-  url: http://114.116.116.241:8018/translate/getTranslateInfoWithTag
+  url: http://1.95.51.144:8018/translate/getTranslateInfoWithTag
 python:
   #python打分接口-弃用
   scoreModelUrl: http://114.116.36.231:8080/score
@@ -167,6 +157,9 @@ kafka:
     subject:
       run: subjectModelTest
 clb:
+  eventAdd: http://1.95.72.34:1688/event/third/api/saveEvent
+  eventEdit: http://1.95.72.34:1688/event/third/api/editEvent
+  eventDelete: http://1.95.72.34:1688/event/third/api/deleteEvent
   subject:
     default:
       processing: