diff --git a/tamguo-oms/src/main/java/com/tamguo/config/shiro/ShiroConfiguration.java b/tamguo-oms/src/main/java/com/tamguo/config/shiro/ShiroConfiguration.java index f443826..fcf4446 100644 --- a/tamguo-oms/src/main/java/com/tamguo/config/shiro/ShiroConfiguration.java +++ b/tamguo-oms/src/main/java/com/tamguo/config/shiro/ShiroConfiguration.java @@ -2,7 +2,6 @@ package com.tamguo.config.shiro; import java.util.LinkedHashMap; import java.util.Map; - import org.apache.shiro.cache.ehcache.EhCacheManager; import org.apache.shiro.spring.LifecycleBeanPostProcessor; import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor; @@ -93,4 +92,5 @@ public class ShiroConfiguration { shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); return shiroFilterFactoryBean; } + } \ No newline at end of file diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/LoginController.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/LoginController.java index 984f816..efd247e 100644 --- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/LoginController.java +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/LoginController.java @@ -1,8 +1,9 @@ package com.tamguo.modules.sys.web; import java.io.IOException; -import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.IncorrectCredentialsException; import org.apache.shiro.authc.LockedAccountException; @@ -24,17 +25,17 @@ import com.tamguo.modules.sys.utils.TamguoConstant; @Controller public class LoginController { - @RequestMapping(path="sysLogin") + @RequestMapping(path="login") public String sysLogin(ModelAndView model) { if(ShiroUtils.isLogin()) { - return "sysIndex"; + return "index"; } - return "sysLogin"; + return "login"; } @ResponseBody - @RequestMapping(value = "sysLogin", method = RequestMethod.POST) - public Result toLogin(HttpServletRequest request, String username, String password, String validCode) + @RequestMapping(value = "login", method = RequestMethod.POST) + public Result toLogin(HttpServletRequest request, HttpServletResponse response , String username , Boolean rememberUser, String password, String validCode) throws IOException { try { String kaptcha = ShiroUtils.getKaptcha(TamguoConstant.KAPTCHA_SESSION_KEY); diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/LogoutController.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/LogoutController.java new file mode 100644 index 0000000..b7626c9 --- /dev/null +++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/LogoutController.java @@ -0,0 +1,19 @@ +package com.tamguo.modules.sys.web; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; + +import com.tamguo.modules.sys.utils.ShiroUtils; + +@Controller +public class LogoutController { + + @RequestMapping(path="logout") + public ModelAndView logout(ModelAndView model) { + ShiroUtils.logout(); + model.setViewName("login"); + return model; + } + +} diff --git a/tamguo-oms/src/main/resources/templates/sysIndex.html b/tamguo-oms/src/main/resources/templates/index.html similarity index 91% rename from tamguo-oms/src/main/resources/templates/sysIndex.html rename to tamguo-oms/src/main/resources/templates/index.html index ff2a7a3..980e4b3 100644 --- a/tamguo-oms/src/main/resources/templates/sysIndex.html +++ b/tamguo-oms/src/main/resources/templates/index.html @@ -1,5 +1,5 @@ - - + + @@ -55,7 +55,7 @@ -
+
diff --git a/tamguo-oms/src/main/resources/templates/sysLogin.html b/tamguo-oms/src/main/resources/templates/login.html similarity index 93% rename from tamguo-oms/src/main/resources/templates/sysLogin.html rename to tamguo-oms/src/main/resources/templates/login.html index 9d14530..e41d853 100644 --- a/tamguo-oms/src/main/resources/templates/sysLogin.html +++ b/tamguo-oms/src/main/resources/templates/login.html @@ -33,7 +33,7 @@ TamGuo OMS 1.0.0
-
+
  + title="公共场所慎用,下次不需要再填写帐号和密码">
diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/menu/update.html b/tamguo-oms/src/main/resources/templates/modules/sys/menu/update.html index c51691f..be0184b 100644 --- a/tamguo-oms/src/main/resources/templates/modules/sys/menu/update.html +++ b/tamguo-oms/src/main/resources/templates/modules/sys/menu/update.html @@ -52,8 +52,8 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
- - + + diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/office/update.html b/tamguo-oms/src/main/resources/templates/modules/sys/office/update.html index c35bc1e..199448f 100644 --- a/tamguo-oms/src/main/resources/templates/modules/sys/office/update.html +++ b/tamguo-oms/src/main/resources/templates/modules/sys/office/update.html @@ -35,8 +35,8 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
- - +