diff --git a/src/main/java/com/chinaunicom/mall/ebtp/faceCompare/service/impl/FaceRecogServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/faceCompare/service/impl/FaceRecogServiceImpl.java index 39b1a8d..a11a44b 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/faceCompare/service/impl/FaceRecogServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/faceCompare/service/impl/FaceRecogServiceImpl.java @@ -24,6 +24,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; import java.io.*; import java.math.BigDecimal; import java.util.Base64; @@ -40,7 +41,7 @@ import java.util.Map; @Slf4j public class FaceRecogServiceImpl implements FaceRecogService { - + @Resource private ExtendFeignClient extendFeignClient; @Autowired diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/controller/UserInfoController.java b/src/main/java/com/chinaunicom/mall/ebtp/userinfo/controller/UserInfoController.java index 4906eff..be1e8a5 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/controller/UserInfoController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/userinfo/controller/UserInfoController.java @@ -22,6 +22,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; import java.nio.charset.StandardCharsets; @@ -41,7 +42,7 @@ public class UserInfoController { @Autowired private EbtpUserInfoService ebtpUserInfoService; - + @Resource private SupplierbaseFeignClient supplierbaseFeignClient; @Autowired diff --git a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/service/impl/EbtpUserInfoServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/userinfo/service/impl/EbtpUserInfoServiceImpl.java index 87a2704..bc8c98f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/userinfo/service/impl/EbtpUserInfoServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/userinfo/service/impl/EbtpUserInfoServiceImpl.java @@ -50,13 +50,13 @@ public class EbtpUserInfoServiceImpl implements EbtpUserInfoService { @Resource private UnicomOAuthClient unicomOAuthClient; - + @Resource private RsmsFeignClient rsmsFeignClient; - + @Resource private AssessjFeignClient assessjFeignClient; - + @Resource private ExtendFeignClient extendFeignClient; @Value("${auth.oauth.expert_url}") diff --git a/src/main/java/com/coscoshipping/ebtp/project/SysManagerEbtpProjectApplication.java b/src/main/java/com/coscoshipping/ebtp/project/SysManagerEbtpProjectApplication.java index 8a7960b..1a98c1a 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/SysManagerEbtpProjectApplication.java +++ b/src/main/java/com/coscoshipping/ebtp/project/SysManagerEbtpProjectApplication.java @@ -16,7 +16,7 @@ import org.springframework.context.annotation.ComponentScan; DataSourceAutoConfiguration.class, DruidDataSourceAutoConfigure.class }) -@EnableFeignClients +@EnableFeignClients(basePackages = {"com.coscoshipping.ebtp.*", "com.chinaunicom.mall.ebtp.*"}) @MapperScan({"com.coscoshipping.ebtp.project.**.dao", "com.chinaunicom.mall.ebtp.**.dao"}) @ComponentScan(basePackages = {"com.coscoshipping.ebtp.*", "com.chinaunicom.mall.ebtp.*"}) public class SysManagerEbtpProjectApplication { diff --git a/src/main/java/com/coscoshipping/ebtp/project/menu/controller/SysMenuController.java b/src/main/java/com/coscoshipping/ebtp/project/menu/controller/SysMenuController.java index bff6d54..12df32d 100644 --- a/src/main/java/com/coscoshipping/ebtp/project/menu/controller/SysMenuController.java +++ b/src/main/java/com/coscoshipping/ebtp/project/menu/controller/SysMenuController.java @@ -128,7 +128,7 @@ public class SysMenuController extends BaseController return BaseResponse.success(menuService.deleteMenuById(menuId)); } @GetMapping(value = "/expert/role/menu") - public BaseResponse> getBaseRoleTabulation(@RequestParam String userId) + public BaseResponse> getBaseRoleTabulation(@RequestParam("userId") String userId) { return BaseResponse.success(menuService.getBaseRoleTabulation(userId)); }