From 59cc24f8c9312130a6beea1f6c1108ae3d8638a8 Mon Sep 17 00:00:00 2001
From: rouchen <3133657697@qq.com>
Date: Sat, 11 May 2024 14:12:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=20jdbc=20=E5=B0=81=E8=A3=85(=E6=B5=8B?=
=?UTF-8?q?=E8=AF=95=E6=88=90=E5=8A=9F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
muyu-common/muyu-common-mysql/pom.xml | 6 ++++++
.../src/main/java/com/muyu/mysql/MySqlConfig.java | 5 +++++
.../src/main/java/com/muyu/mysql/MysqlApp.java | 12 ++++++++----
.../java/com/muyu/mysql/confilg/MySqlConfilg.java | 1 +
.../src/main/java/com/muyu/mysql/dto/Mysql.java | 2 ++
.../java/com/muyu/kvt/client/pool/BaseConfig.java | 4 ++++
.../engine/remote/RuleEngineManangerService.java | 11 ++++++++---
.../factory/RuleEngineManangerServiceFactory.java | 2 --
.../engine/service/impl/RuleEngineServiceImpl.java | 3 +++
9 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/muyu-common/muyu-common-mysql/pom.xml b/muyu-common/muyu-common-mysql/pom.xml
index 77a1450..c41a833 100644
--- a/muyu-common/muyu-common-mysql/pom.xml
+++ b/muyu-common/muyu-common-mysql/pom.xml
@@ -22,6 +22,12 @@
lombok
1.18.30
+
+ mysql
+ mysql-connector-java
+ 8.0.26
+
+
diff --git a/muyu-common/muyu-common-mysql/src/main/java/com/muyu/mysql/MySqlConfig.java b/muyu-common/muyu-common-mysql/src/main/java/com/muyu/mysql/MySqlConfig.java
index 666f4c8..5d3085b 100644
--- a/muyu-common/muyu-common-mysql/src/main/java/com/muyu/mysql/MySqlConfig.java
+++ b/muyu-common/muyu-common-mysql/src/main/java/com/muyu/mysql/MySqlConfig.java
@@ -1,5 +1,7 @@
package com.muyu.mysql;
+import lombok.extern.log4j.Log4j2;
+
/**
* mysql基本定值 MySqlConfig
*
@@ -7,6 +9,7 @@ package com.muyu.mysql;
* on 2024/5/10
*/
+@Log4j2
public class MySqlConfig {
/**
@@ -17,7 +20,9 @@ public class MySqlConfig {
public static void dirver(String dirverName)
{
try {
+ //加载驱动
Class.forName(dirverName);
+ log.info("加载驱动成功");
} catch (ClassNotFoundException e) {
throw new RuntimeException(e);
}
diff --git a/muyu-common/muyu-common-mysql/src/main/java/com/muyu/mysql/MysqlApp.java b/muyu-common/muyu-common-mysql/src/main/java/com/muyu/mysql/MysqlApp.java
index 1a64d89..72fea99 100644
--- a/muyu-common/muyu-common-mysql/src/main/java/com/muyu/mysql/MysqlApp.java
+++ b/muyu-common/muyu-common-mysql/src/main/java/com/muyu/mysql/MysqlApp.java
@@ -28,12 +28,15 @@ public class MysqlApp {
Mysql mysql = new Mysql();
mysql.setId("1");
+ mysql.setName("root");
+ mysql.setSystemName("2222");
mysql.setUsername("root");
mysql.setPassword("root");
- mysql.setHost("localhost");
- mysql.setDatabaseName("data_basete");
+ mysql.setHost("127.0.0.1");
+ mysql.setDatabaseName("damo01");
mysql.setPort("3306");
- mysql.setType("mysql");
+ mysql.setType("Mysql");
+ mysql.setDriverName("com.mysql.cj.jdbc.Driver");
mysql.setConnectionParam("useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8");
mySqlConfigs.add(mysql);
@@ -47,7 +50,8 @@ public class MysqlApp {
.databaseName(mysql1.getDatabaseName())
.port(mysql1.getPort())
.type(mysql1.getType())
- .driverName(mysql1.getConnectionParam())
+ .driverName(mysql1.getDriverName())
+ .param(mysql1.getConnectionParam())
.ip(mysql1.getHost())
.build();
diff --git a/muyu-common/muyu-common-mysql/src/main/java/com/muyu/mysql/confilg/MySqlConfilg.java b/muyu-common/muyu-common-mysql/src/main/java/com/muyu/mysql/confilg/MySqlConfilg.java
index 093f31d..7fbcf38 100644
--- a/muyu-common/muyu-common-mysql/src/main/java/com/muyu/mysql/confilg/MySqlConfilg.java
+++ b/muyu-common/muyu-common-mysql/src/main/java/com/muyu/mysql/confilg/MySqlConfilg.java
@@ -45,6 +45,7 @@ public class MySqlConfilg {
*/
private String type;
+
/**
* 密码
*/
diff --git a/muyu-common/muyu-common-mysql/src/main/java/com/muyu/mysql/dto/Mysql.java b/muyu-common/muyu-common-mysql/src/main/java/com/muyu/mysql/dto/Mysql.java
index 95b18b1..7836bce 100644
--- a/muyu-common/muyu-common-mysql/src/main/java/com/muyu/mysql/dto/Mysql.java
+++ b/muyu-common/muyu-common-mysql/src/main/java/com/muyu/mysql/dto/Mysql.java
@@ -42,4 +42,6 @@ public class Mysql {
/** 数据连接参数 */
private String connectionParam;
+ private String driverName;
+
}
diff --git a/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/pool/BaseConfig.java b/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/pool/BaseConfig.java
index 0e560ff..92cfb4b 100644
--- a/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/pool/BaseConfig.java
+++ b/muyu-modules/muyu-kvt/muyu-kvt-client/src/main/java/com/muyu/kvt/client/pool/BaseConfig.java
@@ -1,11 +1,14 @@
package com.muyu.kvt.client.pool;
+import lombok.extern.log4j.Log4j2;
+
/**
* 基本定值 BaseConfig
*
* @author LeYang
* on 2024/5/9
*/
+@Log4j2
public class BaseConfig {
/**
@@ -16,6 +19,7 @@ public class BaseConfig {
public static void dirver(String dirverName){
try {
Class.forName(dirverName);
+ log.info("加载驱动成功",dirverName,Class.forName(dirverName));
}catch (ClassNotFoundException e){
throw new RuntimeException(e);
}
diff --git a/muyu-modules/muyu-rule-engine/muyu-rule-engine-remote/src/main/java/com/muyu/engine/remote/RuleEngineManangerService.java b/muyu-modules/muyu-rule-engine/muyu-rule-engine-remote/src/main/java/com/muyu/engine/remote/RuleEngineManangerService.java
index e5773db..86fcd4b 100644
--- a/muyu-modules/muyu-rule-engine/muyu-rule-engine-remote/src/main/java/com/muyu/engine/remote/RuleEngineManangerService.java
+++ b/muyu-modules/muyu-rule-engine/muyu-rule-engine-remote/src/main/java/com/muyu/engine/remote/RuleEngineManangerService.java
@@ -2,12 +2,9 @@ package com.muyu.engine.remote;
import com.muyu.common.core.constant.ServiceNameConstants;
import com.muyu.common.core.domain.Result;
-import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.engine.domain.RuleEngine;
-import com.muyu.engine.domain.req.RuleEngineQueryReq;
import com.muyu.engine.remote.factory.RuleEngineManangerServiceFactory;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import java.util.List;
@@ -18,10 +15,18 @@ import java.util.List;
* @author LeYang
* on 2024/5/9
*/
+/**
+ * 使用Feign创建的客户端注解,用于定义与服务提供者之间的通信配置。
+ * 主要用于微服务架构中,通过声明式的方式定义远程服务调用。
+ */
@FeignClient(
+ //定义上下文ID,用于区分不同的Feign客户端实例。
contextId = "RuleEngineManangerService",
+ //指定要调用的服务的名称
value = ServiceNameConstants.MUYU_RULE_ENGINE,
+ //指定服务调用失败时的回退工厂
fallbackFactory = RuleEngineManangerServiceFactory.class,
+ // 指定服务访问的路径前缀。
path = "/engine"
)
public interface RuleEngineManangerService {
diff --git a/muyu-modules/muyu-rule-engine/muyu-rule-engine-remote/src/main/java/com/muyu/engine/remote/factory/RuleEngineManangerServiceFactory.java b/muyu-modules/muyu-rule-engine/muyu-rule-engine-remote/src/main/java/com/muyu/engine/remote/factory/RuleEngineManangerServiceFactory.java
index c90d274..5ed2d88 100644
--- a/muyu-modules/muyu-rule-engine/muyu-rule-engine-remote/src/main/java/com/muyu/engine/remote/factory/RuleEngineManangerServiceFactory.java
+++ b/muyu-modules/muyu-rule-engine/muyu-rule-engine-remote/src/main/java/com/muyu/engine/remote/factory/RuleEngineManangerServiceFactory.java
@@ -1,9 +1,7 @@
package com.muyu.engine.remote.factory;
import com.muyu.common.core.domain.Result;
-import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.engine.domain.RuleEngine;
-import com.muyu.engine.domain.req.RuleEngineQueryReq;
import com.muyu.engine.remote.RuleEngineManangerService;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
diff --git a/muyu-modules/muyu-rule-engine/muyu-rule-engine-server/src/main/java/com/muyu/engine/service/impl/RuleEngineServiceImpl.java b/muyu-modules/muyu-rule-engine/muyu-rule-engine-server/src/main/java/com/muyu/engine/service/impl/RuleEngineServiceImpl.java
index 6363547..16d9e94 100644
--- a/muyu-modules/muyu-rule-engine/muyu-rule-engine-server/src/main/java/com/muyu/engine/service/impl/RuleEngineServiceImpl.java
+++ b/muyu-modules/muyu-rule-engine/muyu-rule-engine-server/src/main/java/com/muyu/engine/service/impl/RuleEngineServiceImpl.java
@@ -96,8 +96,10 @@ public class RuleEngineServiceImpl extends ServiceImpl