diff --git a/kh-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java b/kh-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java
index 19ae25b6..bbfb544a 100644
--- a/kh-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java
+++ b/kh-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java
@@ -83,17 +83,19 @@ public class LoginServiceImpl implements ILoginService {
return Results.error(CommonConstant.SC_RSA_TIMEOUT_600, "页面过期,将刷新页面");
}
- String captcha = sysLoginModel.getCaptcha();
- if(captcha==null){
- return Results.error("验证码无效");
- }
- String lowerCaseCaptcha = captcha.toLowerCase();
- String realKey = MD5Util.MD5Encode(lowerCaseCaptcha + sysLoginModel.getCheckKey(), UTF_8);
- Object checkCode = redisUtil.get(realKey);
- // 验证码前后端比较
- if(checkCode == null || !checkCode.toString().equals(lowerCaseCaptcha)) {
- return Results.error("验证码错误");
- }
+// String captcha = sysLoginModel.getCaptcha();
+// if(captcha==null){
+// return Results.error("验证码无效");
+// }
+// String lowerCaseCaptcha = captcha.toLowerCase();
+// String realKey = MD5Util.MD5Encode(lowerCaseCaptcha + sysLoginModel.getCheckKey(), UTF_8);
+// Object checkCode = redisUtil.get(realKey);
+// // 验证码前后端比较
+// if(checkCode == null || !checkCode.toString().equals(lowerCaseCaptcha)) {
+// return Results.error("验证码错误");
+// }
+// redisUtil.del(realKey);
+
try {
//解密获取密码和用户名
@@ -140,9 +142,6 @@ public class LoginServiceImpl implements ILoginService {
//用户登录信息
userInfo(sysUser, result);
- //update-begin--Author:liusq Date:20210126 for:登录成功,删除redis中的验证码
- redisUtil.del(realKey);
- //update-begin--Author:liusq Date:20210126 for:登录成功,删除redis中的验证码
//update-begin--Author:wangshuai Date:20200714 for:登录日志没有记录人员
LoginUser loginUser = new LoginUser();
BeanUtils.copyProperties(sysUser, loginUser);
diff --git a/kh-modules/pom.xml b/kh-modules/pom.xml
index 95bc4231..957ff1fa 100644
--- a/kh-modules/pom.xml
+++ b/kh-modules/pom.xml
@@ -19,5 +19,17 @@
com.jero.boot
jero-system-local-api
+
+
+ com.github.javafaker
+ javafaker
+ 1.0.2
+
+
+ org.yaml
+ snakeyaml
+
+
+
diff --git a/kh-modules/src/main/java/com/jero/modules/service/impl/KhOilRealtimeDataServiceImpl.java b/kh-modules/src/main/java/com/jero/modules/service/impl/KhOilRealtimeDataServiceImpl.java
index fa7604a9..f56fd4c8 100644
--- a/kh-modules/src/main/java/com/jero/modules/service/impl/KhOilRealtimeDataServiceImpl.java
+++ b/kh-modules/src/main/java/com/jero/modules/service/impl/KhOilRealtimeDataServiceImpl.java
@@ -9,9 +9,12 @@ import com.jero.common.exception.JeroBootException;
import java.util.List;
import java.util.Date;
import java.util.Map;
+import com.github.javafaker.Faker;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.system.query.QueryGenerator;
+
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -25,6 +28,7 @@ import javax.servlet.http.HttpServletRequest;
@Transactional(rollbackFor = JeroBootException.class)
public class KhOilRealtimeDataServiceImpl extends ServiceImpl implements IKhOilRealtimeDataService {
+ private final Faker faker = new Faker();
/**
* 列表查询
@@ -67,6 +71,13 @@ public class KhOilRealtimeDataServiceImpl extends ServiceImpl realtimeDataResults(String id) {
KhOilRealtimeData khOilRealtimeData = new KhOilRealtimeData();
+
+
return null;
}
+
+ private double getRandomDouble() {
+ // 生成一个在0到100之间,小数点后有2位的随机浮点数
+ return faker.number().randomDouble(2, 0, 100);
+ }
}
diff --git a/pom.xml b/pom.xml
index a2bc2d92..2a5a4431 100644
--- a/pom.xml
+++ b/pom.xml
@@ -191,6 +191,18 @@
${commons-beanutils.version}
+
+ com.github.javafaker
+ javafaker
+ 1.0.2
+
+
+ org.yaml
+ snakeyaml
+
+
+
+
commons-fileupload
commons-fileupload