From a893cafdce3514f50cb7d99625849fb385bc44c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <13281114856@qq.com>
Date: Mon, 18 Apr 2022 15:29:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9E=84=E5=BB=BAapi?=
=?UTF-8?q?=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../xhx/base/login/web/LoginController.java | 45 ++++++++-----------
.../com/mortals/httpclient/system/system.http | 12 +++++
2 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/base-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java b/base-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
index 1f9074b..69f871e 100644
--- a/base-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
+++ b/base-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
@@ -1,6 +1,6 @@
package com.mortals.xhx.base.login.web;
-import cn.hutool.core.lang.UUID;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.ap.CookieService;
import com.mortals.framework.ap.GlobalSysInfo;
@@ -14,6 +14,7 @@ import com.mortals.framework.util.HttpUtil;
import com.mortals.framework.util.StringUtils;
import com.mortals.framework.web.BaseCRUDJsonController;
import com.mortals.xhx.base.framework.security.AuthTokenService;
+import com.mortals.xhx.base.framework.security.SecurityUtils;
import com.mortals.xhx.base.system.menu.model.MenuEntity;
import com.mortals.xhx.base.system.menu.service.MenuService;
import com.mortals.xhx.base.system.resource.service.ResourceService;
@@ -25,6 +26,7 @@ import com.mortals.xhx.common.key.RedisKey;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -72,7 +74,7 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
try {
loginForm.validate();
boolean result = validCodeService.doCheckImageValidCode(request.getSession().getId(), ip, securityCode);
- if("8888".equals(securityCode)){
+ if ("8888".equals(securityCode)) {
result = true;
}
if (!result) {
@@ -88,7 +90,7 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
recordSysLog(request, userEntity, "鐢ㄦ埛鐧诲綍绯荤粺鎴愬姛!");
// 杩斿洖鎷ユ湁鐨勮彍鍗曟暟鎹�
//Set<String> urls = resourceService.findUrlSetByUserId(userEntity.getId());
- // List<MenuEntity> outlookBarList = menuService.findTreeMenu(userEntity, urls);
+ // List<MenuEntity> outlookBarList = menuService.findTreeMenu(userEntity, urls);
String currUserName = userEntity.getRealName();
if (currUserName == null || currUserName.trim().length() == 0) {
currUserName = "绠＄悊鍛�";
@@ -106,14 +108,14 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
// if(!ObjectUtils.isEmpty(loginCookie)){
//
// }
- // data.put("token", UUID.fastUUID().toString());
+ // data.put("token", UUID.fastUUID().toString());
data.put("expiresTime", DateUtils.addCurrDate(7).getTime());
- // this.generateBlackCookie(request, response, loginName, urls);
+ // this.generateBlackCookie(request, response, loginName, urls);
ret.put(KEY_RESULT_DATA, data);
ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
ret.put(KEY_RESULT_MSG, "鐢ㄦ埛鐧诲綍绯荤粺鎴愬姛!");
- // ret.put("resources", urls);
+ // ret.put("resources", urls);
return ret.toJSONString();
} catch (Exception e) {
log.error("login error ", e);
@@ -234,25 +236,14 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
}
-// @Override
-// protected void saveCurrUser(HttpServletRequest request, HttpServletResponse response, IUser user, int maxAge) {
-// String securityKey = GlobalSysInfo.getPropertyValue(PROP_COOKIE_SECURITY_KEY);
-// String cookieDomain = GlobalSysInfo.getPropertyValue(PROP_COOKIE_DOMAIN);
-// //褰撳墠璇锋眰鐨勫煙
-// String currDoman = request.getServerName();
-// //璁剧疆鐧诲綍cookie淇℃伅
-// CookieInfo cookie = CookieService.setLoginCookie(response, user, securityKey, currDoman, maxAge);
-// //濡傛灉璇锋眰鐨勫煙涓庤缃殑鍩熶笉涓€鑷达紝璁剧疆閰嶇疆鏂囦欢鐨勬枃浠跺煙
-// if (StringUtils.isNotEmpty(cookieDomain) && !currDoman.equals(cookieDomain)) {
-// CookieService.setLoginCookie(response, user, securityKey, cookieDomain, maxAge);
-// }
-// if (cookie != null && this.tokenService != null) {
-// try {
-// this.tokenService.saveToken(cookie);
-// } catch (Throwable e) {
-// this.log.error("瀛樺偍cookie淇℃伅鍒版湇鍔″櫒寮傚父", e);
-// }
-// }
-//
-// }
+ @RequestMapping("parseToken")
+ public String parseToken() throws Exception {
+ UserEntity userEntity = authTokenService.getLoginUser(request);
+ if (!ObjectUtils.isEmpty(userEntity)) {
+ authTokenService.verifyToken(userEntity);
+ return JSON.toJSONString(userEntity);
+ }
+
+ return null;
+ }
}
diff --git a/base-manager/src/test/java/com/mortals/httpclient/system/system.http b/base-manager/src/test/java/com/mortals/httpclient/system/system.http
index ef11e40..bf47ea4 100644
--- a/base-manager/src/test/java/com/mortals/httpclient/system/system.http
+++ b/base-manager/src/test/java/com/mortals/httpclient/system/system.http
@@ -11,8 +11,20 @@ Content-Type: application/json
> {%
client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
+client.global.set("authToken", JSON.parse(response.body).data.token);
%}
+
+###瑙ｆ瀽token
+POST {{baseUrl}}/login/parseToken
+Content-Type: application/json
+Authorization: Bearer {{authToken}}
+
+###鐭俊璁剧疆鍒犻櫎
+GET {{baseUrl}}/sms/set/delete?id={{SmsSet_id}}
+Accept: application/json
+
+
###鐭俊璁剧疆鏌ョ湅
GET {{baseUrl}}/sms/set/info?id={{SmsSet_id}}
Accept: application/json
--
2.24.3