From e7e71cbb7db449743c8a9ae834f04615abede3df Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 05 九月 2022 00:11:19 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/java/com/java110/db/DataSourceConfig.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/java110-db/src/main/java/com/java110/db/DataSourceConfig.java b/java110-db/src/main/java/com/java110/db/DataSourceConfig.java
index a3bdda3..8f9dcf9 100755
--- a/java110-db/src/main/java/com/java110/db/DataSourceConfig.java
+++ b/java110-db/src/main/java/com/java110/db/DataSourceConfig.java
@@ -1,5 +1,6 @@
package com.java110.db;
+import com.java110.utils.util.StringUtil;
import org.apache.shardingsphere.shardingjdbc.api.yaml.YamlShardingDataSourceFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
@@ -41,13 +42,26 @@
String path = SHARDING_YML_PATH;
String[] actives = env.getActiveProfiles();
- if (actives != null && actives.length > 0) {
+ if (actives != null && actives.length > 0 && !"dev".equals(actives[0])) {
path = "dataSource-" + actives[0] + ".yml";
}
String configString = new String(getYmlFile(path), "UTF-8");
configString = configString.replaceAll("\\$\\{mysqlpwd\\}", env.getProperty("mysqlpwd"));
+ String mysqlPort = StringUtil.isEmpty(env.getProperty("mysqlport")) ? "3306" : env.getProperty("mysqlport");
+ configString = configString.replaceAll("\\$\\{mysqlport\\}", mysqlPort);
+
+ String dbttname = StringUtil.isEmpty(env.getProperty("dbttname")) ? "TT" : env.getProperty("dbttname");
+ String dbttuser = StringUtil.isEmpty(env.getProperty("dbttuser")) ? "TT" : env.getProperty("dbttuser");
+ String dbhcname = StringUtil.isEmpty(env.getProperty("dbhcname")) ? "hc_community" : env.getProperty("dbhcname");
+ String dbhcuser = StringUtil.isEmpty(env.getProperty("dbhcuser")) ? "hc_community" : env.getProperty("dbhcuser");
+
+ configString = configString.replaceAll("\\$\\{dbttname\\}", dbttname)
+ .replaceAll("\\$\\{dbttuser\\}", dbttuser)
+ .replaceAll("\\$\\{dbhcname\\}", dbhcname)
+ .replaceAll("\\$\\{dbhcuser\\}", dbhcuser);
+
return YamlShardingDataSourceFactory.createDataSource(configString.getBytes("UTF-8"));
}
--
Gitblit v1.8.0