From 5bd5f3bcd6d2cb375feb0756505691b551339716 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期五, 23 十二月 2022 08:55:23 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml b/safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml
index 509f3cc..ec399cb 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml
@@ -2,7 +2,7 @@
tomcat:
uri-encoding: UTF-8
basedir: /
- port: 16009
+ port: 16012
servlet:
context-path: /
@@ -14,31 +14,31 @@
type: com.alibaba.druid.pool.xa.DruidXADataSource
emergency:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.30.107:43306/safeplatform.emergency.guotai?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://192.168.30.107:43306/safeplatform.emergency.guotai.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
username: gkhy_safeplatform_guotai_out
password: a7687@i8a1Sdd
type: com.alibaba.druid.pool.DruidDataSource
goalmanage:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.30.107:43306/safeplatform.goalmanage.guotai?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://192.168.30.107:43306/safeplatform.goalmanage.guotai.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
username: gkhy_safeplatform_guotai_out
password: a7687@i8a1Sdd
type: com.alibaba.druid.pool.DruidDataSource
incidentmanage:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.30.107:43306/safeplatform.incidentmanage.guotai?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://192.168.30.107:43306/safeplatform.incidentmanage.guotai.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
username: gkhy_safeplatform_guotai_out
password: a7687@i8a1Sdd
type: com.alibaba.druid.pool.DruidDataSource
equipment:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.30.107:43306/safeplatform.equipment.guotai?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://192.168.30.107:43306/safeplatform.equipment.guotai.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
username: gkhy_safeplatform_guotai_out
password: a7687@i8a1Sdd
type: com.alibaba.druid.pool.DruidDataSource
redis:
host: 192.168.30.107
- port: 6376
+ port: 6375
password: SEF98uvs98dUAUEF90Udssa
database: 0 # Redis 数据库号，默认为 0
timeout: 15000 # Redis 连接超时时间，单位：毫秒。
@@ -57,14 +57,14 @@
nacos:
discovery:
server-addr: http://192.168.30.107:8848
- namespace: 8e59b946-36d6-4d29-81f1-27a55951b86e
+ namespace: 78fe80cc-6159-4381-8e42-1cc6c68eb22e
username: gkhy_dev_out_team
password: 9485uyJHISes09t
enabled: true
register-enabled: true
config:
server-addr: http://192.168.30.107:8848
- namespace: 8e59b946-36d6-4d29-81f1-27a55951b86e
+ namespace: 78fe80cc-6159-4381-8e42-1cc6c68eb22e
username: gkhy_dev_out_team
password: 9485uyJHISes09t
inetutils:
@@ -83,7 +83,7 @@
dubbo:
registry:
protocol: nacos
- address: nacos://192.168.30.107:8848?namespace=8e59b946-36d6-4d29-81f1-27a55951b86e&username=gkhy_dev_out_team&password=9485uyJHISes09t
+ address: nacos://192.168.30.107:8848?namespace=78fe80cc-6159-4381-8e42-1cc6c68eb22e&username=gkhy_dev_out_team&password=9485uyJHISes09t
application:
name: gkhy-safeplatform-out
scan:
@@ -91,7 +91,7 @@
base-packages: com.gkhy.safePlatform
protocol:
name: dubbo
- port: 18083
+ port: 18089
serialization: kryo
host: ${spring.cloud.client.ip-address}
consumer:
@@ -112,12 +112,12 @@
rocketmq:
name-server: 192.168.30.107:9876
producer:
- group: gkhy-safeplatform-guotai
+ group: gkhy-safeplatform-guotai-uat
sendMessageTimeout: 300000
consumer:
- group: gkhy-safeplatform-guotai
+ group: gkhy-safeplatform-guotai-uat
topic:
- demoTopic: gkhy-safeplatform-topic-demo
+ demoTopic: gkhy-safeplatform-topic-demo-uat
minio:
endPoint: 121.239.169.27
@@ -125,7 +125,7 @@
accessKey: QR0J7S55SZO8QI1TC2AD
secretKey: X0oSBT7vRqYWU41Ut21B+FU7G5A87BzPIRdObGjK
secure: false
- bucketName: safeplatform-demo
+ bucketName: safeplatform-guotai-uat
urlPrefix: http://121.239.169.27/file
#用户名 gkhy_team_out_dev
#密码 12345678
--
Gitblit v1.9.2