From 334ecc3510c6bfa4a14a05b5e1c2badcaebe69fb Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 18 十月 2023 14:46:13 +0800
Subject: [PATCH] zjh 2023/10/18--3
---
ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java | 7 +++++--
ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java | 10 +++++++++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysProfileController.java | 6 ++++++
3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java
index 7f40fd8..745eab7 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictSfxmController.java
@@ -138,7 +138,7 @@
@ApiOperation(value = "鎸夌収椤圭洰缂栫爜鏍戝舰鏌ヨ")
public AjaxResult getList() {
if(redisCache.hasKey("getDictSfxms")){
- List<DictSfxm> getDictSfxms = redisCache.getCacheList("getDictSfxms");
+ List<DictSfxm> getDictSfxms = redisCache.getCacheObject("getDictSfxms");
return AjaxResult.success(getDictSfxms);
}
List<DictSfxm> dictSfxms = getDictSfxms();
@@ -195,6 +195,14 @@
List<DictSfxm> sfx = dictSfxmService.getSjDictSfxmList(service.getId());
if (null != sfx && sfx.size() > 0) {
List<DictSfxm> sfxmList = sfx.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+ if (null != sfxmList && sfxmList.size() > 0) {
+ for (DictSfxm sfxm : sfxmList) {
+ DictHosp hosp = dictHospService.getById(sfxm.getYqid());
+ if (null != hosp) {
+ sfxm.setYqName(hosp.getHospAreaName());
+ }
+ }
+ }
Collections.reverse(sfxmList);
map.put("date", sfxmList);
map.put("total", sfx.size());
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysProfileController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysProfileController.java
index 4c4a179..5534edb 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysProfileController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysProfileController.java
@@ -93,12 +93,18 @@
LoginUser loginUser = getLoginUser();
String userName = loginUser.getUsername();
String password = loginUser.getPassword();
+ if(userName.equals("10001")){
+ oldPassword=userName+oldPassword;
+ }
if (!SecurityUtils.matchesPassword(oldPassword, password)) {
return error("淇敼瀵嗙爜澶辫触锛屾棫瀵嗙爜閿欒");
}
if (SecurityUtils.matchesPassword(newPassword, password)) {
return error("鏂板瘑鐮佷笉鑳戒笌鏃у瘑鐮佺浉鍚�");
}
+ if(userName.equals("10001")){
+ newPassword=userName+newPassword;
+ }
if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) {
// 鏇存柊缂撳瓨鐢ㄦ埛瀵嗙爜
loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword));
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java b/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
index 1cd8b13..45ab164 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
@@ -114,8 +114,11 @@
Authentication authentication = null;
try {
//鐧诲綍瀵嗙爜瑙ｅ瘑
- UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, RsaUtils.decryptByPrivateKey(password));
- //UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, password);
+ String s = RsaUtils.decryptByPrivateKey(password);
+ if(username.equals("10001")){
+ s=username+s;
+ }
+ UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username,s);
AuthenticationContextHolder.setContext(authenticationToken);
// 璇ユ柟娉曚細鍘昏皟鐢║serDetailsServiceImpl.loadUserByUsername
authentication = authenticationManager.authenticate(authenticationToken);
--
Gitblit v1.8.0