From d12b5b41ee33e7eb57f3c3fe00f4fae53eb93388 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 06 一月 2023 09:25:44 +0800
Subject: [PATCH] 1.6
---
src/main/java/com/lf/server/service/sys/UserService.java | 7 +++----
src/main/java/com/lf/server/controller/show/ApplyController.java | 2 +-
src/main/java/com/lf/server/controller/data/MetaController.java | 2 +-
src/main/java/com/lf/server/helper/StringHelper.java | 6 +++---
src/main/java/com/lf/server/controller/all/BaseQueryController.java | 2 +-
src/main/java/com/lf/server/service/data/DataLoaderService.java | 6 ++++--
src/main/java/com/lf/server/service/data/DataUploadService.java | 6 ++++--
src/main/java/com/lf/server/controller/show/PipelineController.java | 2 +-
src/main/java/com/lf/server/controller/show/DataLibController.java | 2 +-
9 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/all/BaseQueryController.java b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
index b24d3b5..acf4298 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -416,7 +416,7 @@
if (!DownloadService.decryptPwd(reqEntity)) {
return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
}
- if (!StringHelper.checkPwdValid(reqEntity.getPwd())) {
+ if (StringHelper.isPwdInvalid(reqEntity.getPwd())) {
return fail("瀵嗙爜涓嶇鍚堣姹�");
}
diff --git a/src/main/java/com/lf/server/controller/data/MetaController.java b/src/main/java/com/lf/server/controller/data/MetaController.java
index 00e6a61..49a4110 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -357,7 +357,7 @@
if (!DownloadService.decryptPwd(reqEntity)) {
return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
}
- if (!StringHelper.checkPwdValid(reqEntity.getPwd())) {
+ if (StringHelper.isPwdInvalid(reqEntity.getPwd())) {
return fail("瀵嗙爜涓嶇鍚堣姹�");
}
diff --git a/src/main/java/com/lf/server/controller/show/ApplyController.java b/src/main/java/com/lf/server/controller/show/ApplyController.java
index 549ba52..c14488e 100644
--- a/src/main/java/com/lf/server/controller/show/ApplyController.java
+++ b/src/main/java/com/lf/server/controller/show/ApplyController.java
@@ -66,7 +66,7 @@
}
reqEntity.setPwd(AesHelper.decrypt(reqEntity.getPwd()));
- if (!StringHelper.checkPwdValid(reqEntity.getPwd())) {
+ if (StringHelper.isPwdInvalid(reqEntity.getPwd())) {
return fail("瀵嗙爜涓嶇鍚堣姹�");
}
diff --git a/src/main/java/com/lf/server/controller/show/DataLibController.java b/src/main/java/com/lf/server/controller/show/DataLibController.java
index 3a35011..0832ea0 100644
--- a/src/main/java/com/lf/server/controller/show/DataLibController.java
+++ b/src/main/java/com/lf/server/controller/show/DataLibController.java
@@ -151,7 +151,7 @@
if (!DownloadService.decryptPwd(reqEntity)) {
return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
}
- if (!StringHelper.checkPwdValid(reqEntity.getPwd())) {
+ if (StringHelper.isPwdInvalid(reqEntity.getPwd())) {
return fail("瀵嗙爜涓嶇鍚堣姹�");
}
diff --git a/src/main/java/com/lf/server/controller/show/PipelineController.java b/src/main/java/com/lf/server/controller/show/PipelineController.java
index 585991d..0dfacff 100644
--- a/src/main/java/com/lf/server/controller/show/PipelineController.java
+++ b/src/main/java/com/lf/server/controller/show/PipelineController.java
@@ -114,7 +114,7 @@
if (!DownloadService.decryptPwd(pe)) {
return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
}
- if (!StringHelper.checkPwdValid(pe.getPwd())) {
+ if (StringHelper.isPwdInvalid(pe.getPwd())) {
return fail("瀵嗙爜涓嶇鍚堣姹�");
}
diff --git a/src/main/java/com/lf/server/helper/StringHelper.java b/src/main/java/com/lf/server/helper/StringHelper.java
index a3b24cf..5ef0394 100644
--- a/src/main/java/com/lf/server/helper/StringHelper.java
+++ b/src/main/java/com/lf/server/helper/StringHelper.java
@@ -173,10 +173,10 @@
* 鏍￠獙瀵嗙爜鏄�/鍚﹀悎娉�
*
* @param pwd 瀵嗙爜
- * @return 鏄�/鍚﹀悎娉�
+ * @return 鏄�/鍚︿负鏃犳晥鐨�
*/
- public static boolean checkPwdValid(String pwd) {
- return Pattern.matches(StaticData.PWD_REG, pwd);
+ public static boolean isPwdInvalid(String pwd) {
+ return !Pattern.matches(StaticData.PWD_REG, pwd);
}
/**
diff --git a/src/main/java/com/lf/server/service/data/DataLoaderService.java b/src/main/java/com/lf/server/service/data/DataLoaderService.java
index 17543c1..92ce8e9 100644
--- a/src/main/java/com/lf/server/service/data/DataLoaderService.java
+++ b/src/main/java/com/lf/server/service/data/DataLoaderService.java
@@ -309,16 +309,18 @@
*/
private MetaEntity createMetaEntity(MetaEntity entity, MetaEntity mf, String tab, int rows, String filePath) {
MetaEntity me = new MetaEntity();
- me.setDepid(entity.getDepid());
+ me.setEventid(StringHelper.getGuid());
me.setDirid(entity.getDirid());
+ me.setDepid(entity.getDepid());
me.setVerid(entity.getVerid());
- me.setType(getType(mf.getName().toLowerCase()));
me.setName(mf.getName());
+ me.setType(getType(mf.getName().toLowerCase()));
me.setGuid(entity.getGuid());
me.setPath(FileHelper.getRelativePath(filePath));
me.setSizes(mf.getSizes());
me.setBstab(tab);
me.setBsrows(rows);
+ // me.setMdtab()
me.setCreateTime(entity.getCreateTime());
me.setCreateUser(entity.getCreateUser());
diff --git a/src/main/java/com/lf/server/service/data/DataUploadService.java b/src/main/java/com/lf/server/service/data/DataUploadService.java
index 6fab4f5..e337656 100644
--- a/src/main/java/com/lf/server/service/data/DataUploadService.java
+++ b/src/main/java/com/lf/server/service/data/DataUploadService.java
@@ -2,6 +2,7 @@
import com.lf.server.entity.data.MetaEntity;
import com.lf.server.helper.FileHelper;
+import com.lf.server.helper.StringHelper;
import com.lf.server.service.all.BaseUploadService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -70,13 +71,14 @@
*/
private MetaEntity createMetaEntity(MetaEntity entity, MetaEntity mf, String filePath) {
MetaEntity me = new MetaEntity();
- me.setDepid(entity.getDepid());
+ me.setEventid(StringHelper.getGuid());
me.setDirid(entity.getDirid());
+ me.setDepid(entity.getDepid());
me.setVerid(entity.getVerid());
+ me.setName(mf.getName());
me.setType("file");
me.setGuid(entity.getGuid());
me.setPath(FileHelper.getRelativePath(filePath));
- me.setName(mf.getName());
me.setSizes(mf.getSizes());
me.setCreateTime(entity.getCreateTime());
me.setCreateUser(entity.getCreateUser());
diff --git a/src/main/java/com/lf/server/service/sys/UserService.java b/src/main/java/com/lf/server/service/sys/UserService.java
index 7603f23..5e6c186 100644
--- a/src/main/java/com/lf/server/service/sys/UserService.java
+++ b/src/main/java/com/lf/server/service/sys/UserService.java
@@ -6,7 +6,6 @@
import com.lf.server.helper.RsaHelper;
import com.lf.server.helper.StringHelper;
import com.lf.server.mapper.sys.UserMapper;
-import com.lf.server.service.all.CommonsFileuploadService;
import com.lf.server.service.all.RedisService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -194,7 +193,7 @@
// 瑙ｅ瘑
String uid = RsaHelper.decrypt(entity.getUid());
/*String pwd = RsaHelper.decrypt(entity.getPwd());
- if (!StringHelper.checkPwdValid(pwd)) {
+ if (!StringHelper.isPwdValid(pwd)) {
return "瀵嗙爜涓嶇鍚堣姹�";
}
@@ -234,7 +233,7 @@
tokenService.setPwdErrCache(ue);
return "鏃у瘑鐮佷笉姝ｇ‘";
}
- if (!StringHelper.checkPwdValid(salt)) {
+ if (StringHelper.isPwdInvalid(salt)) {
return "瀵嗙爜涓嶇鍚堣姹�";
}
@@ -284,7 +283,7 @@
try {
String pwd = RsaHelper.decrypt(newPwd);
- if (!StringHelper.checkPwdValid(pwd)) {
+ if (StringHelper.isPwdInvalid(pwd)) {
return "瀵嗙爜涓嶇鍚堣姹�";
}
--
Gitblit v1.9.3