Merge remote-tracking branch 'origin/dev_20211205' into dev_20211205

liquidnet-bus-feign/liquidnet-api-feign-adam/src/main/java/com/liquidnet/service/feign/adam/rsc/FeignAdamPlatformClient.java

+package com.liquidnet.service.feign.adam.rsc;
+
+import feign.hystrix.FallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@Component
+@FeignClient(name = "liquidnet-service-chime",
+        contextId = "FeignAdamPlatformClient", path = "platform",
+        url = "${liquidnet.service.platform.url}",
+        fallback = FallbackFactory.Default.class)
+public interface FeignAdamPlatformClient {
+
+    @PostMapping("stone/inner/initScore")
+    void initScore(@RequestParam(value = "uid") String uid);
+}

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

@@ -10,6 +10,7 @@ import com.liquidnet.service.adam.util.QueueUtils;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.feign.adam.rsc.FeignAdamPlatformClient;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -36,6 +37,8 @@ public class AdamMemberController {
     AdamRdmService adamRdmService;
     @Autowired
     IAdamUserMemberService adamUserMemberService;
+    @Autowired
+    FeignAdamPlatformClient feignAdamPlatformClient;
 
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "会员信息")
@@ -145,6 +148,12 @@ public class AdamMemberController {
         joinusVo.setQrCode(userInfoVo.getQrCode());
         joinusVo.setCardface(adamRdmService.getMemberCardface(joinusVo.getType()));
 
+        try {
+            feignAdamPlatformClient.initScore(currentUid);
+        } catch (Exception e) {
+            log.error("领取会员卡:积分处理异常[UID:{}]", currentUid, e);
+        }
+
         return ResponseDto.success(joinusVo);
     }
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/bootstrap-service-adam.yml

@@ -10,7 +10,7 @@ spring:
   cloud:
     config:
 #      uri: http://127.0.0.1:7002/support-config
-#      uri: http://39.106.122.201:7002/support-config
+#      uri: http://39.107.71.112:7002/support-config
       profile: ${liquidnet.cloudConfig.profile}
       name: ${spring.application.name} #默认为spring.application.name
       discovery:

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/stone/InnerController.java

@@ -21,9 +21,9 @@ public class InnerController {
 
     @PostMapping("initScore")
     @ApiOperation("会员卡领取积分")
-    public ResponseDto<Boolean> initScore(@RequestParam("uid") String uid) {
-        Boolean result = data.initScore(uid);
-        return ResponseDto.success(result);
+    public void initScore(@RequestParam("uid") String uid) {
+        data.initScore(uid);
+//        return ResponseDto.success(result);
     }
 
 }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/stone/StoneServerImpl.java

@@ -55,9 +55,9 @@ public class StoneServerImpl {
     @Autowired
     FeignStoneIntegralClient stoneIntegralClient;
 
-    private static final String SQL_URL = "jdbc:mysql://zhengzairead.rwlb.rds.aliyuncs.com:3306/ln_scene";
-    private static final String SQL_USER = "readonly";
-    private static final String SQL_PWD = "ZWDsf8Fy";
+    private static final String SQL_URL = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/ln_scene";
+    private static final String SQL_USER = "zhengzai";
+    private static final String SQL_PWD = "GDDHBJOEcJw!";
 
     public boolean initScore(String uid) {
         try {