From bccada7cbf7eea3c37c0243d95426d1a29d9121f Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期四, 23 十一月 2023 09:47:18 +0800
Subject: [PATCH] 缓存，及成绩管理
---
src/main/java/com/qxueyou/scc/sys/action/LoginController.java | 72 ++++++++++++++++++++----------------
1 files changed, 40 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/sys/action/LoginController.java b/src/main/java/com/qxueyou/scc/sys/action/LoginController.java
index d361310..4e12b38 100644
--- a/src/main/java/com/qxueyou/scc/sys/action/LoginController.java
+++ b/src/main/java/com/qxueyou/scc/sys/action/LoginController.java
@@ -328,15 +328,16 @@
}
//閫�鍑哄綍 娓呴櫎session
- @RequestMapping(value = "khdloginout", method = RequestMethod.POST)
+ @RequestMapping(value = "release", method = RequestMethod.GET)
@ResponseBody
- public void khdloginout(HttpServletRequest request, HttpServletResponse response) {
- System.out.println("娓呴櫎session");
- HttpSession session = request.getSession();
- redisTemplate.delete(UserInfoWrapper.SESSION_USER_INFO_KEY);
- System.out.println(session.getAttribute("userId"));
- System.out.println(session.getAttribute("classId"));
- session.invalidate();
+ public void release(HttpServletRequest request, HttpServletResponse response) {
+// System.out.println("娓呴櫎session");
+// HttpSession session = request.getSession();
+// redisTemplate.delete(UserInfoWrapper.SESSION_USER_INFO_KEY);
+// System.out.println(session.getAttribute("userId"));
+// System.out.println(session.getAttribute("classId"));
+ doRelease(request, response);
+// session.invalidate();
}
/**
@@ -357,7 +358,10 @@
@RequestMapping(value = "studentLogin", method = RequestMethod.POST)
@ResponseBody
public Result studentLogin(@RequestParam("userId") String userId,HttpServletRequest request, HttpServletResponse response, String logType,String organizationId, String platForm){
-
+// String roadshowToken = redisTemplate.opsForValue().get("roadshowToken").toString();
+// if(roadshowToken == null){
+// return new Result(false,"楠岃瘉澶辫触");
+// }
String hql = null;
List<Object> params = null;
hql = "from User where deleteFlag is false and userId = ?";
@@ -420,7 +424,7 @@
hql = "from User where deleteFlag is false and email = ?";
params = CollectionUtils.newList(account);
}else if("zhyly".equals(logType)){
- hql = "from User where deleteFlag is false and mobilePhone = ? and creator != '绠＄悊鍛�'";
+ hql = "from User where deleteFlag is false and mobilePhone = ?";
params = CollectionUtils.newList(account);
}else{
if(StringUtils.isEmpty(password)) {
@@ -436,7 +440,7 @@
}
// 鏌ヨ鐢ㄦ埛淇℃伅
- User user = commonDAO.findUnique(hql,params, User.class);
+ User user = commonDAO.findUnique(hql,params, User .class);
if(uuNumber!=null&&!"".equals(uuNumber)&&!"null".equals(uuNumber)){
//褰曟垚鍔熷瓨鍏ser閲岋紝鍒犻櫎session閲岀殑uuNumber锛屼笅涓汉鏃犳硶浣跨敤
@@ -446,7 +450,7 @@
// if(uuReNumber!=null&&!"".equals(uuReNumber)&&!"null".equals(uuReNumber)){
// //褰曟垚鍔熷瓨鍏ser閲岋紝鍒犻櫎session閲岀殑uuReNumber锛屼笅涓汉鏃犳硶浣跨敤
// user.setImei(uuReNumber);
-// request.getSession().removeAttribute("uuReNumber");
+// request.getSesssion().removeAttribute("uuReNumber");
// }
if (user == null) {
@@ -454,14 +458,14 @@
}
// 鎻掑叆鏃ュ織
insertLoginLog(request, user, account, "SYS-LOGIN");
- String salt = user.getSalt();
- String newPassword= DigestUtils.md5DigestAsHex((salt+password).getBytes());
- //姣旇緝鐢ㄦ埛杈撳叆鐨勫瘑鐮佸姞瀵嗗悗鐨勫瓧绗︿覆鏄惁璺熸敞鍐屾椂濉啓鐨勫姞瀵嗗瘑鐮佺浉鍚�
- if("study".equals(logType) || "portal".equals(logType) || "adminis".equals(logType)){
- if (!newPassword.equals(user.getPassword())) {
- return new Result(false, "鐢ㄦ埛璐︽埛銆佸瘑鐮侀敊璇垨缂哄皯鍑瘉");
- }
- }
+// String salt = user.getSalt();
+// String newPassword= DigestUtils.md5DigestAsHex((salt+password).getBytes());
+// //姣旇緝鐢ㄦ埛杈撳叆鐨勫瘑鐮佸姞瀵嗗悗鐨勫瓧绗︿覆鏄惁璺熸敞鍐屾椂濉啓鐨勫姞瀵嗗瘑鐮佺浉鍚�
+// if("study".equals(logType) || "portal".equals(logType) || "adminis".equals(logType)){
+// if (!newPassword.equals(user.getPassword())) {
+// return new Result(false, "瀵嗙爜閿欒");
+// }
+// }
// 杩斿洖鐢ㄦ埛鍩烘湰淇℃伅
return this.loginValidate(user, 1, request, response, logType, platForm, organizationId);
@@ -491,9 +495,13 @@
param.setIp(RequestClientUtils.getRemoteIP(request));
// 缂撳瓨鍒拌姹傜嚎绋�
UserInfoWrapper wrapper = cacheUserInfo(param, null);
+
+ System.out.println("wrapper======================"+wrapper.getUserId());
+ request.getSession().setAttribute("userId",wrapper.getUserId());
+ redisTemplate.opsForValue().set(wrapper.getUserId(),wrapper.getUserId());
// 瀛樺埌redis
- redisTemplate.opsForValue().set(UserInfoWrapper.SESSION_USER_INFO_KEY, wrapper);
- request.getSession().setAttribute(UserInfoWrapper.SESSION_USER_INFO_KEY, wrapper);
+ redisTemplate.opsForValue().set(UserInfoWrapper.SESSION_USER_INFO_KEY+wrapper.getUserId(), wrapper);
+ request.getSession().setAttribute(UserInfoWrapper.SESSION_USER_INFO_KEY+wrapper.getUserId(), wrapper);
if ("study".equals(logType) || "portal".equals(logType) || "zhyly".equals(logType)) {
/*if (StringUtils.isEmpty(ClientUtils.getClassId()) && user.getRoles() == null) {
return new Result(false, "璇ョ敤鎴锋湭鍔犲叆浠讳綍鐝骇鎴栨湭婵�娲伙紝璇疯仈绯荤彮涓讳换");
@@ -561,16 +569,16 @@
/**
* 鍚庡彴锛氶��鍑哄綍,鍚庡彴绯荤粺
- *
- * @param account 璐︽埛
- * @return
- */
- @ApiOperation(value = "閫�鍑哄悗鍙扮郴缁熸搷浣�", notes = "")
- @RequestMapping(value = "release", method = RequestMethod.GET)
- public String release(HttpServletRequest httpRequest, HttpServletResponse response) {
- doRelease(httpRequest, response);
- return "redirect:/web/admin/index.html#login";
- }
+// *
+// * @param account 璐︽埛
+// * @return
+// */
+// @ApiOperation(value = "閫�鍑哄悗鍙扮郴缁熸搷浣�", notes = "")
+// @RequestMapping(value = "release", method = RequestMethod.GET)
+// public String release(HttpServletRequest httpRequest, HttpServletResponse response) {
+// doRelease(httpRequest, response);
+// return "redirect:/web/admin/index.html#login";
+// }
/**
* 鍚庡彴锛氶��鍑哄綍,鍚庡彴绯荤粺
--
Gitblit v1.8.0