From f8c25d1fab78aa4e0a6bdb10f91e61698af434c4 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 01 七月 2022 14:34:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
safePlatfrom-out-web/src/main/resources/config/application-dev.yaml | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 4279034..8449e89 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
@@ -9,11 +9,17 @@
# mysql
spring:
datasource:
- one:
+ emergency:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://twt.sinanoaq.com:13306/zhongtai.demo?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
- username: root
- password: Sinanoaq#415
+ url: jdbc:mysql://192.168.0.52:3306/safeplatform.emergency.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ username: gkhy_dev_out_team
+ password: Adsdf675T6AC7yga
+ 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.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ username: gkhy_dev_out_team
+ password: Adsdf675T6AC7yga
type: com.alibaba.druid.pool.DruidDataSource
@@ -26,7 +32,7 @@
protocol: nacos
address: nacos://192.168.0.52:8848?namespace=e07a2454-136b-4498-99eb-09dae3336ebe&username=gkhy_safeplatform_out&password=9485uyJHISes09t
application:
- name: gkhy-safeplatform-account-provider
+ name: gkhy-safeplatform-out
scan:
# 扫描rpc接口定义包
base-packages: com.gkhy.safePlatform
--
Gitblit v1.9.2