Merge branch 'master' into hjc_ajb_wf

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberController.java

@@ -15,6 +15,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,6 +39,7 @@ public class AdamMemberController {
     @Autowired
     IAdamUserMemberService adamUserMemberService;
     @Autowired
+    @Lazy
     FeignAdamPlatformClient feignAdamPlatformClient;
 
     @ApiOperationSupport(order = 1)

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java

@@ -21,6 +21,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -44,6 +45,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
     @Autowired
     IAdamUserMemberService adamUserMemberService;
     @Autowired
+    @Lazy
     FeignStoneIntegralClient feignStoneIntegralClient;
 
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserInfoServiceImpl.java

@@ -24,6 +24,7 @@ import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.DigestUtils;
 
@@ -55,8 +56,10 @@ public class AdamUserInfoServiceImpl implements IAdamUserInfoService {
     private EasemobUtil easemobUtil;
 
     @Autowired
+    @Lazy
     private FeignAdamChimeClient feignAdamChimeClient;
     @Autowired
+    @Lazy
     private FeignAdamStoneClient feignAdamStoneClient;
 
     @Value("${liquidnet.reviewer.user-info}")