zhoutg %!s(int64=6) %!d(string=hai) anos
pai
achega
aa0fa59ae8

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

@@ -6,7 +6,6 @@ import com.diagbot.facade.ServiceTokenFacade;
 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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -28,8 +27,10 @@ public class ServiceTokenController {
 
     @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);
+    public RespDTO<String> hasPermission(String appkey) {
+        System.out.println(appkey);
+        return RespDTO.onSuc("1111");
+        //        return serviceTokenFacade.hasPermission(appkey, secret, productId);
     }
 
 }

+ 2 - 3
gateway-service/src/main/java/com/diagbot/client/DiagbotmanServiceClient.java

@@ -5,7 +5,6 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.ServiceFilter;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -21,8 +20,8 @@ public interface DiagbotmanServiceClient {
     @PostMapping("/service_filter/getAll")
     RespDTO<List<ServiceFilter>> getAll();
 
-    @PostMapping("/serviceToken/hasPermisson")
-    RespDTO<Boolean> hasPermission(@RequestParam("appkey") String appkey, @RequestParam("secret") String secret, @RequestParam("productId") Long productId);
+    @PostMapping("/serviceToken/hasPermission")
+    RespDTO<String> hasPermission(String appkey);
 
 }
 

+ 0 - 3
gateway-service/src/main/java/com/diagbot/client/UserServiceClient.java

@@ -19,9 +19,6 @@ public interface UserServiceClient {
     @PostMapping("/user/login")
     RespDTO<User> login(@RequestParam("username") String username , @RequestParam("password") String password);
 
-    @PostMapping("/user/getPermission")
-    RespDTO getPermission(@RequestParam("appkey") String appkey , @RequestParam("secret") String secret);
-
 }
 
 

+ 1 - 1
gateway-service/src/main/java/com/diagbot/client/hystrix/DiagbotmanServiceHystrix.java

@@ -22,7 +22,7 @@ public class DiagbotmanServiceHystrix implements DiagbotmanServiceClient {
     }
 
     @Override
-    public RespDTO<Boolean> hasPermission(String appkey, String secret, Long productId) {
+    public RespDTO<String> hasPermission(String appkey) {
         log.error("【hystrix】调用{}异常","hasPermisson");
         return null;
     }

+ 0 - 6
gateway-service/src/main/java/com/diagbot/client/hystrix/UserServiceHystrix.java

@@ -19,10 +19,4 @@ public class UserServiceHystrix implements UserServiceClient {
         log.error("【hystrix】调用{}异常","login");
         return null;
     }
-
-    @Override
-    public RespDTO getPermission(String appkey, String secret) {
-        log.error("【hystrix】调用{}异常","getPermission");
-        return null;
-    }
 }

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

@@ -80,7 +80,7 @@ public class GlobalGatewayFilter implements GlobalFilter {
             Long productId = SERVICE_FILTER.get(SERVICE_FILTER.get(serviceName));
             productId = 1L;
             //获取appkey,secret对应的权限信息
-            RespDTO<Boolean> res = diagbotmanServiceClient.hasPermission(appkey, secret, productId);
+            RespDTO<String> res = diagbotmanServiceClient.hasPermission(appkey);
             System.out.println(11);
         }