From b13227fa444e821fb4d9ee52bcc86746925fb6e8 Mon Sep 17 00:00:00 2001 From: SZH <szh_hello@163.com> Date: 星期四, 11 八月 2022 14:01:38 +0800 Subject: [PATCH] 更新配置文件 --- safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml | 65 +++++++++++++++++--------------- safePlatfrom-out-web/src/main/resources/config/application.yaml | 4 +- safePlatfrom-out-web/src/main/resources/config/application-dev.yaml | 2 - safePlatfrom-out-web/src/main/resources/config/application-test.yaml | 8 +++- 4 files changed, 42 insertions(+), 37 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 92a2ec2..f7b67cb 100644 --- a/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml +++ b/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml @@ -50,8 +50,6 @@ 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 namespace: e07a2454-136b-4498-99eb-09dae3336ebe username: gkhy_safeplatform_out 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 4c05944..0d5aae4 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 @@ -14,32 +14,31 @@ type: com.alibaba.druid.pool.xa.DruidXADataSource emergency: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.0.52:3306/safeplatform.emergency.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - &allowPublicKeyRetrieval=true - username: gkhy_out_team - password: sas@sASDa28 + url: jdbc:mysql://192.168.30.107:3306/safeplatform.emergency.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + username: root + password: NMS@uss20201! type: com.alibaba.druid.pool.DruidDataSource goalmanage: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.0.52:3306/safeplatform.goalmanage.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true - username: gkhy_out_team - password: sas@sASDa28 + url: jdbc:mysql://192.168.30.107:3306/safeplatform.goalmanage.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + username: root + password: NMS@uss20201! type: com.alibaba.druid.pool.DruidDataSource incidentmanage: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.0.52:3306/safeplatform.incidentmanage.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true - username: gkhy_out_team - password: sas@sASDa28 + url: jdbc:mysql://192.168.30.107:3306/safeplatform.incidentmanage.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + username: root + password: NMS@uss20201! type: com.alibaba.druid.pool.DruidDataSource equipment: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.0.52:3306/safeplatform.equipment.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true - username: gkhy_out_team - password: sas@sASDa28 + url: jdbc:mysql://192.168.30.107:3306/safeplatform.equipment.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + username: root + password: NMS@uss20201! type: com.alibaba.druid.pool.DruidDataSource redis: - host: 192.168.0.52 - port: 6377 + host: 192.168.30.107 + port: 6376 password: SEF98uvs98dUAUEF90Udssa database: 0 # Redis 数据库号,默认为 0 timeout: 15000 # Redis 连接超时时间,单位:毫秒。 @@ -57,19 +56,22 @@ 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 - namespace: aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f - username: gkhy_safeplatform_out + server-addr: http://192.168.30.107:8848 + namespace: 8e59b946-36d6-4d29-81f1-27a55951b86e + username: gkhy_dev_out_team password: 9485uyJHISes09t enabled: true register-enabled: true config: - server-addr: http://192.168.0.52:8848 - namespace: aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f - username: gkhy_safeplatform_out + server-addr: http://192.168.30.107:8848 + namespace: 8e59b946-36d6-4d29-81f1-27a55951b86e + username: gkhy_dev_out_team password: 9485uyJHISes09t + inetutils: + ignored-interfaces: + - VirtualBox Host-Only Network + preferred-networks: + - 192.168 #是否允许跨域 true:允许;false:不允许 enableCors: false @@ -81,16 +83,17 @@ dubbo: registry: protocol: nacos - address: nacos://192.168.0.52:8848?namespace=aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f&username=gkhy_safeplatform_out&password=9485uyJHISes09t + address: nacos://192.168.30.107:8848?namespace=8e59b946-36d6-4d29-81f1-27a55951b86e&username=gkhy_dev_out_team&password=9485uyJHISes09t application: - name: gkhy-safeplatform-out-test + name: gkhy-safeplatform-out scan: # 扫描rpc接口定义包 base-packages: com.gkhy.safePlatform protocol: name: dubbo - port: 18082 + port: 18083 serialization: kryo + host: ${spring.cloud.client.ip-address} consumer: # 服务连接超时时间 timeout: 3000 @@ -98,7 +101,7 @@ check: false rocketmq: - name-server: 192.168.0.52:9876 + name-server: 192.168.30.107:9876 producer: group: gkhy-safeplatform-guotai sendMessageTimeout: 300000 @@ -108,13 +111,13 @@ demoTopic: gkhy-safeplatform-topic-demo minio: - endPoint: 192.168.0.52 + endPoint: 121.239.169.27 port: 9000 - accessKey: oddER8eSv211WVG3 - secretKey: TeaEh8eWNhBbjCYK3G6cIX2QGYECwo7M + accessKey: QR0J7S55SZO8QI1TC2AD + secretKey: X0oSBT7vRqYWU41Ut21B+FU7G5A87BzPIRdObGjK secure: false bucketName: safeplatform-dev - urlPrefix: http://192.168.0.52/file + urlPrefix: http://121.239.169.27/file #用户名 gkhy_team_out_dev #密码 12345678 diff --git a/safePlatfrom-out-web/src/main/resources/config/application-test.yaml b/safePlatfrom-out-web/src/main/resources/config/application-test.yaml index 5e35629..36a6ba6 100644 --- a/safePlatfrom-out-web/src/main/resources/config/application-test.yaml +++ b/safePlatfrom-out-web/src/main/resources/config/application-test.yaml @@ -56,8 +56,6 @@ 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 namespace: aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f username: gkhy_safeplatform_out @@ -69,6 +67,11 @@ namespace: aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f username: gkhy_safeplatform_out password: 9485uyJHISes09t + inetutils: + ignored-interfaces: + - VirtualBox Host-Only Network + preferred-networks: + - 192.168 #是否允许跨域 true:允许;false:不允许 @@ -91,6 +94,7 @@ name: dubbo port: 18082 serialization: kryo + host: ${spring.cloud.client.ip-address} consumer: # 服务连接超时时间 timeout: 3000 diff --git a/safePlatfrom-out-web/src/main/resources/config/application.yaml b/safePlatfrom-out-web/src/main/resources/config/application.yaml index d161931..363c598 100644 --- a/safePlatfrom-out-web/src/main/resources/config/application.yaml +++ b/safePlatfrom-out-web/src/main/resources/config/application.yaml @@ -2,8 +2,8 @@ application: name: safeplatform-out profiles: -# active: test - active: guotai-demo + active: test +# active: guotai-demo #mybatis-plus: # mapper-locations: classpath:config/mapper/**/*.xml -- Gitblit v1.9.2