pbn32vpxk
/
tamguo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
main
tamguo 7 years ago
parent bf6b8c1166
commit b033fa0e5f
7 changed files with 53 additions and 12 deletions
Show Stats Download Patch File Download Diff File

1
tamguo-bms/src/main/java/com/tamguo/config/web/ThymeleafConfig.java
Unescape View File

@ -24,6 +24,7 @@ public class ThymeleafConfig implements EnvironmentAware{
vars.put("domainName", env.getProperty("domain.name")); vars.put("domainName", env.getProperty("domain.name"));
vars.put("adminDomain", env.getProperty("admin.domain.name")); vars.put("adminDomain", env.getProperty("admin.domain.name"));
vars.put("memberDomain", env.getProperty("member.domain.name")); vars.put("memberDomain", env.getProperty("member.domain.name"));
vars.put("tamguoDomain", env.getProperty("tamguo.domain.name"));
vars.put("PAPER_TYPE_ZHENTI", SystemConstant.ZHENGTI_PAPER_ID); vars.put("PAPER_TYPE_ZHENTI", SystemConstant.ZHENGTI_PAPER_ID);
vars.put("PAPER_TYPE_MONI", SystemConstant.MONI_PAPER_ID); vars.put("PAPER_TYPE_MONI", SystemConstant.MONI_PAPER_ID);
vars.put("PAPER_TYPE_YATI", SystemConstant.YATI_PAPER_ID); vars.put("PAPER_TYPE_YATI", SystemConstant.YATI_PAPER_ID);

2
tamguo-bms/src/main/java/com/tamguo/interceptor/MemberInterceptor.java
Unescape View File

@ -20,7 +20,7 @@ public class MemberInterceptor extends HandlerInterceptorAdapter{
/** 登录URL */ /** 登录URL */
private String loginUrl = DEFAULT_LOGIN_URL; private String loginUrl = DEFAULT_LOGIN_URL;
@Value("${tamguo.admin.name}") @Value("${tamguo.domain.name}")
private String tamguoDomainName; private String tamguoDomainName;
/** /**

4
tamguo-bms/src/main/resources/application.properties
Unescape View File

@ -1,7 +1,7 @@
domain.name=https://book.tamguo.com/ domain.name=https://book.tamguo.com/
admin.domain.name=https://admin.tamguo.com/ admin.domain.name=https://admin.tamguo.com/
tamguo.admin.name=https://www.tamguo.com/ tamguo.domain.name=https://www.tamguo.com/
member.domain.name=https://member.tamguo.com/ member.domain.name=http://member.tamguo.com/
cookie.domian.name=tamguo.com cookie.domian.name=tamguo.com
server.port=8083 server.port=8083
jasypt.encryptor.password=tamguo jasypt.encryptor.password=tamguo

BIN
tamguo-bms/src/main/resources/static/images/avatar.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.7 KiB

46
tamguo-bms/src/main/resources/templates/index.html
Unescape View File

@ -42,17 +42,51 @@
<div class="btn-group dropdown-menu-right pull-right slidebar visible-xs-inline-block visible-sm-inline-block"> <div class="btn-group dropdown-menu-right pull-right slidebar visible-xs-inline-block visible-sm-inline-block">
<button class="btn btn-default dropdown-toggle hidden-lg" type="button" data-toggle="dropdown"><i class="fa fa-align-justify"></i></button> <button class="btn btn-default dropdown-toggle hidden-lg" type="button" data-toggle="dropdown"><i class="fa fa-align-justify"></i></button>
<ul class="dropdown-menu" role="menu"> <ul th:if="${session.currMember == null}" class="dropdown-menu" role="menu">
<li><a th:href="${memberDomain + 'login.html?redirectUrl=' + domainName}" title="用户登录">登录</a></li>
<li><a th:href="${memberDomain + 'login.html'}" title="用户登录">登录</a></li> </ul>
<ul th:if="${session.currMember != null}" class="dropdown-menu" role="menu">
<li>
<a th:href="${memberDomain}" title="个人中心"><i class="fa fa-user" aria-hidden="true"></i> 个人中心</a>
</li>
<li>
<a th:href="${memberDomain + 'booklist.html'}" title="我的书籍"><i class="fa fa-book" aria-hidden="true"></i> 我的项目</a>
</li>
<li>
<a th:href="${memberDomain + 'logout.html'}" title="退出登录"><i class="fa fa-sign-out"></i> 退出登录</a>
</li>
</ul> </ul>
</div> </div>
</div> </div>
<nav class="navbar-collapse hidden-xs hidden-sm" role="navigation"> <nav class="navbar-collapse hidden-xs hidden-sm" role="navigation">
<ul class="nav navbar-nav navbar-right"> <ul th:if="${session.currMember == null}" class="nav navbar-nav navbar-right">
<li><a th:href="${memberDomain + 'login.html'}" title="用户登录">登录</a></li> <li><a th:href="${memberDomain + 'login.html?redirectUrl=' + domainName}" title="用户登录">登录</a></li>
</ul>
<ul th:if="${session.currMember != null}" class="nav navbar-nav navbar-right">
<li>
<div class="img user-info" data-toggle="dropdown">
<img th:src="${tamguoDomain + session.currMember.avatar}" onerror="this.src='https://book.tamguo.com/images/avatar.png';" class="img-circle userbar-avatar" th:alt="${session.currMember.nickName}">
<div class="userbar-content">
<span th:text="${session.currMember.nickName}">admin</span>
<div></div>
</div>
<i class="fa fa-chevron-down" aria-hidden="true"></i>
</div>
<ul class="dropdown-menu user-info-dropdown" role="menu">
<li>
<a th:href="${memberDomain}" title="个人中心"><i class="fa fa-user" aria-hidden="true"></i> 个人中心</a>
</li>
<li>
<a th:href="${memberDomain + 'booklist.html'}" title="我的书籍"><i class="fa fa-book" aria-hidden="true"></i> 我的项目</a>
</li>
<li>
<a th:href="${memberDomain + 'logout.html'}" title="退出登录"><i class="fa fa-sign-out"></i> 退出登录</a>
</li>
</ul>
</li>
</ul> </ul>
</nav> </nav>
</div> </div>

11
tamguo-mms/src/main/java/com/tamguo/web/LoginController.java
Unescape View File

@ -35,14 +35,15 @@ public class LoginController {
} }
@RequestMapping(value = "/login.html", method = RequestMethod.GET) @RequestMapping(value = "/login.html", method = RequestMethod.GET)
public ModelAndView login(ModelAndView model){ public ModelAndView login(String redirectUrl , ModelAndView model){
model.setViewName("login"); model.setViewName("login");
model.addObject("isVerifyCode" , "0"); model.addObject("isVerifyCode" , "0");
model.addObject("redirectUrl", redirectUrl);
return model; return model;
} }
@RequestMapping(value = "/submitLogin.html", method = RequestMethod.POST) @RequestMapping(value = "/submitLogin.html", method = RequestMethod.POST)
public ModelAndView submitLogin(String username , String password , String verifyCode , ModelAndView model , HttpSession session , HttpServletResponse response) throws IOException{ public ModelAndView submitLogin(String username , String password , String verifyCode , String redirectUrl , ModelAndView model , HttpSession session , HttpServletResponse response) throws IOException{
Result result = Result.successResult(null); Result result = Result.successResult(null);
if(StringUtils.isEmpty(verifyCode)) { if(StringUtils.isEmpty(verifyCode)) {
result = Result.result(202, null, "请输入验证码"); result = Result.result(202, null, "请输入验证码");
@ -57,7 +58,11 @@ public class LoginController {
subject.login(token); subject.login(token);
session.setAttribute("currMember", ShiroUtils.getMember()); session.setAttribute("currMember", ShiroUtils.getMember());
response.sendRedirect("index.html"); if(!StringUtils.isEmpty(redirectUrl)) {
response.sendRedirect(redirectUrl);
}else {
response.sendRedirect("index.html");
}
return null; return null;
} catch (UnknownAccountException e) { } catch (UnknownAccountException e) {
result = Result.result(201, null, "用户名或密码有误，请重新输入或找回密码"); result = Result.result(201, null, "用户名或密码有误，请重新输入或找回密码");

1
tamguo-mms/src/main/resources/templates/login.html
Unescape View File

@ -31,6 +31,7 @@
<div class="login-wrapper"> <div class="login-wrapper">
<div id="login" class="tang-pass-login animation" style="display: block; visibility: visible; opacity: 1;"> <div id="login" class="tang-pass-login animation" style="display: block; visibility: visible; opacity: 1;">
<form id="TANGRAM__PSP_3__form" th:action="${domainName + 'submitLogin.html'}" class="pass-form pass-form-normal" method="POST" autocomplete="off"> <form id="TANGRAM__PSP_3__form" th:action="${domainName + 'submitLogin.html'}" class="pass-form pass-form-normal" method="POST" autocomplete="off">
<input type="hidden" id="redirectUrl" name="redirectUrl" th:value="${redirectUrl}"></input>
<p class="pass-form-logo">用户名密码登录</p> <p class="pass-form-logo">用户名密码登录</p>
<p id="TANGRAM__PSP_3__errorWrapper" class="pass-generalErrorWrapper"> <p id="TANGRAM__PSP_3__errorWrapper" class="pass-generalErrorWrapper">
<span id="TANGRAM__PSP_3__error" class="pass-generalError pass-generalError-error" th:text="${msg}"></span> <span id="TANGRAM__PSP_3__error" class="pass-generalError pass-generalError-error" th:text="${msg}"></span>

Write Preview
Loading…
Cancel
Save