网关服务

diagbotman-service/src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -26,7 +26,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .csrf().disable()
                 .authorizeRequests()
                 .regexMatchers(".*swagger.*",".*v2.*",".*webjars.*","/druid.*","/actuator.*","/hystrix.*"
-                        ,"/service_filter/getAll", "/serviceToken/hasPermisson").permitAll()
+                        ,"/service_filter/getAll", "/serviceToken/hasPermission").permitAll()
                 .antMatchers("/**").authenticated();
 //        .antMatchers("/**").permitAll();
     }

diagbotman-service/src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -35,7 +35,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                     || matchers("/actuator/**", request)
                     || matchers("/hystrix/**", request)
                     || matchers("/service_filter/getAll", request)
-                    || matchers("/serviceToken/hasPermisson", request)
+                    || matchers("/serviceToken/hasPermission", request)
                     || matchers("/", request)){
                 return;
             } else {

diagbotman-service/src/main/java/com/diagbot/facade/ServiceTokenFacade.java

@@ -28,7 +28,7 @@ public class ServiceTokenFacade extends ServiceTokenServiceImpl {
      * @Author: ztg
      * @Date: 2018/9/18 16:54
      */
-    public RespDTO<Boolean> hasPermisson(String appkey, String secret, Long productId) {
+    public RespDTO<Boolean> hasPermission(String appkey, String secret, Long productId) {
         ServiceToken st = this.getServiceToken(appkey, secret);
         if(null == st) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "appkey或secret错误，appkey=【" + appkey + "】," + "secret=【" + secret + "】");

diagbotman-service/src/main/java/com/diagbot/web/ServiceFilterController.java

@@ -4,8 +4,10 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.ServiceFilter;
 import com.diagbot.facade.ServiceFilterFacade;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 
@@ -21,7 +23,8 @@ public class ServiceFilterController {
     @Autowired
     ServiceFilterFacade serviceFilterFacade;
 
-    @RequestMapping("/getAll")
+    @ApiIgnore
+    @PostMapping("/getAll")
     public RespDTO<List<ServiceFilter>> getServiceFilter() {
         return serviceFilterFacade.getAll();
     }

diagbotman-service/src/main/java/com/diagbot/web/ServiceTokenController.java

@@ -4,8 +4,11 @@ package com.diagbot.web;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.ServiceTokenFacade;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 /**
  * <p>
@@ -15,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
  * @author zhaops
  * @since 2018-09-17
  */
-@Controller
+@RestController
 @RequestMapping("/serviceToken")
 public class ServiceTokenController {
 
@@ -23,9 +26,10 @@ public class ServiceTokenController {
     ServiceTokenFacade serviceTokenFacade;
 
 
-    @RequestMapping("/hasPermisson")
-    public RespDTO<Boolean> hasPermission(String appkey, String secret, Long productId) {
-        return serviceTokenFacade.hasPermisson(appkey, secret, productId);
+    @PostMapping("/hasPermission")
+    @ApiIgnore
+    public RespDTO<Boolean> hasPermission(@RequestParam("appkey") String appkey, @RequestParam("secret") String secret, @RequestParam("productId") Long productId) {
+        return serviceTokenFacade.hasPermission(appkey, secret, productId);
     }
 
 }

gateway-service/src/main/java/com/diagbot/filter/GlobalGatewayFilter.java

@@ -37,7 +37,7 @@ import java.util.Map;
 public class GlobalGatewayFilter implements GlobalFilter {
 
     private static final String GATE_WAY_PREFIX = "/api";
-    private static final Boolean IS_GENERATE = false;
+    private static Boolean IS_GENERATE = false;
     private static Map<String, Long> SERVICE_FILTER = new HashMap<>();
 
     @Autowired
@@ -71,14 +71,17 @@ public class GlobalGatewayFilter implements GlobalFilter {
             for(ServiceFilter bean : list) {
                 SERVICE_FILTER.put(bean.getName(), bean.getProductId());
             }
+            IS_GENERATE = true;
         }
+        serviceName = "icss";
         if(SERVICE_FILTER.get(serviceName) != null) {
             String appkey = request.getHeaders().getFirst("appkey");
             String secret = request.getHeaders().getFirst("secret");
             Long productId = SERVICE_FILTER.get(SERVICE_FILTER.get(serviceName));
-
+            productId = 1L;
             //获取appkey，secret对应的权限信息
             RespDTO<Boolean> res = diagbotmanServiceClient.hasPermission(appkey, secret, productId);
+            System.out.println(11);
         }
 
 //        if(1==1){