From 1a92ed6566f8f6cb0ec8dde3d91cb6d469853cd0 Mon Sep 17 00:00:00 2001
From: An Yong Shuai <1539893812@qq.com>
Date: Fri, 28 Jun 2024 10:33:17 +0800
Subject: [PATCH] =?UTF-8?q?redsi=E6=95=B0=E6=8D=AE=E6=BA=90=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E5=B9=B6=E6=B5=8B=E8=AF=95=E6=97=A0=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 22 ++++++++++++++-----
.../domian/request/InsertPlaceRequest.java | 3 ---
.../cleaning/domian/request/RedisRequest.java | 5 -----
.../serviceimpl/PlaceServiceImpl.java | 10 +++++++++
4 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6343379..34d7201 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,10 +4,11 @@
-
+
+
-
+
@@ -59,7 +60,7 @@
-
+
@@ -331,7 +332,15 @@
1719540643218
-
+
+
+ 1719541218478
+
+
+
+ 1719541218478
+
+
@@ -412,7 +421,8 @@
-
+
+
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/InsertPlaceRequest.java b/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/InsertPlaceRequest.java
index bb09643..1986bc5 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/InsertPlaceRequest.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/InsertPlaceRequest.java
@@ -40,12 +40,10 @@ public class InsertPlaceRequest {
/**
* 用户名
*/
- @NotBlank(message = "用户名不能为空")
private String username;
/**
* 密码
*/
- @NotBlank(message = "密码不能为空")
private String password;
/**
* 端口
@@ -55,7 +53,6 @@ public class InsertPlaceRequest {
/**
* 数据库名称
*/
- @NotBlank(message = "数据库不能为空")
private String dataName;
/**
* 额外配置
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/RedisRequest.java b/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/RedisRequest.java
index a63fc7d..3bc89d0 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/RedisRequest.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/domian/request/RedisRequest.java
@@ -12,11 +12,6 @@ import javax.validation.constraints.NotNull;
@Data
@Builder
public class RedisRequest {
- /**
- * 用户名
- */
- @NotBlank(message = "用户名不能为空")
- private String itemUsername;
/**
* 密码
*/
diff --git a/etl-cleaning/src/main/java/com/etl/cleaning/serviceimpl/PlaceServiceImpl.java b/etl-cleaning/src/main/java/com/etl/cleaning/serviceimpl/PlaceServiceImpl.java
index 4712fa8..302ea06 100644
--- a/etl-cleaning/src/main/java/com/etl/cleaning/serviceimpl/PlaceServiceImpl.java
+++ b/etl-cleaning/src/main/java/com/etl/cleaning/serviceimpl/PlaceServiceImpl.java
@@ -9,10 +9,12 @@ import com.etl.cleaning.domian.pojo.DateType;
import com.etl.cleaning.domian.request.InsertPlaceRequest;
import com.etl.cleaning.domian.request.MysqlRequest;
import com.etl.cleaning.domian.request.PlaceRequest;
+import com.etl.cleaning.domian.request.RedisRequest;
import com.etl.cleaning.domian.response.PlaceResponse;
import com.etl.cleaning.enums.EnumMsg;
import com.etl.cleaning.mapper.PlaceMapper;
import com.etl.cleaning.server.MysqlServerTest;
+import com.etl.cleaning.server.RedisServerTest;
import com.etl.cleaning.service.PlaceService;
import com.etl.cleaning.service.TypeService;
import org.apache.commons.lang3.StringUtils;
@@ -97,6 +99,14 @@ public class PlaceServiceImpl extends ServiceImpl implem
.build();
return this.insertItem(mysqlRequest);
}
+ if(dataPlace.getTypeId() == 2){
+ RedisRequest redisRequest = RedisRequest.builder()
+ .itemPass(dataPlace.getPassword())
+ .host(dataPlace.getDataUrl())
+ .port(Integer.valueOf(dataPlace.getPort()))
+ .build();
+ return RedisServerTest.testRedisData(redisRequest);
+ }
return "redis连接数据源失败";
}