From 0300c8c1da0f5e90855228e18187c3f2c0b7f8ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Thu, 1 Jun 2023 16:35:33 +0800 Subject: [PATCH] 'commit' --- src/main/java/com/dsideal/FengHuang/Start.java | 18 +----------------- src/main/resource/application.properties | 13 ++++--------- target/classes/application.properties | 13 ++++--------- 3 files changed, 9 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/dsideal/FengHuang/Start.java b/src/main/java/com/dsideal/FengHuang/Start.java index 1868726..8cecda7 100644 --- a/src/main/java/com/dsideal/FengHuang/Start.java +++ b/src/main/java/com/dsideal/FengHuang/Start.java @@ -132,23 +132,7 @@ public class Start extends JFinalConfig { */ @Override public void configPlugin(Plugins me) { - DruidPlugin dpMaster = createDruidPlugin(PropKit.get("master_jdbcUrl"), PropKit.get("master_user"), PropKit.get("master_password").trim(), PropKit.get("master_driverClassName")); - DruidPlugin dpSlave = createDruidPlugin(PropKit.get("slave_jdbcUrl"), PropKit.get("slave_user"), PropKit.get("slave_password").trim(), PropKit.get("slave_driverClassName")); - - Map drudMap = new HashMap<>(); - drudMap.put("ds_master", dpMaster); - drudMap.put("ds_slave", dpSlave); - - //负载均衡算法 - LoadBalanceStrategyConfiguration loadBalanceStrategyConfiguration = new LoadBalanceStrategyConfiguration("round_robin"); - MasterSlaveRuleConfiguration masterSlaveRuleConfig = - new MasterSlaveRuleConfiguration( - "device_read_write", - "ds_master", - Lists.newArrayList("ds_slave"), - loadBalanceStrategyConfiguration); - - SlaveDrudPlugin drudPlugin = new SlaveDrudPlugin(masterSlaveRuleConfig, drudMap); + DruidPlugin drudPlugin = createDruidPlugin(PropKit.get("jdbcUrl"), PropKit.get("user"), PropKit.get("password").trim(), PropKit.get("driverClassName")); me.add(drudPlugin); ActiveRecordPlugin arp = new ActiveRecordPlugin("aGroup", drudPlugin); diff --git a/src/main/resource/application.properties b/src/main/resource/application.properties index 326d291..45826d1 100644 --- a/src/main/resource/application.properties +++ b/src/main/resource/application.properties @@ -1,13 +1,8 @@ # 数据库信息 -master_driverClassName=org.postgresql.Driver -master_user=postgres -master_password=DsideaL147258369 -master_jdbcUrl=jdbc:postgresql://10.10.14.209:5432/ccdjzswd_db - -slave_driverClassName=org.postgresql.Driver -slave_user=postgres -slave_password=DsideaL147258369 -slave_jdbcUrl=jdbc:postgresql://10.10.14.209:5432/ccdjzswd_db +driverClassName=org.opengauss.Driver +user=postgres +password=DsideaL147258369 +jdbcUrl=jdbc:opengauss://10.10.14.209:5432/ccdjzswd_db # redis ip redis_ip=10.10.14.169 diff --git a/target/classes/application.properties b/target/classes/application.properties index 326d291..45826d1 100644 --- a/target/classes/application.properties +++ b/target/classes/application.properties @@ -1,13 +1,8 @@ # 数据库信息 -master_driverClassName=org.postgresql.Driver -master_user=postgres -master_password=DsideaL147258369 -master_jdbcUrl=jdbc:postgresql://10.10.14.209:5432/ccdjzswd_db - -slave_driverClassName=org.postgresql.Driver -slave_user=postgres -slave_password=DsideaL147258369 -slave_jdbcUrl=jdbc:postgresql://10.10.14.209:5432/ccdjzswd_db +driverClassName=org.opengauss.Driver +user=postgres +password=DsideaL147258369 +jdbcUrl=jdbc:opengauss://10.10.14.209:5432/ccdjzswd_db # redis ip redis_ip=10.10.14.169