From 937daff0ebc1aa16a852d5a86434ab1994d8a02d Mon Sep 17 00:00:00 2001
From: 胡仁荣 <897853850@qq.com>
Date: 星期一, 11 九月 2023 10:41:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/qxueyou/scc/sys/action/LoginController.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 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 ad3a838..de0c8ba 100644
--- a/src/main/java/com/qxueyou/scc/sys/action/LoginController.java
+++ b/src/main/java/com/qxueyou/scc/sys/action/LoginController.java
@@ -439,8 +439,6 @@
// 鏌ヨ鐢ㄦ埛淇℃伅
User user = commonDAO.findUnique(hql,params, User.class);
- System.out.println(user);
-
if(uuNumber!=null&&!"".equals(uuNumber)&&!"null".equals(uuNumber)){
//褰曟垚鍔熷瓨鍏ser閲岋紝鍒犻櫎session閲岀殑uuNumber锛屼笅涓汉鏃犳硶浣跨敤
user.setEmail(uuNumber);
@@ -462,7 +460,7 @@
//姣旇緝鐢ㄦ埛杈撳叆鐨勫瘑鐮佸姞瀵嗗悗鐨勫瓧绗︿覆鏄惁璺熸敞鍐屾椂濉啓鐨勫姞瀵嗗瘑鐮佺浉鍚�
if("study".equals(logType) || "portal".equals(logType) || "adminis".equals(logType)){
if (!newPassword.equals(user.getPassword())) {
- return new Result(false, "瀵嗙爜閿欒");
+ return new Result(false, "鐢ㄦ埛璐︽埛銆佸瘑鐮侀敊璇垨缂哄皯鍑瘉");
}
}
@@ -568,12 +566,12 @@
* @param account 璐︽埛
* @return
*/
-// @ApiOperation(value = "閫�鍑哄悗鍙扮郴缁熸搷浣�", notes = "")
-// @RequestMapping(value = "out", method = RequestMethod.GET)
-// public String release(HttpServletRequest httpRequest, HttpServletResponse response) {
-// doRelease(httpRequest, response);
-// 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