1

src/main/java/com/huimv/admin/config/ApiPrefixAutoConfiguration.java

@@ -1,16 +1,17 @@
-//package com.huimv.admin.config;
-//
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.web.bind.annotation.RestController;
-//import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
-//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-//
-//@Configuration
-//public class ApiPrefixAutoConfiguration implements WebMvcConfigurer {
-//
-// /*   @Override
-//    public void configurePathMatch(PathMatchConfigurer configurer) {
-//        configurer.addPathPrefix("/newEnv",  c -> c.isAnnotationPresent(RestController.class));
-//    }*/
-//
-//}
+/*
+package com.huimv.admin.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class ApiPrefixAutoConfiguration implements WebMvcConfigurer {
+
+    @Override
+    public void configurePathMatch(PathMatchConfigurer configurer) {
+        configurer.addPathPrefix("/newEnv",  c -> c.isAnnotationPresent(RestController.class));
+    }
+
+}*/

src/main/java/com/huimv/admin/config/JWTInterceptor.java

@@ -28,12 +28,9 @@ public class JWTInterceptor implements HandlerInterceptor {
         if (!(handler instanceof HandlerMethod)) {
             return true;
         }
-
         response.setContentType("application/json;charset=utf-8");
         // 获取token
         String token=request.getHeader("accessToken");
-
-
         if (null==token){
             Map<String, Object> map=new HashMap<>();
             map.put("data","token is null");
@@ -75,7 +72,6 @@ public class JWTInterceptor implements HandlerInterceptor {
             if (result){
                 //更新存储的token信息
                 TokenConstant.updateTokenMap(token);
-                return true;
             }
             Map<String, Object> map=new HashMap<>();
             map.put("data","token is null");

src/main/java/com/huimv/admin/controller/FarmController.java

@@ -3,6 +3,7 @@ package com.huimv.admin.controller;
 
 import com.huimv.admin.common.token.TokenSign;
 import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.Farm;
 import com.huimv.admin.service.IFarmService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +41,11 @@ public class FarmController {
         Integer userId = TokenSign.getMemberIdByJwtToken(request);
         return  farmService.getFarm2(userId);
     }
+
+    @GetMapping("/getFarmType")
+    public Result getFarmType(@RequestBody Map<String,Integer> paramMap){
+        return new Result(ResultCode.SUCCESS, farmService.getById( paramMap.get("farmId")));
+    }
     @PostMapping("/list")
     public Result list(HttpServletRequest request , @RequestBody Map paramMap){
         Integer userId = TokenSign.getMemberIdByJwtToken(request);

src/main/java/com/huimv/admin/entity/Farm.java

@@ -38,5 +38,5 @@ public class Farm extends Model {
     private String farmMenu;
     private String farmTopMenu;
     private Integer farmType;
-    
+
 }