Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
base-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
base-platform
Commits
a893cafd
Commit
a893cafd
authored
Apr 18, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改构建api文档
parent
463299f6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
27 deletions
+30
-27
base-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
.../java/com/mortals/xhx/base/login/web/LoginController.java
+18
-27
base-manager/src/test/java/com/mortals/httpclient/system/system.http
...r/src/test/java/com/mortals/httpclient/system/system.http
+12
-0
No files found.
base-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
View file @
a893cafd
package
com.mortals.xhx.base.login.web
;
import
c
n.hutool.core.lang.UUID
;
import
c
om.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
;
}
}
base-manager/src/test/java/com/mortals/httpclient/system/system.http
View file @
a893cafd
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment