From 8ce578f52d2dc071beb043560baded7803787f07 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 06 九月 2023 17:36:22 +0800
Subject: [PATCH] 删除鹓雏管理端的时间限制
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java | 11 +--
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java | 16 +----
user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserLoginUtils.java | 88 +++++++++-------------------
sys/src/main/resources/application-dev.yml | 6 +-
4 files changed, 40 insertions(+), 81 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java
index 66570c2..706aff9 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java
@@ -2,11 +2,11 @@
import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.limslaboratory.mapper.*;
-import com.yuanchu.limslaboratory.pojo.*;
+import com.yuanchu.limslaboratory.pojo.Inspection;
+import com.yuanchu.limslaboratory.pojo.InspectionProduct;
+import com.yuanchu.limslaboratory.pojo.NonConformanceReview;
+import com.yuanchu.limslaboratory.pojo.Report;
import com.yuanchu.limslaboratory.service.PlanService;
import com.yuanchu.limslaboratory.utils.MyUtil;
import org.springframework.stereotype.Service;
@@ -15,7 +15,6 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.Arrays;
-import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -132,12 +131,10 @@
//鏇存柊妫�楠屽崟
inspectionMapper.updateById(inspection);
//娣诲姞涓嶅悎鏍间俊鎭埌璇勫
- inspectionMapper
NonConformanceReview nonConformanceReview = new NonConformanceReview();
LocalDateTime localDateTime = DateUtil.toLocalDateTime(DateUtil.date());
nonConformanceReview.setCreatedTime(localDateTime);
nonConformanceReview.setUpdatedTime(localDateTime);
- nonConformanceReview.set
} else if (count == results.size()) {
Inspection inspection = new Inspection();
inspection.setId(id);
diff --git a/sys/src/main/resources/application-dev.yml b/sys/src/main/resources/application-dev.yml
index 3aad5b5..c596122 100644
--- a/sys/src/main/resources/application-dev.yml
+++ b/sys/src/main/resources/application-dev.yml
@@ -40,12 +40,12 @@
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
-# url: jdbc:mysql://192.168.110.209:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
-# username: user
-# password: 123456
url: jdbc:mysql://192.168.218.113:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
username: user
password: 123456
+# url: jdbc:mysql://localhost:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+# username: root
+# password: 123456
druid:
# Druid鏁版嵁婧愰厤缃�
initialSize: 5 # 鍒濆杩炴帴鏁�
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserLoginUtils.java b/user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserLoginUtils.java
index c748854..43189b1 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserLoginUtils.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/clients/UserLoginUtils.java
@@ -2,81 +2,51 @@
import cn.hutool.crypto.SecureUtil;
import cn.hutool.crypto.symmetric.AES;
-import com.yuanchu.limslaboratory.mapper.RoleManageMapper;
-import com.yuanchu.limslaboratory.mapper.UserMapper;
-import com.yuanchu.limslaboratory.pojo.Menu;
-import com.yuanchu.limslaboratory.pojo.RoleMenu;
import com.yuanchu.limslaboratory.pojo.User;
-import com.yuanchu.limslaboratory.pojo.dto.RoleAndMenuDto;
import com.yuanchu.limslaboratory.shiro.utils.JwtUtils;
-import com.yuanchu.limslaboratory.utils.MyUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.vo.Result;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import javax.annotation.Resource;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
@Component
public class UserLoginUtils {
- @Resource
- private UserClient userClient;
-
- @Value("${login.userID}")
- private String LoginUserID;
-
- @Value("${login.secret}")
- private String LoginSecret;
-
+ @Autowired
+ private JwtUtils jwtUtils;
public Result<Map<String, Object>> LoginExamine(User user){
- Map<String, Object> mapData = new HashMap<>();
- mapData.put("LoginUserID", LoginUserID);
- mapData.put("LoginSecret", LoginSecret);
- Result<?> code = userClient.BusynessUserLogin(mapData);
- if (code.getCode() == 200){
- Result<?> result = userClient.BusynessUserLoginToken(code.getData().toString());
- if (result.getCode() == 200){
- Map data = (Map) result.getData();
- String token = data.get("token").toString();
- data.remove("token");
- HashMap<String, Object> mapRedis = new HashMap<>();
- mapRedis.put("id", user.getId());
- mapRedis.put("account", user.getAccount());
- mapRedis.put("name", user.getName());
- mapRedis.put("enterpriseId", user.getEnterpriseId());
- mapRedis.put("data", data);
- String adminMD5 = SecureUtil.md5(SecureUtil.md5(user.getAccount()));
- // 鏋勫缓
- AES aes = SecureUtil.aes(adminMD5.getBytes(StandardCharsets.UTF_8));
- String admins = aes.encryptHex(user.getAccount());
- mapRedis.put("sessionLayerId", SecureUtil.md5(admins));
- mapRedis.put("roleId",user.getRoleId());
- //瀛樺叆redis,浜屼釜灏忔椂鍚庡垹闄�
- RedisUtil.set(token, mapRedis, 120);
- //
- RedisUtil.set("access_token",token,120);
- // 灏嗙鍙戠殑 JWT token 杩斿洖缁欏墠绔�
- HashMap<String, Object> map = new HashMap<>();
- String refresh = JwtUtils.sign(user.getAccount());
- map.put("token", token);
- map.put("refresh", refresh);
- RedisUtil.set(user.getAccount(), map, 168);
- return Result.success(map);
- } else {
- return Result.fail(result.getMessage());
- }
- } else {
- return Result.fail(code.getMessage());
- }
+ String token = JwtUtils.sign(user.getAccount());
+ HashMap<String, Object> mapRedis = new HashMap<>();
+ mapRedis.put("id", user.getId());
+ mapRedis.put("account", user.getAccount());
+ mapRedis.put("name", user.getName());
+ mapRedis.put("enterpriseId", user.getEnterpriseId());
+
+
+ String adminMD5 = SecureUtil.md5(SecureUtil.md5(user.getAccount()));
+ // 鏋勫缓
+ AES aes = SecureUtil.aes(adminMD5.getBytes(StandardCharsets.UTF_8));
+ String admins = aes.encryptHex(user.getAccount());
+ mapRedis.put("sessionLayerId", SecureUtil.md5(admins));
+ mapRedis.put("roleId",user.getRoleId());
+
+ //瀛樺叆redis,浜屼釜灏忔椂鍚庡垹闄�
+ RedisUtil.set(token, mapRedis, 120);
+ //
+ RedisUtil.set("access_token",token,120);
+ // 灏嗙鍙戠殑 JWT token 杩斿洖缁欏墠绔�
+ HashMap<String, Object> map = new HashMap<>();
+ String refresh = JwtUtils.sign(user.getAccount());
+ map.put("token", token);
+ map.put("refresh", refresh);
+ RedisUtil.set(user.getAccount(), map, 168);
+ return Result.success(map);
}
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
index 47b0741..2c02d9c 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
@@ -4,19 +4,19 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.limslaboratory.mapper.RoleManageMapper;
+import com.yuanchu.limslaboratory.mapper.UserMapper;
import com.yuanchu.limslaboratory.pojo.RoleMenu;
import com.yuanchu.limslaboratory.pojo.User;
-import com.yuanchu.limslaboratory.mapper.UserMapper;
import com.yuanchu.limslaboratory.pojo.dto.RoleAndMenuDto;
+import com.yuanchu.limslaboratory.pojo.vo.NewPersonnelVo;
+import com.yuanchu.limslaboratory.pojo.vo.UpdatePersonnelVo;
import com.yuanchu.limslaboratory.service.UserService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
import com.yuanchu.limslaboratory.utils.JsonUtil;
import com.yuanchu.limslaboratory.utils.MyUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
-import com.yuanchu.limslaboratory.pojo.vo.NewPersonnelVo;
-import com.yuanchu.limslaboratory.pojo.vo.UpdatePersonnelVo;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -50,19 +50,11 @@
Object obj = RedisUtil.get(token);
if (!ObjectUtils.isEmpty(obj)){
Map loginUser = (Map) obj;
- Map map = (Map)loginUser.get("data");
- Object residualTime = map.get("residualTime");
- int i = Integer.parseInt(residualTime.toString());
- String remind = null;
- if (i <= 30) {
- remind = "鎮ㄦ墍浣跨敤鐨勭郴缁熷嵆灏嗚繃鏈燂紒璇疯仈绯荤鐞嗗憳锛�";
- }
Map<String, Object> data = new HashMap<>();
data.put("name",loginUser.get("name"));
data.put("account", loginUser.get("account"));
data.put("id",loginUser.get("id"));
data.put("roleId",loginUser.get("roleId"));
- data.put("remind", remind);
data.put("sessionLayerId",loginUser.get("sessionLayerId"));
RoleAndMenuDto role = getRoleInfo(Long.valueOf(String.valueOf(loginUser.get("roleId"))));
data.put("role",role);
--
Gitblit v1.9.3