diff --git a/tamguo-mms/src/main/java/com/tamguo/config/web/WebConfig.java b/tamguo-mms/src/main/java/com/tamguo/config/web/WebConfig.java index a6dfdfd..89908a9 100644 --- a/tamguo-mms/src/main/java/com/tamguo/config/web/WebConfig.java +++ b/tamguo-mms/src/main/java/com/tamguo/config/web/WebConfig.java @@ -20,7 +20,7 @@ public class WebConfig implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { - registry.addInterceptor(memberInterceptor).addPathPatterns("/member/**").excludePathPatterns("login.html","register.html","password/**"); + registry.addInterceptor(memberInterceptor).addPathPatterns("/**").excludePathPatterns("/login.html","/register.html","/password/**","/captcha.jpg" , "/submitLogin.html" , "/miniLogin.html","/static/**"); } @Override diff --git a/tamguo-mms/src/main/java/com/tamguo/web/IndexController.java b/tamguo-mms/src/main/java/com/tamguo/web/IndexController.java index 674a007..5eab6f6 100644 --- a/tamguo-mms/src/main/java/com/tamguo/web/IndexController.java +++ b/tamguo-mms/src/main/java/com/tamguo/web/IndexController.java @@ -20,7 +20,7 @@ public class IndexController { @Autowired IMemberService iMemberService; - @RequestMapping(value = "/index.html", method = RequestMethod.GET) + @RequestMapping(value = {"index.html" , "/"}, method = RequestMethod.GET) public ModelAndView index(ModelAndView model){ model.setViewName("index"); model.addObject("member", iMemberService.selectById(ShiroUtils.getMemberId())); diff --git a/tamguo-mms/src/main/java/com/tamguo/web/LogoutController.java b/tamguo-mms/src/main/java/com/tamguo/web/LogoutController.java new file mode 100644 index 0000000..4ef453b --- /dev/null +++ b/tamguo-mms/src/main/java/com/tamguo/web/LogoutController.java @@ -0,0 +1,28 @@ +package com.tamguo.web; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +import com.tamguo.utils.ShiroUtils; + +@Controller +public class LogoutController { + + /** + * 注销 + */ + @RequestMapping(value = "logout.html", method = RequestMethod.GET) + public String logout(HttpServletRequest request, HttpServletResponse response, HttpSession session) { + if (session.getAttribute("currMember") != null) { + session.removeAttribute("currMember"); + ShiroUtils.logout(); + } + return "redirect:/"; + } + +} diff --git a/tamguo-mms/src/main/resources/application.properties b/tamguo-mms/src/main/resources/application.properties index 6b65ccf..bee2052 100644 --- a/tamguo-mms/src/main/resources/application.properties +++ b/tamguo-mms/src/main/resources/application.properties @@ -59,4 +59,6 @@ logging.pattern.file=%d{yyyy/MM/dd-HH:mm} [%thread] %-5level %logger- %msg%n server.compression.enabled=true server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain -file.storage.path=/home/webdata/files/ \ No newline at end of file +file.storage.path=/home/webdata/files/ + +spring.mvc.static-path-pattern=/static/** \ No newline at end of file diff --git a/tamguo-mms/src/main/resources/templates/include/footer.html b/tamguo-mms/src/main/resources/templates/include/footer.html index 8d7314a..3302c12 100644 --- a/tamguo-mms/src/main/resources/templates/include/footer.html +++ b/tamguo-mms/src/main/resources/templates/include/footer.html @@ -3,7 +3,7 @@