tom.xu@informa.com 2 жил өмнө
parent
commit
871f1d7ee0

+ 7 - 2
src/main/java/ieven/server/webapp/api/UserController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpSession;
 
 @RestController
-@RequestMapping("user")
+@RequestMapping("")
 public class UserController {
   @Autowired UserService userService;
   /**
@@ -21,7 +21,7 @@ public class UserController {
    * @param user
    * @return
    */
-  @PostMapping("login")
+  @PostMapping("user/login")
   public Mapped loginAccount(@RequestBody User user, HttpSession session) {
     User user2 = userService.loginAccount(user);
     if (user2 != null) {
@@ -31,6 +31,11 @@ public class UserController {
     return Mapped.ERROR("用户名或者密码错误!");
   }
 
+  @PostMapping("/")
+  public String index() {
+    return "index.html";
+  }
+
   @PostMapping("login/out")
   public Mapped loginout(HttpSession session) {
     session.invalidate();

+ 1 - 0
src/main/java/ieven/server/webapp/config/LoginInterceptor.java

@@ -20,6 +20,7 @@ public class LoginInterceptor implements HandlerInterceptor {
   public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
       throws Exception {
     log.info(request.getSession().getId());
+    log.info(request.getRequestURI());
     User user = (User) request.getSession().getAttribute("loginUser");
     log.info(JSONUtil.toJsonStr(user));
     if (user == null) {

+ 0 - 21
src/main/java/ieven/server/webapp/config/WebConfiger.java

@@ -1,21 +0,0 @@
-package ieven.server.webapp.config;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-@Configuration
-public class WebConfiger implements WebMvcConfigurer {
-  @Autowired LoginInterceptor loginInterceptor;
-
-  // 自定义国际化组件
-
-  @Override
-  public void addInterceptors(InterceptorRegistry registry) {
-    registry
-        .addInterceptor(loginInterceptor)
-        .addPathPatterns("/**")
-        .excludePathPatterns("/index.html", "/", "/user/login");
-  }
-}

+ 15 - 3
src/main/java/ieven/server/webapp/config/WebMvcConfig.java

@@ -1,14 +1,26 @@
 package ieven.server.webapp.config;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
-public class WebMvcConfig extends WebMvcConfigurationSupport {
+public class WebMvcConfig implements WebMvcConfigurer {
+  @Autowired LoginInterceptor loginInterceptor;
+
   // 设置静态资源映射
   @Override
-  protected void addResourceHandlers(ResourceHandlerRegistry registry) {
+  public void addResourceHandlers(ResourceHandlerRegistry registry) {
     registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");
   }
+
+  @Override
+  public void addInterceptors(InterceptorRegistry registry) {
+    registry
+        .addInterceptor(loginInterceptor)
+        .addPathPatterns("/**")
+        .excludePathPatterns("/", "/user/login");
+  }
 }

+ 1 - 1
src/main/resources/application.properties

@@ -1,6 +1,6 @@
 spring.application.name=webapp
 #spring.data.mongodb.uri=mongodb://admin:123456@localhost:27017/ieven
-spring.data.mongodb.uri=mongodb://localhost:28000/user_model
+spring.data.mongodb.uri=mongodb://localhost:27017/user_model
 #spring.data.mongodb.database=idata
 #spring.data.mongodb.host=localhost
 #spring.data.mongodb.port=27017