Merge branch 'pre' into 'master'

Pre

See merge request !141

liquidnet-bus-config/liquidnet-config/liquidnet-service-stone.yml

@@ -125,6 +125,7 @@ global-auth:
     - ${liquidnet.info.context}/user/inner/**
     - ${liquidnet.info.context}/user/logs/in2111
     - ${liquidnet.info.context}/user/logs/de2111
+    - ${liquidnet.info.context}/user/logs/in2112
   oncheck-url-pattern:
 #    - ${liquidnet.info.context}/**
 # -----------------------------------------------------------

liquidnet-bus-feign/liquidnet-api-feign-stone/src/main/java/com/liquidnet/service/feign/stone/api/FeignStoneIntegralClient.java

@@ -33,7 +33,7 @@ public interface FeignStoneIntegralClient {
     @GetMapping(value = "user/info", headers = {"Inner-Required=1"})
     ResponseDto<StoneScoreListDto> stoneUserInfo();
 
-    // 增加积分
+    // 增加积分 积分有上线
     @PostMapping(value = "user/logs/in2111")
     ResponseDto<String> in2111(
             @RequestParam(value = "uid") String uid,
@@ -41,7 +41,7 @@ public interface FeignStoneIntegralClient {
             @RequestParam(value = "content") String content
     );
 
-    // 增加积分
+    // 增加积分 积分无上线
     @PostMapping(value = "user/logs/in2112")
     ResponseDto<String> in2112(
             @RequestParam(value = "uid") String uid,

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/receiver/ConsumerSweetStoneIntegralReceiver.java

@@ -66,7 +66,7 @@ public class ConsumerSweetStoneIntegralReceiver extends AbstractSqlRedisReceiver
                     return true;
                 }
                 if (param.getType() == 1) {
-                    res = feignStoneIntegralClient.in2111(
+                    res = feignStoneIntegralClient.in2112(
                             param.getUid(),
                             param.getScore(),
                             param.getContent()