Revert "bug fix"

This reverts commit ca69139b.

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/bootstrap-client-admin-web.yml

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

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

@@ -2,10 +2,10 @@ server:
   port: ${liquidnet.info.port}
   tomcat:
     uri-encoding: UTF-8
-    maxThreads: 200 #默认200
-    minSpareThreads: 10 #默认10
-    maxConnections: 10 #默认10000
-    acceptCount: 100  #默认100
+    maxThreads: 2000 #默认200
+    minSpareThreads: 2000 #默认10
+    maxConnections: 20000 #默认10000
+    acceptCount: 5000  #默认100
     processorCache: -1  #默认200
   servlet:
     context-path: ${liquidnet.info.context}

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/MerchantAuthorizationRecordsServiceImpl.java

@@ -53,11 +53,9 @@ public class MerchantAuthorizationRecordsServiceImpl implements IMerchantAuthori
     public List<MerchantAuthorizationRecordsVo> performanceRecordCheckers(String cuid, String performanceId) {
         List<MerchantAuthorizationRecordsVo> authorizationRecordsVos = merchantMongoService.getAuthorizationRecordsCheckersVosByCuid(cuid, performanceId);
 
-        if (!CollectionUtil.isEmpty(authorizationRecordsVos)) {
-            for (MerchantAuthorizationRecordsVo recordsVo: authorizationRecordsVos) {
-                if (null != recordsVo.getMobile() && recordsVo.getMobile().length() > 4) {
-                    recordsVo.setMobile(StringUtil.hiddenMobile(recordsVo.getMobile()));
-                }
+        for (MerchantAuthorizationRecordsVo recordsVo: authorizationRecordsVos) {
+            if (null != recordsVo.getMobile() && recordsVo.getMobile().length() > 4) {
+                recordsVo.setMobile(StringUtil.hiddenMobile(recordsVo.getMobile()));
             }
         }
 

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/MerchantFieldsServiceImpl.java

@@ -147,13 +147,10 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
 
         List<MerchantFieldCheckersVo> fieldCheckersVos = merchantRdmService.getFieldCheckersVosByFieldId(fieldId);
 
-        if (!CollectionUtil.isEmpty(fieldCheckersVos)) {
-            for (MerchantFieldCheckersVo checkersVo : fieldCheckersVos) {
-                if (null != checkersVo.getMobile() && checkersVo.getMobile().length() > 4) {
-                    checkersVo.setMobile(StringUtil.hiddenMobile(checkersVo.getMobile()));
-                }
+        for (MerchantFieldCheckersVo checkersVo : fieldCheckersVos) {
+            if (null != checkersVo.getMobile() && checkersVo.getMobile().length() > 4) {
+                checkersVo.setMobile(StringUtil.hiddenMobile(checkersVo.getMobile()));
             }
-
         }
 
         return fieldCheckersVos;

liquidnet-bus-support/liquidnet-support-config/src/main/resources/application-dev.yml

@@ -21,8 +21,7 @@ liquidnet:
     #    location: /Users/color/company_project/java/liquidnet-bus-v1-1/liquidnet-bus-config/liquidnet-config
     #    location: /Users/Tice/Company/Liquidnet/Liquidnet_Bus/liquidnet-bus-config/liquidnet-config
 #    location: /Users/hujiachen/IdeaProjects/liquidnet-bus-v1/liquidnet-bus-config/liquidnet-config
-#    location: /app/support-config
-    location: /Users/Tice/Company/Liquidnet/Liquidnet_Bus/liquidnet-bus-config/liquidnet-config
+    location: /app/support-config
 # end-dev-这里是配置信息基本值
 
 spring: