From 65464dfd5fa1cca2fa052d3b91311f0849c8dcb0 Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Sun, 08 Sep 2024 09:28:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dyh-service/dyh-cust/src/main/resources/config/application-test.yml | 4 ++--
dyh-service/dyh-utils/src/main/resources/config/application-dev.yml | 2 +-
dyh-service/dyh-utils/src/main/resources/config/application-test.yml | 6 +++---
dyh-service/dyh-sync/src/main/resources/config/application-test.yml | 2 +-
dyh-service/dyh-mediate/src/main/resources/config/application-test.yml | 2 +-
dyh-service/dyh-mediate/src/main/resources/config/application-prod.yml | 2 +-
dyh-service/dyh-sync/src/main/resources/config/application-dev.yml | 2 +-
dyh-service/dyh-ssim/src/main/resources/config/application-dev.yml | 2 +-
dyh-service/dyh-sys/src/main/resources/config/application-test.yml | 4 ++--
dyh-service/dyh-utils/src/main/resources/config/application-prod.yml | 2 +-
dyh-service/dyh-sync/src/main/resources/config/application-prod.yml | 2 +-
dyh-service/dyh-ssim/src/main/resources/config/application-prod.yml | 2 +-
dyh-service/dyh-mediate/src/main/resources/config/application-dev.yml | 2 +-
dyh-service/dyh-ssim/src/main/resources/config/application-test.yml | 6 +++---
14 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/dyh-service/dyh-cust/src/main/resources/config/application-test.yml b/dyh-service/dyh-cust/src/main/resources/config/application-test.yml
index 3694c88..4934c35 100644
--- a/dyh-service/dyh-cust/src/main/resources/config/application-test.yml
+++ b/dyh-service/dyh-cust/src/main/resources/config/application-test.yml
@@ -10,9 +10,9 @@
name: dyh-cust
#数据源配置
datasource:
- url: jdbc:dm://192.168.3.51:5236?schema=gzdyh_dev
+ url: jdbc:dm://183.2.142.46:9006?schema=gzdyh_dev
username: SYSDBA
- password: hugeinfo123
+ password: SYSDBA
driver-class-name: dm.jdbc.driver.DmDriver
type: com.alibaba.druid.pool.DruidDataSource
druid:
diff --git a/dyh-service/dyh-mediate/src/main/resources/config/application-dev.yml b/dyh-service/dyh-mediate/src/main/resources/config/application-dev.yml
index 4ea8b45..6ff80d0 100644
--- a/dyh-service/dyh-mediate/src/main/resources/config/application-dev.yml
+++ b/dyh-service/dyh-mediate/src/main/resources/config/application-dev.yml
@@ -28,7 +28,7 @@
redis:
host: 183.2.142.21
port: 9017
- password: hugeinfo123
+ password: SYSDBA
# 使用的Redis数据库索引（默认为0）
database: 0
# 连接超时时间（毫秒）
diff --git a/dyh-service/dyh-mediate/src/main/resources/config/application-prod.yml b/dyh-service/dyh-mediate/src/main/resources/config/application-prod.yml
index a32c8a2..bc94b27 100644
--- a/dyh-service/dyh-mediate/src/main/resources/config/application-prod.yml
+++ b/dyh-service/dyh-mediate/src/main/resources/config/application-prod.yml
@@ -28,7 +28,7 @@
redis:
host: 183.2.142.21
port: 9017
- password: hugeinfo123
+ password: SYSDBA
# 使用的Redis数据库索引（默认为0）
database: 0
# 连接超时时间（毫秒）
diff --git a/dyh-service/dyh-mediate/src/main/resources/config/application-test.yml b/dyh-service/dyh-mediate/src/main/resources/config/application-test.yml
index 417465a..f327225 100644
--- a/dyh-service/dyh-mediate/src/main/resources/config/application-test.yml
+++ b/dyh-service/dyh-mediate/src/main/resources/config/application-test.yml
@@ -10,7 +10,7 @@
name: dyh-mediate
#数据源配置
datasource:
- url: jdbc:dm://183.2.142.46:9016?schema=gzdyh_dev
+ url: jdbc:dm://183.2.142.46:9006?schema=gzdyh_dev
username: SYSDBA
password: SYSDBA
driver-class-name: dm.jdbc.driver.DmDriver
diff --git a/dyh-service/dyh-ssim/src/main/resources/config/application-dev.yml b/dyh-service/dyh-ssim/src/main/resources/config/application-dev.yml
index 68753a3..629e8a2 100644
--- a/dyh-service/dyh-ssim/src/main/resources/config/application-dev.yml
+++ b/dyh-service/dyh-ssim/src/main/resources/config/application-dev.yml
@@ -1,7 +1,7 @@
#server配置
server:
#端口
- port: 9008
+ port: 9009
#Spring配置
spring:
diff --git a/dyh-service/dyh-ssim/src/main/resources/config/application-prod.yml b/dyh-service/dyh-ssim/src/main/resources/config/application-prod.yml
index 68753a3..629e8a2 100644
--- a/dyh-service/dyh-ssim/src/main/resources/config/application-prod.yml
+++ b/dyh-service/dyh-ssim/src/main/resources/config/application-prod.yml
@@ -1,7 +1,7 @@
#server配置
server:
#端口
- port: 9008
+ port: 9009
#Spring配置
spring:
diff --git a/dyh-service/dyh-ssim/src/main/resources/config/application-test.yml b/dyh-service/dyh-ssim/src/main/resources/config/application-test.yml
index 68753a3..e6d42a7 100644
--- a/dyh-service/dyh-ssim/src/main/resources/config/application-test.yml
+++ b/dyh-service/dyh-ssim/src/main/resources/config/application-test.yml
@@ -1,7 +1,7 @@
#server配置
server:
#端口
- port: 9008
+ port: 9009
#Spring配置
spring:
@@ -10,9 +10,9 @@
name: dyh-ssim
#数据源配置
datasource:
- url: jdbc:dm://192.168.3.51:5236?schema=gzdyh_ssim_dev
+ url: jdbc:dm://183.2.142.46:9006?schema=gzdyh_dev
username: SYSDBA
- password: hugeinfo123
+ password: SYSDBA
driver-class-name: dm.jdbc.driver.DmDriver
type: com.alibaba.druid.pool.DruidDataSource
druid:
diff --git a/dyh-service/dyh-sync/src/main/resources/config/application-dev.yml b/dyh-service/dyh-sync/src/main/resources/config/application-dev.yml
index 71a09f9..49750e6 100644
--- a/dyh-service/dyh-sync/src/main/resources/config/application-dev.yml
+++ b/dyh-service/dyh-sync/src/main/resources/config/application-dev.yml
@@ -1,7 +1,7 @@
#server配置
server:
#端口
- port: 9009
+ port: 9010
#Spring配置
spring:
diff --git a/dyh-service/dyh-sync/src/main/resources/config/application-prod.yml b/dyh-service/dyh-sync/src/main/resources/config/application-prod.yml
index 71a09f9..49750e6 100644
--- a/dyh-service/dyh-sync/src/main/resources/config/application-prod.yml
+++ b/dyh-service/dyh-sync/src/main/resources/config/application-prod.yml
@@ -1,7 +1,7 @@
#server配置
server:
#端口
- port: 9009
+ port: 9010
#Spring配置
spring:
diff --git a/dyh-service/dyh-sync/src/main/resources/config/application-test.yml b/dyh-service/dyh-sync/src/main/resources/config/application-test.yml
index 71a09f9..49750e6 100644
--- a/dyh-service/dyh-sync/src/main/resources/config/application-test.yml
+++ b/dyh-service/dyh-sync/src/main/resources/config/application-test.yml
@@ -1,7 +1,7 @@
#server配置
server:
#端口
- port: 9009
+ port: 9010
#Spring配置
spring:
diff --git a/dyh-service/dyh-sys/src/main/resources/config/application-test.yml b/dyh-service/dyh-sys/src/main/resources/config/application-test.yml
index 4a13e04..341d7ec 100644
--- a/dyh-service/dyh-sys/src/main/resources/config/application-test.yml
+++ b/dyh-service/dyh-sys/src/main/resources/config/application-test.yml
@@ -10,9 +10,9 @@
name: dyh-sys
#数据源配置
datasource:
- url: jdbc:dm://192.168.3.51:5236?schema=gzdyh_dev
+ url: jdbc:dm://183.2.142.46:9006?schema=gzdyh_dev
username: SYSDBA
- password: hugeinfo123
+ password: SYSDBA
driver-class-name: dm.jdbc.driver.DmDriver
type: com.alibaba.druid.pool.DruidDataSource
druid:
diff --git a/dyh-service/dyh-utils/src/main/resources/config/application-dev.yml b/dyh-service/dyh-utils/src/main/resources/config/application-dev.yml
index d4c079a..feeb6ca 100644
--- a/dyh-service/dyh-utils/src/main/resources/config/application-dev.yml
+++ b/dyh-service/dyh-utils/src/main/resources/config/application-dev.yml
@@ -1,7 +1,7 @@
#server配置
server:
#端口
- port: 9003
+ port: 9009
#Spring配置
spring:
diff --git a/dyh-service/dyh-utils/src/main/resources/config/application-prod.yml b/dyh-service/dyh-utils/src/main/resources/config/application-prod.yml
index d4c079a..feeb6ca 100644
--- a/dyh-service/dyh-utils/src/main/resources/config/application-prod.yml
+++ b/dyh-service/dyh-utils/src/main/resources/config/application-prod.yml
@@ -1,7 +1,7 @@
#server配置
server:
#端口
- port: 9003
+ port: 9009
#Spring配置
spring:
diff --git a/dyh-service/dyh-utils/src/main/resources/config/application-test.yml b/dyh-service/dyh-utils/src/main/resources/config/application-test.yml
index d4c079a..ace0e7e 100644
--- a/dyh-service/dyh-utils/src/main/resources/config/application-test.yml
+++ b/dyh-service/dyh-utils/src/main/resources/config/application-test.yml
@@ -1,7 +1,7 @@
#server配置
server:
#端口
- port: 9003
+ port: 9009
#Spring配置
spring:
@@ -10,9 +10,9 @@
name: dyh-utils
#数据源配置
datasource:
- url: jdbc:dm://192.168.3.51:5236?schema=gzdyh_dev
+ url: jdbc:dm://183.2.142.46:9006?schema=gzdyh_dev
username: SYSDBA
- password: hugeinfo123
+ password: SYSDBA
driver-class-name: dm.jdbc.driver.DmDriver
type: com.alibaba.druid.pool.DruidDataSource
druid:
--
Gitblit v1.8.0