Jelajahi Sumber

远程调用用户和机构信息

zhoutg 6 tahun lalu
induk
melakukan
1d3f578304

+ 3 - 2
diagbotman-service/src/main/java/com/diagbot/client/UserServiceClient.java

@@ -3,7 +3,7 @@ package com.diagbot.client;
 import com.diagbot.client.hystrix.UserServiceHystrix;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.User;
-import com.diagbot.entity.UserOrgVO;
+import com.diagbot.dto.UserOrgDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,7 +26,8 @@ public interface UserServiceClient {
     RespDTO<User> getUser(@RequestHeader(value = "Authorization") String token, @PathVariable("username") String username);
 
     @PostMapping(value = "/user/getUserAndOrg")
-    RespDTO<Map<Long, UserOrgVO>> getUserAndOrg(@RequestBody List<Long> userIds);
+    RespDTO<Map<Long, UserOrgDTO>> getUserAndOrg(@RequestBody List<Long> userIds);
+
 }
 
 

+ 2 - 2
diagbotman-service/src/main/java/com/diagbot/client/hystrix/UserServiceHystrix.java

@@ -3,7 +3,7 @@ package com.diagbot.client.hystrix;
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.User;
-import com.diagbot.entity.UserOrgVO;
+import com.diagbot.dto.UserOrgDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
@@ -28,7 +28,7 @@ public class UserServiceHystrix implements UserServiceClient {
     }
 
     @Override
-    public RespDTO<Map<Long, UserOrgVO>> getUserAndOrg(List<Long> userIds) {
+    public RespDTO<Map<Long, UserOrgDTO>> getUserAndOrg(List<Long> userIds) {
         log.error("【hystrix】调用{}异常","getUserAndOrg");
         return null;
     }

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

@@ -28,6 +28,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .regexMatchers(".*swagger.*",".*v2.*",".*webjars.*","/druid.*","/actuator.*","/hystrix.*"
                         ,"/service_filter/getAll", "/serviceToken/hasPermission").permitAll()
                 .antMatchers("/getDiagbotManEnumsData").permitAll()
+                .antMatchers("/diagLantoneProduct/selectProduct").permitAll()
                 .antMatchers("/**").authenticated();
 //        .antMatchers("/**").permitAll();
     }

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

@@ -37,6 +37,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                     || matchers("/getDiagbotManEnumsData", request)
                     || matchers("/service_filter/getAll", request)
                     || matchers("/serviceToken/hasPermission", request)
+                    || matchers("/diagLantoneProduct/selectProduct", request)
                     || matchers("/", request)){
                 return;
             } else {

+ 2 - 2
diagbotman-service/src/main/java/com/diagbot/entity/UserOrgVO.java

@@ -1,4 +1,4 @@
-package com.diagbot.entity;
+package com.diagbot.dto;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -13,7 +13,7 @@ import java.io.Serializable;
 
 @Getter
 @Setter
-public class UserOrgVO implements Serializable{
+public class UserOrgDTO implements Serializable{
 	
 	 private static final long serialVersionUID = 1L;