From dbeead477d7da60b58534bd650d6c7b293703b15 Mon Sep 17 00:00:00 2001 From: fbc <1009345994@qq.com> Date: Tue, 27 Sep 2022 19:20:13 +0800 Subject: [PATCH] =?UTF-8?q?v1.0=20:=20=E8=B0=83=E6=95=B4nacos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap.yaml | 2 +- .../src/main/resources/bootstrap.yaml | 2 +- .../src/main/resources/bootstrap.yaml | 2 +- .../src/main/resources/bootstrap.yaml | 2 +- .../src/test/resources/application-native.yml | 44 ++++++++++++------- .../src/test/resources/bootstrap.yaml | 4 +- 6 files changed, 34 insertions(+), 22 deletions(-) diff --git a/accompany-admin/accompany-admin-web/src/main/resources/bootstrap.yaml b/accompany-admin/accompany-admin-web/src/main/resources/bootstrap.yaml index d557fa5b0..7e0206f1c 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/bootstrap.yaml +++ b/accompany-admin/accompany-admin-web/src/main/resources/bootstrap.yaml @@ -7,7 +7,7 @@ spring: nacos: config: server-addr: 120.24.160.102:8848 - namespace: f69a0ab8-f504-4516-9017-20017bd83fef + namespace: 5edc3246-3e69-4be5-a32a-273f0a09ddf6 name: ${spring.application.name} file-extension: yml shared-dataids: application.yml,thirdpart.yml,pay.yml,database.yml,sysconf.yml diff --git a/accompany-admin/accompany-flow-team-admin-web/src/main/resources/bootstrap.yaml b/accompany-admin/accompany-flow-team-admin-web/src/main/resources/bootstrap.yaml index 7f03788a4..05d5cf2e0 100644 --- a/accompany-admin/accompany-flow-team-admin-web/src/main/resources/bootstrap.yaml +++ b/accompany-admin/accompany-flow-team-admin-web/src/main/resources/bootstrap.yaml @@ -7,7 +7,7 @@ spring: nacos: config: server-addr: 120.24.160.102:8848 - namespace: f69a0ab8-f504-4516-9017-20017bd83fef + namespace: 5edc3246-3e69-4be5-a32a-273f0a09ddf6 name: ${spring.application.name} file-extension: yml shared-dataids: application.yml,thirdpart.yml,pay.yml,database.yml,sysconf.yml diff --git a/accompany-oauth2/accompany-oauth2-web/src/main/resources/bootstrap.yaml b/accompany-oauth2/accompany-oauth2-web/src/main/resources/bootstrap.yaml index a36db6dc6..375be39b1 100644 --- a/accompany-oauth2/accompany-oauth2-web/src/main/resources/bootstrap.yaml +++ b/accompany-oauth2/accompany-oauth2-web/src/main/resources/bootstrap.yaml @@ -7,7 +7,7 @@ spring: nacos: config: server-addr: 120.24.160.102:8848 - namespace: f69a0ab8-f504-4516-9017-20017bd83fef + namespace: 5edc3246-3e69-4be5-a32a-273f0a09ddf6 name: ${spring.application.name} file-extension: yml shared-dataids: application.yml,thirdpart.yml,pay.yml,database.yml,sysconf.yml diff --git a/accompany-scheduler/accompany-scheduler-web/src/main/resources/bootstrap.yaml b/accompany-scheduler/accompany-scheduler-web/src/main/resources/bootstrap.yaml index e5fc6a37e..e44bcb684 100644 --- a/accompany-scheduler/accompany-scheduler-web/src/main/resources/bootstrap.yaml +++ b/accompany-scheduler/accompany-scheduler-web/src/main/resources/bootstrap.yaml @@ -7,7 +7,7 @@ spring: nacos: config: server-addr: 120.24.160.102:8848 - namespace: f69a0ab8-f504-4516-9017-20017bd83fef + namespace: 5edc3246-3e69-4be5-a32a-273f0a09ddf6 name: ${spring.application.name} file-extension: yml shared-dataids: application.yml,thirdpart.yml,pay.yml,database.yml,sysconf.yml diff --git a/xuanyin-game-match/src/test/resources/application-native.yml b/xuanyin-game-match/src/test/resources/application-native.yml index 7a897ef44..8c6948e7d 100644 --- a/xuanyin-game-match/src/test/resources/application-native.yml +++ b/xuanyin-game-match/src/test/resources/application-native.yml @@ -1,9 +1,9 @@ #MySQL数据库配置 spring: datasource: - url: jdbc:mysql://47.106.199.67:3306/xchat?characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=true&autoReconnect=true&serverTimezone=Asia/Shanghai - username: accompany - password: accompany@dev#mysql + url: jdbc:mysql://118.194.255.128:3306/peko?useUnicode=true&characterEncoding=UTF-8&tinyInt1isBit=false + username: root + password: anan@dev## driver-class-name: com.mysql.jdbc.Driver druid: initial-size: 5 @@ -29,25 +29,35 @@ spring: connection-timeout: 30000 data: mongodb: - host: 47.106.199.67 + host: 118.194.255.128 port: 27017 - username: accompany - password: accompany@dev## - database: accompany + username: peko + password: peko@mongo@dev#! + database: peko redis: - host: 47.106.199.67 + host: 118.194.255.128 port: 6200 - password: accompany@redis@#! - maxTotal: 300 - maxIdle: 300 - minIdle: 20 - maxWait: 3000 + maxTotal: 100 + maxIdle: 50 + maxWait: 2500 testOnBorrow: true testOnReturn: true + password: anan@dev@redis@#! + database: 1 + redisson: + # file: classpath:redisson.yaml + config: | + singleServerConfig: + address: redis://118.194.255.128:6200 + password: anan@dev@redis@#! + threads: 16 + nettyThreads: 32 + codec: ! {} + transportMode: "NIO" ##activemq 配置 activemq: - brokerUrl: tcp://47.106.199.67:61618 + brokerUrl: tcp://118.194.255.128:61619 user: system password: manager maxConnections: 50 @@ -56,7 +66,9 @@ activemq: ## ES配置 elasticsearch: clusterName: elasticsearch - hostName: 47.106.199.67 + hostName: es-cn-2r42lphv9000nvr61.public.elasticsearch.aliyuncs.com port: 9200 username: elastic - password: changeme \ No newline at end of file + password: xuanyin@es123 + roomIndex: yinyou_dev_room + userIndex: yinyou_dev_users_202204121516 \ No newline at end of file diff --git a/xuanyin-game-match/src/test/resources/bootstrap.yaml b/xuanyin-game-match/src/test/resources/bootstrap.yaml index 234c60f59..52c2d48e0 100644 --- a/xuanyin-game-match/src/test/resources/bootstrap.yaml +++ b/xuanyin-game-match/src/test/resources/bootstrap.yaml @@ -7,7 +7,7 @@ spring: nacos: config: server-addr: 120.24.160.102:8848 - namespace: f69a0ab8-f504-4516-9017-20017bd83fef + namespace: 5edc3246-3e69-4be5-a32a-273f0a09ddf6 name: ${spring.application.name} file-extension: yml shared-dataids: application.yml,thirdpart.yml,pay.yml,sysconf.yml @@ -19,7 +19,7 @@ spring: nacos: config: server-addr: 120.24.160.102:8848 - namespace: f69a0ab8-f504-4516-9017-20017bd83fef + namespace: 5edc3246-3e69-4be5-a32a-273f0a09ddf6 name: ${spring.application.name} file-extension: yml shared-dataids: application.yml,thirdpart.yml,pay.yml,database.yml,sysconf.yml