Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

gic-store-service/src/main/java/com/gic/store/service/impl/StoreServiceImpl.java

@@ -19,6 +19,8 @@ import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -33,6 +35,7 @@ import java.util.stream.Stream;
  */
 @Service
 public class StoreServiceImpl implements StoreService {
+    private static Logger logger = LogManager.getLogger(StoreServiceImpl.class);
 
     @Autowired
     TabStoreInfoMapper tabStoreInfoMapper;
@@ -278,7 +281,7 @@ public class StoreServiceImpl implements StoreService {
             }
 
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.warn("异常：", e);
         }
         return 1;
     }
@@ -309,7 +312,7 @@ public class StoreServiceImpl implements StoreService {
             }
 
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.warn("异常：", e);
         }
         return 0;
     }
@@ -335,7 +338,7 @@ public class StoreServiceImpl implements StoreService {
             }
 
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.warn("异常：", e);
         }
         return 1;
     }
@@ -354,7 +357,7 @@ public class StoreServiceImpl implements StoreService {
                 return this.tabStoreInfoMapper.updateStoreBrandBystoreInfoIds(enterpriseId, value, list);
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.warn("异常：", e);
         }
         return 0;
     }
@@ -373,7 +376,7 @@ public class StoreServiceImpl implements StoreService {
                 return this.tabStoreMapper.updateStoreGroupBystoreInfoIds(enterpriseId, value, list);
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.warn("异常：", e);
         }
         return 0;
     }

gic-store-service/src/main/java/com/gic/store/service/impl/StoreWidgetServiceImpl.java

@@ -66,7 +66,4 @@ public class StoreWidgetServiceImpl implements StoreWidgetService {
         return this.tabStoreWidgetMapper.updateByPrimaryKeySelective(storeWidget);
     }
 
-    public static void main(String[] args){
-        System.out.println(Integer.MAX_VALUE);
-    }
 }

gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkApiServiceImpl.java

@@ -873,7 +873,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
             logger.info("导购增改微盟参数:{}", JSONObject.toJSONString(params));
             client.sendMessage("synClerkInfoToWeimobMq", JSONObject.toJSONString(params));
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.warn("exception", e);
         }
     }
 

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java

@@ -1340,7 +1340,7 @@ public class StoreApiServiceImpl implements StoreApiService {
         try {
             clientInstance.sendMessage("storeIndexMq", json.toJSONString());
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.warn("异常：", e);
         }
         return ServiceResponse.success();
     }

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreAuthorizationApiServiceImpl.java

@@ -212,7 +212,7 @@ public class StoreAuthorizationApiServiceImpl implements StoreAuthorizationApiSe
         try {
             client.sendMessage("storeAuthorizationMq", JSON.toJSONString(params));
         } catch (Exception e) {
-            e.printStackTrace();
+            log.warn("exception", e);
         }
     }
 

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreDictApiServiceImpl.java

@@ -271,15 +271,6 @@ public class StoreDictApiServiceImpl implements StoreDictApiService {
         return ServiceResponse.success();
     }
 
-    public static void main(String[] args){
-        List<String> existList = Arrays.asList("1","2", "3");
-        List<String> newList = Arrays.asList("2", "3", "4");
-        List<String> add = newList.stream().filter(s -> !existList.contains(s)).collect(Collectors.toList());
-        List<String> del = existList.stream().filter(s -> !newList.contains(s)).collect(Collectors.toList());
-        System.out.println(add);
-        System.out.println(del);
-    }
-
     @Override
     public ServiceResponse<List<String>> listStoreFieldDictValue(Integer enterpriseId) {
         return ServiceResponse.success(this.storeDictService.listStoreField(enterpriseId));

gic-store-service/src/main/java/com/gic/store/utils/baidumap/BaiduMapUtils.java

@@ -49,17 +49,17 @@ public class BaiduMapUtils {
                 response.close();
             }
         } catch (ClientProtocolException e) {
-            e.printStackTrace();
+            logger.warn("百度地图调用失败:", e);
         } catch (ParseException e) {
-            e.printStackTrace();
+            logger.warn("百度地图调用失败:", e);
         } catch (IOException e) {
-            e.printStackTrace();
+            logger.warn("百度地图调用失败:", e);
         } finally {
             // 关闭连接,释放资源
             try {
                 httpclient.close();
             } catch (IOException e) {
-                e.printStackTrace();
+                logger.warn("百度地图调用失败:", e);
             }
         }
         return null;

gic-store-service/src/main/java/com/gic/store/utils/field/TextField.java

@@ -109,18 +109,6 @@ public class TextField extends FieldBase {
         String 数字符号 = 数字 + 符号;
         String 字母符号 = 字母 + 符号;
 
-        System.out.println("中文:" + textField.validate(中文));
-        System.out.println("数字:" + textField.validate(数字));
-        System.out.println("字母:" + textField.validate(字母));
-        System.out.println("符号:" + textField.validate(符号));
-        System.out.println("中文数字:" + textField.validate(中文数字));
-        System.out.println("中文字母:" + textField.validate(中文字母));
-        System.out.println("中文符号:" + textField.validate(中文符号));
-        System.out.println("数字字母:" + textField.validate(数字字母));
-        System.out.println("数字符号:" + textField.validate(数字符号));
-        System.out.println("字母符号:" + textField.validate(字母符号));
-
-
     }
 
 }