From 3a1b824203d9e6a4c2a55e2d0d8adc0bae4f03d0 Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期一, 25 三月 2024 13:11:32 +0800
Subject: [PATCH] 安全物资和设备管理调整v2

---
 safePlatfrom-out-web/src/main/resources/config/application-dev.yaml |  110 ++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 84 insertions(+), 26 deletions(-)

diff --git a/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml b/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
index 6300b48..73ab71e 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
@@ -11,29 +11,59 @@
   jta:
     transaction-manager-id: txManager
   datasource:
-    type: com.alibaba.druid.pool.xa.DruidXADataSource
+    type: com.mysql.cj.jdbc.MysqlXADataSource
     emergency:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://192.168.0.52:3306/safeplatform.emergency.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-      username: gkhy_dev_out_team
-      password: Adsdf675T6AC7yga
-      type: com.alibaba.druid.pool.DruidDataSource
+      url: jdbc:mysql://localhost:3306/safeplatform.emergency.guotai.uat?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+      username: root
+      password: root
+      initialSize: 3
+      minIdle: 3
+      maxActive: 10
+      maxWait: 30000
+      validationQuery: select 1
+      validationQueryTimeout: 10000
+      testWhileIdle: true
     goalmanage:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://192.168.0.52:3306/safeplatform.goalmanage.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-      username: gkhy_dev_out_team
-      password: Adsdf675T6AC7yga
-      type: com.alibaba.druid.pool.DruidDataSource
+      url: jdbc:mysql://localhost:3306/safeplatform.goalmanage.guotai.uat?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+      username: root
+      password: root
+      initialSize: 3
+      minIdle: 3
+      maxActive: 10
+      maxWait: 30000
+      validationQuery: select 1
+      validationQueryTimeout: 10000
+      testWhileIdle: true
     incidentmanage:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://192.168.0.52:3306/safeplatform.incidentmanage.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-      username: gkhy_dev_out_team
-      password: Adsdf675T6AC7yga
-      type: com.alibaba.druid.pool.DruidDataSource
+      url: jdbc:mysql://localhost/safeplatform.incidentmanage.guotai.uat?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+      username: root
+      password: root
+      initialSize: 3
+      minIdle: 3
+      maxActive: 10
+      maxWait: 30000
+      validationQuery: select 1
+      validationQueryTimeout: 10000
+      testWhileIdle: true
+    equipment:
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      url: jdbc:mysql://localhost:3306/safeplatform.equipment.guotai.uat?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+      username: root
+      password: root
+      initialSize: 3
+      minIdle: 3
+      maxActive: 10
+      maxWait: 30000
+      validationQuery: select 1
+      validationQueryTimeout: 10000
+      testWhileIdle: true
   redis:
-    host: 192.168.0.52
+    host: 192.168.0.70
     port: 6379
-    password: SEF98uvs98dUAUEF90Udssa
+    password: root
     database: 0           # Redis 数据库号,默认为 0
     timeout: 15000        # Redis 连接超时时间,单位:毫秒。
     lettuce:
@@ -50,28 +80,33 @@
   cloud:
     nacos:
       discovery:
-        #        server-addr: nacos://121.239.169.27:18848?username=nacos&password=guokehongyu
-        #        server-addr: 192.168.0.52:8848?namespace=e07a2454-136b-4498-99eb-09dae3336ebe&username=gkhy_team_safeplatform_dev&password=nacosadmin
-        server-addr: http://192.168.0.52:8848
+        server-addr: http://192.168.0.70:8848
         namespace: e07a2454-136b-4498-99eb-09dae3336ebe
         username: gkhy_safeplatform_out
         password: 9485uyJHISes09t
         enabled: true
         register-enabled: true
       config:
-        server-addr: http://192.168.0.52:8848
+        server-addr: http://192.168.0.70:8848
         namespace: e07a2454-136b-4498-99eb-09dae3336ebe
         username: gkhy_safeplatform_out
         password: 9485uyJHISes09t
 
+  #是否允许跨域 true:允许;false:不允许
+  enableCors: true
+
 mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  global-config:
+    db-config:
+      logic-delete-value: 1
+      logic-not-delete-value: 0
 
 dubbo:
   registry:
     protocol: nacos
-    address: nacos://192.168.0.52:8848?namespace=e07a2454-136b-4498-99eb-09dae3336ebe&username=gkhy_safeplatform_out&password=9485uyJHISes09t
+    address: nacos://192.168.0.70:8848?namespace=e07a2454-136b-4498-99eb-09dae3336ebe&username=gkhy_safeplatform_out&password=9485uyJHISes09t
   application:
     name: gkhy-safeplatform-out
   scan:
@@ -87,6 +122,17 @@
     # 取消服务启动检查
     check: false
 
+#线程池配置
+threadPool:
+  corePoolSize: 20
+  maxPoolSize: 20
+  queueCapacity: 10000
+  scheduling:
+    #控制线程是否执行 true:执行;false:不执行
+    enabled: true
+#    enabled: false
+
+
 rocketmq:
   name-server: 192.168.0.52:9876
   producer:
@@ -94,17 +140,29 @@
     sendMessageTimeout: 300000
   consumer:
     group: gkhy-safeplatform-out-dev
+    safeMaterialGroup: gkhy-safeplatform-out-safeMaterialConsumer
   topic:
     demoTopic: gkhy-safeplatform-topic-demo
+    safeMaterialTopic: gkhy-safeplatform-out-safeMaterialTopic
+
 
 minio:
-  endPoint: 192.168.0.52
-  port: 9000
-  accessKey: oddER8eSv211WVG3
-  secretKey: TeaEh8eWNhBbjCYK3G6cIX2QGYECwo7M
+  endPoint: 121.239.169.27
+  port: 9001
+  accessKey: U9JW4xOeeUQOSR4f
+  secretKey: iaqQV6twR9yDZiFAf2UYr5xZfESanZs3
   secure: false
-  bucketName: safeplatform-dev
-  urlPrefix: http://192.168.0.52/file
+  bucketName: safeplatform-guotai-uat
+  urlPrefix: http://121.239.169.27:9001
+
+#minio:
+#  endPoint: 192.168.0.52
+#  port: 9000
+#  accessKey: oddER8eSv211WVG3
+#  secretKey: TeaEh8eWNhBbjCYK3G6cIX2QGYECwo7M
+#  secure: false
+#  bucketName: safeplatform-dev
+#  urlPrefix: http://192.168.0.52/file
   #用户名 gkhy_team_out_dev
   #密码 12345678
 

--
Gitblit v1.9.2