jiangjiazhi / regional-platform

Download as
Browse Code »

Commit d4ae21f8393d5769dc9bd805459f565944087dd7

Authored by jiangjiazhi
2 parents 2186fc0d7e 963628200a
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java View file @ d4ae21f
... ... @@ -101,7 +101,9 @@
101 101 */
102 102 public static byte[] aesEncryptToBytes(String content, String encryptKey) throws Exception {
103 103 KeyGenerator kgen = KeyGenerator.getInstance("AES");
104   - kgen.init(128, new SecureRandom(encryptKey.getBytes()));
  104 + SecureRandom random = SecureRandom.getInstance("SHA1PRNG");
  105 + random.setSeed(encryptKey.getBytes());
  106 + kgen.init(128, random);
105 107  
106 108 Cipher cipher = Cipher.getInstance("AES");
107 109 cipher.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(kgen.generateKey().getEncoded(), "AES"));
... ... @@ -129,7 +131,9 @@
129 131 */
130 132 public static String aesDecryptByBytes(byte[] encryptBytes, String decryptKey) throws Exception {
131 133 KeyGenerator kgen = KeyGenerator.getInstance("AES");
132   - kgen.init(128, new SecureRandom(decryptKey.getBytes()));
  134 + SecureRandom random = SecureRandom.getInstance("SHA1PRNG");
  135 + random.setSeed(decryptKey.getBytes());
  136 + kgen.init(128, random);
133 137  
134 138 Cipher cipher = Cipher.getInstance("AES");
135 139 cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(kgen.generateKey().getEncoded(), "AES"));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java View file @ d4ae21f
... ... @@ -292,10 +292,12 @@
292 292 }*/
293 293  
294 294 if(null != loginContext && loginContext.getErrorcode().equals(0)) {
295   - Users users1 = new Users();
296   - users1.setId(users.get(0).getId());
297   - users1.setLastLoginTime(new Date());
298   - usersService.updateUsers(users1);
  295 + if (u.getLastLoginTime() != null) {
  296 + Users users1 = new Users();
  297 + users1.setId(u.getId());
  298 + users1.setLastLoginTime(new Date());
  299 + usersService.updateUsers(users1);
  300 + }
299 301  
300 302 Map<String, Object> result = new HashMap<>();
301 303 result.put("token", loginContext.getToken());
... ... @@ -602,7 +604,7 @@
602 604 users.setYn(YnEnums.YES.getId());
603 605 users.setModified(new Date());
604 606 users.setCreated(new Date());
605   - users.setLastLoginTime(new Date());
  607 +// users.setLastLoginTime(new Date());
606 608 // users.setPwd(LoginUtil.md5(NumberUtils.getRandomString(6)));
607 609  
608 610 //关联登录中心ID
... ... @@ -741,7 +743,7 @@
741 743 users.setModified(new Date());
742 744 users.setCreated(new Date());
743 745 users.setZhiChen(ZhiChenEnums.getById(zhiCId));
744   - users.setLastLoginTime(new Date());
  746 +// users.setLastLoginTime(new Date());
745 747 // users.setPwd(LoginUtil.md5(NumberUtils.getRandomString(6)));
746 748  
747 749 LoginContext loginContext = new LoginContext();
748 750  
749 751  
... ... @@ -1071,14 +1073,19 @@
1071 1073 */
1072 1074 @RequestMapping(value = "/passwords/reset", method = RequestMethod.PUT)
1073 1075 @TokenRequired
1074   - public void updatePassword(HttpServletResponse response, @RequestParam(value = "userId") String id) {
  1076 + public void updatePassword(HttpServletResponse response, @RequestParam(value = "userId") String id, @RequestParam(value = "pwd", required = false) String pwd) {
1075 1077 Users users = usersService.getUsers(Integer.valueOf(id));
1076 1078 if (users == null) {
1077 1079 ResultUtils.buildParameterErrorResultAndWrite(response, "用户ID不存在");
1078 1080 return;
1079 1081 }
1080   - users.setPwd(defaultPwd);
  1082 + if (StringUtils.isNotBlank(pwd)) {
  1083 + users.setPwd(MD5Utils.md5(pwd));
  1084 + } else {
  1085 + users.setPwd(defaultPwd);
  1086 + }
1081 1087 users.setModified(new Date());
  1088 + users.setLastLoginTime(users.getModified());
1082 1089 usersService.updateUsers(users);
1083 1090 LoginContext loginContext = iSessionProvider.register(users.getLogincenterId().toString(), users.getPhone(),users.getAccount(), MD5Utils.md5(defaultPwd).toUpperCase());
1084 1091 if(loginContext.getErrorcode().equals(0)) {