打印语句都改log

crmeb-admin/src/main/java/com/zbkj/admin/controller/CallbackController.java

@@ -40,9 +40,9 @@ public class CallbackController {
     @ApiOperation(value = "微信支付回调")
     @RequestMapping(value = "/wechat", method = RequestMethod.POST)
     public String weChat(@RequestBody String  request) {
-        System.out.println("微信支付回调 request ===> " + request);
+        log.info("微信支付回调 request ===> " + request);
         String response = callbackService.weChat(request);
-        System.out.println("微信支付回调 response ===> " + response);
+        log.info("微信支付回调 response ===> " + response);
         return response;
     }
 
@@ -53,7 +53,7 @@ public class CallbackController {
     @RequestMapping(value = "/alipay", method = RequestMethod.POST)
     public String aliPay(HttpServletRequest request){
         //支付宝支付回调
-        System.out.println("支付宝支付回调 request ===> " + request.getParameterMap());
+        log.info("支付宝支付回调 request ===> " + request.getParameterMap());
         return callbackService.aliPay(request);
     }
 
@@ -63,9 +63,9 @@ public class CallbackController {
     @ApiOperation(value = "微信退款回调")
     @RequestMapping(value = "/wechat/refund", method = RequestMethod.POST)
     public String weChatRefund(@RequestBody String request) {
-        System.out.println("微信退款回调 request ===> " + request);
+        log.info("微信退款回调 request ===> " + request);
         String response = callbackService.weChatRefund(request);
-        System.out.println("微信退款回调 response ===> " + response);
+        log.info("微信退款回调 response ===> " + response);
         return response;
     }
 }

crmeb-admin/src/main/java/com/zbkj/admin/controller/WechatCallbackController.java

@@ -66,7 +66,7 @@ public class WechatCallbackController {
             @RequestParam(value = "nonce", required = false) String nonce,
             @RequestParam(value = "echostr") String echostr,
             HttpServletResponse response) throws IOException {
-        System.out.println("微信小程序回调测试成功");
+        log.info("微信小程序回调测试成功");
         PrintWriter writer = response.getWriter();
         writer.print(echostr);
         writer.flush();

crmeb-admin/src/main/java/com/zbkj/admin/service/impl/CopyrightServiceImpl.java

@@ -13,6 +13,7 @@ import com.zbkj.common.exception.CrmebException;
 import com.zbkj.common.utils.RestTemplateUtil;
 import com.zbkj.service.service.SystemAttachmentService;
 import com.zbkj.service.service.SystemConfigService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -30,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional;
  * +----------------------------------------------------------------------
  */
 @Service
+@Slf4j
 public class CopyrightServiceImpl implements CopyrightService {
 
     @Autowired
@@ -72,7 +74,7 @@ public class CopyrightServiceImpl implements CopyrightService {
         if (ObjectUtil.isNull(jsonObject.getInteger("status")) || !jsonObject.getInteger("status").equals(200)) {
             throw new CrmebException("CRMEB版权接口调用失败," + jsonObject);
         }
-        System.out.println("==================================== " + jsonObject.toString());
+        log.info("==================================== " + jsonObject.toString());
         JSONObject dataJson = jsonObject.getJSONObject(CRMEB_COPYRIGHT_URL_DATA);
 
         response.setStatus(dataJson.getInteger(CRMEB_COPYRIGHT_URL_STATUS));

crmeb-common/src/main/java/com/zbkj/common/utils/AppleUtil.java

@@ -91,7 +91,7 @@ public class AppleUtil {
         try {
             Jws<Claims> claim = jwtParser.parseClaimsJws(jwt);
             if (claim != null && claim.getBody().containsKey("auth_time")) {
-                System.out.println(claim);
+                log.info(claim);
                 return true;
             }
             return false;

crmeb-common/src/main/java/com/zbkj/common/utils/CrmebDateUtil.java

@@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil;
 import com.zbkj.common.constants.DateConstants;
 import com.zbkj.common.exception.CrmebException;
 import com.zbkj.common.vo.DateLimitUtilVo;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -27,6 +28,7 @@ import java.util.*;
  * | Author: CRMEB Team <admin@crmeb.com>
  * +----------------------------------------------------------------------
  **/
+@Slf4j
 public final class CrmebDateUtil {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CrmebDateUtil.class);
@@ -703,8 +705,8 @@ public final class CrmebDateUtil {
 
     public static void main(String[] args) {
         DateLimitUtilVo dateLimit = getDateLimit(DateConstants.SEARCH_DATE_LATELY_7);
-        System.out.println(dateLimit.getStartTime());
+        log.info(dateLimit.getStartTime());
-        System.out.println(dateLimit.getEndTime());
+        log.info(dateLimit.getEndTime());
     }
 
     /**

crmeb-common/src/main/java/com/zbkj/common/utils/CrmebUtil.java

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.zbkj.common.config.CrmebConfig;
 import com.zbkj.common.constants.Constants;
 import com.zbkj.common.exception.CrmebException;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -39,6 +40,7 @@ import java.util.regex.Pattern;
  * +----------------------------------------------------------------------
  */
 @Component
+@Slf4j
 public class CrmebUtil {
 
     @Autowired
@@ -141,8 +143,8 @@ public class CrmebUtil {
      * @param args String[] 字符串数组
      */
     public static void main(String[] args) throws Exception {
-//        System.out.println(encryptPassword("Mao.zhuxiwansui123", "admin"));
+//        log.info(encryptPassword("Mao.zhuxiwansui123", "admin"));
-		System.out.println(decryptPassowrd("f6mcpGQ8NEmwbab2TlkpUg==", "18292417675"));
+		log.info(decryptPassowrd("f6mcpGQ8NEmwbab2TlkpUg==", "18292417675"));
     }
 
     /**
@@ -793,7 +795,7 @@ public class CrmebUtil {
         String result = CrmebUtil.mapToStringUrl(map) + "&key=" + signKey;
 //        return DigestUtils.md5Hex(result).toUpperCase();
         String sign = SecureUtil.md5(result).toUpperCase();
-        System.out.println("sign ========== " + sign);
+        log.info("sign ========== " + sign);
         return sign;
     }
 

crmeb-common/src/main/java/com/zbkj/common/utils/OnePassUtil.java

@@ -1,5 +1,7 @@
 package com.zbkj.common.utils;
 
+import lombok.extern.slf4j.Slf4j;
+
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
@@ -10,6 +12,7 @@ import java.util.Base64;
  * @Date: 2023/8/29 12:14
  * @Description: 描述对应的业务场景
  */
+@Slf4j
 public class OnePassUtil {
     private static final String ENCRYPTION_ALGORITHM = "AES/CBC/PKCS5Padding";
 
@@ -43,7 +46,7 @@ public class OnePassUtil {
 //
 //            // 解密字符串
 //            String decryptedString = decrypt(encryptedString);
-//            System.out.println("解密后的字符串: " + decryptedString);
+//            log.info("解密后的字符串: " + decryptedString);
 //        } catch (Exception e) {
 //            e.printStackTrace();
 //        }

crmeb-common/src/main/java/com/zbkj/common/utils/RestTemplateUtil.java

@@ -2,6 +2,7 @@ package com.zbkj.common.utils;
 
 import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.config.RequestConfig;
@@ -48,6 +49,7 @@ import java.util.Objects;
  */
 
 @Component
+@Slf4j
 public class RestTemplateUtil {
 
     @Autowired
@@ -242,7 +244,7 @@ public class RestTemplateUtil {
 
         ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, requestEntity, String.class);
         try{
-            System.out.println("responseEntity"+responseEntity);
+            log.info("responseEntity"+responseEntity);
             return new String(Objects.requireNonNull(responseEntity.getBody()).getBytes("UTF-8"), StandardCharsets.UTF_8);
         }catch (Exception e){
             return "";
@@ -355,7 +357,7 @@ public class RestTemplateUtil {
         String body1 = restTemplate.postForEntity( url, requestEntity, String.class).getBody();
 
 
-        System.out.println(body1);
+        log.info(body1);
 
         return  body1;
 
@@ -379,7 +381,7 @@ public class RestTemplateUtil {
         String body1 = restTemplate.postForEntity( url, requestEntity, String.class).getBody();
 
 
-        System.out.println(body1);
+        log.info(body1);
 
         return  body1;
 
@@ -400,7 +402,7 @@ public class RestTemplateUtil {
         String body1 = restTemplate.postForEntity(url, requestEntity, String.class).getBody();
 
 
-        System.out.println(body1);
+        log.info(body1);
 
         return body1;
 

crmeb-common/src/main/java/com/zbkj/common/utils/SCRMUtils.java

@@ -1,5 +1,6 @@
 package com.zbkj.common.utils;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -10,7 +11,7 @@ import java.util.HashMap;
  * @Date: 2023/9/9 15:19
  * @Description: For SCRM
  */
-
+@Slf4j
 @Component
 public class SCRMUtils {
 
@@ -26,7 +27,7 @@ public class SCRMUtils {
         addUserPram.put("nikename", nikename);
         addUserPram.put("type", type);
         String result = restTemplateUtil.postMapData(scrm_addUser_URL, addUserPram);
-        System.out.println("result:"+result);
+        log.info("result:"+result);
     }
 
 

crmeb-common/src/main/java/com/zbkj/common/utils/UploadWeChatMediaUtil.java

@@ -3,6 +3,7 @@ package com.zbkj.common.utils;
 
 import com.alibaba.fastjson.JSONObject;
 import com.zbkj.common.exception.CrmebException;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -29,6 +30,7 @@ import java.io.InputStream;
  * | Author: CRMEB Team <admin@crmeb.com>
  * +----------------------------------------------------------------------
  */
+@Slf4j
 public class UploadWeChatMediaUtil {
     /**
      * 把文件上传到指定url上去
@@ -58,7 +60,7 @@ public class UploadWeChatMediaUtil {
             httppost.setEntity(reqEntity);
             CloseableHttpResponse response = httpclient.execute(httppost);
             try {
-                System.out.println(response.getStatusLine());
+                log.info(response.getStatusLine());
                 HttpEntity resEntity = response.getEntity();
                 if (resEntity != null) {
                     String responseEntityStr = EntityUtils.toString(response.getEntity());

crmeb-common/src/main/java/com/zbkj/common/utils/UrlUtil.java

@@ -1,6 +1,7 @@
 package com.zbkj.common.utils;
 
 import cn.hutool.core.util.StrUtil;
+import lombok.extern.slf4j.Slf4j;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -17,6 +18,7 @@ import java.util.Map;
  *  | Author: CRMEB Team <admin@crmeb.com>
  *  +----------------------------------------------------------------------
  */
+@Slf4j
 public class UrlUtil {
     public static class UrlEntity {
         /**
@@ -68,15 +70,5 @@ public class UrlUtil {
         return entity.params.get(key);
     }
 
-    /**
+
-     * 测试
-     *
-     * @param args
-     */
-    public static void main(String[] args) {
-        UrlEntity entity = parse(null);
-        entity = parse("http://www.123.com?id=1&name=小明");
-        System.out.println(entity.baseUrl + "\n" + entity.params);
-        System.out.println(entity.params.get("id"));
-    }
 }

crmeb-common/src/main/java/com/zbkj/common/utils/WxPayUtil.java

@@ -9,6 +9,7 @@ import com.zbkj.common.constants.PayConstants;
 import com.zbkj.common.exception.CrmebException;
 import com.zbkj.common.vo.CreateOrderRequestVo;
 import com.zbkj.common.vo.WxRefundVo;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -30,6 +31,7 @@ import java.util.*;
  *  | Author: CRMEB Team <admin@crmeb.com>
  *  +----------------------------------------------------------------------
  */
+@Slf4j
 public class WxPayUtil {
 
     /**
@@ -88,7 +90,7 @@ public class WxPayUtil {
         }
         sb.append("key=").append(signKey);
         String sign = SecureUtil.md5(sb.toString()).toUpperCase();
-        System.out.println("sign ========== " + sign);
+        log.info("sign ========== " + sign);
         return sign;
     }
 
@@ -115,7 +117,7 @@ public class WxPayUtil {
         }
         sb.append("key=").append(signKey);
         String sign = SecureUtil.md5(sb.toString()).toUpperCase();
-        System.out.println("sign ========== " + sign);
+        log.info("sign ========== " + sign);
         return sign;
     }
 
@@ -140,7 +142,7 @@ public class WxPayUtil {
         }
         sb.append("key=").append(signKey);
         String sign = SecureUtil.md5(sb.toString()).toUpperCase();
-        System.out.println("sign ========== " + sign);
+        log.info("sign ========== " + sign);
         return sign;
     }
 
@@ -165,7 +167,7 @@ public class WxPayUtil {
         }
         sb.append("key=").append(signKey);
         String sign = SecureUtil.md5(sb.toString()).toUpperCase();
-        System.out.println("sign ========== " + sign);
+        log.info("sign ========== " + sign);
         return sign;
     }
 
@@ -214,7 +216,7 @@ public class WxPayUtil {
             }
             return data;
         } catch (Exception ex) {
-            System.out.println(StrUtil.format("Invalid XML, can not convert to map. Error message: {}. XML content: {}", ex.getMessage(), strXML));
+            log.info(StrUtil.format("Invalid XML, can not convert to map. Error message: {}. XML content: {}", ex.getMessage(), strXML));
             throw ex;
         }
 

crmeb-common/src/main/java/com/zbkj/common/vo/MyRecord.java

@@ -2,6 +2,7 @@ package com.zbkj.common.vo;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.StringUtils;
@@ -26,6 +27,7 @@ import java.util.*;
  * | Author: CRMEB Team <admin@crmeb.com>
  * +----------------------------------------------------------------------
  */
+@Slf4j
 public class MyRecord implements Serializable {
 
     private static final long serialVersionUID = 905784513600884082L;
@@ -351,7 +353,7 @@ public class MyRecord implements Serializable {
             try {
                 return NumberFormat.getInstance().parse(getColumns().get(column).toString());
             } catch (ParseException e) {
-                System.out.println("类型转换错误e = " + e.getMessage());
+                log.info("类型转换错误e = " + e.getMessage());
                 e.printStackTrace();
             }
         }

crmeb-front/src/main/java/com/zbkj/front/service/impl/UserCenterServiceImpl.java

@@ -37,6 +37,7 @@ import com.zbkj.front.service.LoginService;
 import com.zbkj.front.service.UserCenterService;
 import com.zbkj.service.dao.UserDao;
 import com.zbkj.service.service.*;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -65,6 +66,7 @@ import java.util.stream.Collectors;
  * +----------------------------------------------------------------------
  */
 @Service
+@Slf4j
 public class UserCenterServiceImpl extends ServiceImpl<UserDao, User> implements UserCenterService {
 
     private final Logger logger = LoggerFactory.getLogger(UserCenterServiceImpl.class);
@@ -529,7 +531,7 @@ public class UserCenterServiceImpl extends ServiceImpl<UserDao, User> implements
     @Override
     public LoginResponse weChatAuthorizeProgramLogin(String code, RegisterThirdUserRequest request) {
         WeChatMiniAuthorizeVo response = wechatNewService.miniAuthCode(code);
-        System.out.println("小程序登陆成功 = " + JSON.toJSONString(response));
+        log.info("小程序登陆成功 = " + JSON.toJSONString(response));
 
         //检测是否存在
         UserToken userToken = userTokenService.getByOpenidAndType(response.getOpenId(), Constants.THIRD_LOGIN_TOKEN_TYPE_PROGRAM);
@@ -1269,7 +1271,7 @@ public class UserCenterServiceImpl extends ServiceImpl<UserDao, User> implements
                 }
 
                 WeChatMiniAuthorizeVo response = wechatNewService.miniAuthCode(request.getCode());
-                System.out.println("小程序登陆成功 = " + JSON.toJSONString(response));
+                log.info("小程序登陆成功 = " + JSON.toJSONString(response));
                 String decrypt = WxUtil.decrypt(programAppId, request.getEncryptedData(), response.getSessionKey(), request.getIv());
                 if (StrUtil.isBlank(decrypt)) {
                     throw new CrmebException("微信小程序获取手机号解密失败");

crmeb-front/src/main/java/com/zbkj/front/util/ContentCheckUtil.java

@@ -26,7 +26,7 @@ public class ContentCheckUtil {
     }
 
     public static void main(String[] args) {
-        System.out.println(checkContent("中国很垃圾","LTAI5tRHmAmcSo3ytLajCLyK","k3dhdkIa2eG8Q5hTGpyspVB0Aeo7SV"));
+        log.info(checkContent("中国很垃圾","LTAI5tRHmAmcSo3ytLajCLyK","k3dhdkIa2eG8Q5hTGpyspVB0Aeo7SV"));
     }
 
     public static String checkContent(String content, String accessKey, String accessKeySecret) {

crmeb-service/src/main/java/com/zbkj/service/delete/ProductUtils.java

@@ -16,6 +16,7 @@ import com.zbkj.common.utils.CrmebUtil;
 import com.zbkj.common.utils.CrmebDateUtil;
 import com.zbkj.common.utils.UrlUtil;
 import com.zbkj.service.service.*;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -47,6 +48,7 @@ import java.util.List;
  * +----------------------------------------------------------------------
  */
 @Service
+@Slf4j
 public class ProductUtils {
     private String baseUrl;
 
@@ -310,7 +312,7 @@ public class ProductUtils {
     public StoreProductRequest getSuningProductInfo(String url, int tag) throws JSONException, IOException {
         setConfig(url, tag);
         JSONObject tbJsonData = getRequestFromUrl(baseUrl + rightUrl);
-        System.out.println("tbJsonData:" + tbJsonData);
+        log.info("tbJsonData:" + tbJsonData);
 //        JSONObject tbJsonData = new JSONObject(JSONExample.snJson); // just Test
         JSONObject data = tbJsonData.getJSONObject("data");
         if (null == data) throw new CrmebException("复制商品失败--返回数据格式错误--未找到data");

crmeb-service/src/main/java/com/zbkj/service/service/impl/CallbackServiceImpl.java

@@ -27,6 +27,7 @@ import com.zbkj.common.vo.AttachVo;
 import com.zbkj.common.vo.CallbackVo;
 import com.zbkj.common.vo.MyRecord;
 import com.zbkj.service.service.*;
+import lombok.extern.slf4j.Slf4j;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -58,6 +59,7 @@ import java.util.*;
  * +----------------------------------------------------------------------
  */
 @Service
+@Slf4j
 public class CallbackServiceImpl implements CallbackService {
 
     private static final Logger logger = LoggerFactory.getLogger(CallbackServiceImpl.class);
@@ -578,7 +580,7 @@ public class CallbackServiceImpl implements CallbackService {
             String signKey = getSignKey(appid);
             // 解码加密信息
             String reqInfo = respMap.get("req_info");
-            System.out.println("encodeReqInfo==>" + reqInfo);
+            log.info("encodeReqInfo==>" + reqInfo);
             try {
                 String decodeInfo = decryptToStr(reqInfo, signKey);
                 Map<String, String> infoMap = WxPayUtil.xmlToMap(decodeInfo);

crmeb-service/src/main/java/com/zbkj/service/service/impl/CategoryServiceImpl.java

@@ -21,6 +21,7 @@ import com.zbkj.common.request.CategorySearchRequest;
 import com.zbkj.service.dao.CategoryDao;
 import com.zbkj.service.service.CategoryService;
 import com.zbkj.service.service.SystemAttachmentService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -45,6 +46,7 @@ import java.util.stream.Collectors;
  *  +----------------------------------------------------------------------
 */
 @Service
+@Slf4j
 public class CategoryServiceImpl extends ServiceImpl<CategoryDao, Category> implements CategoryService {
 
     @Resource
@@ -255,7 +257,7 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryDao, Category> impl
      */
     @Override
     public List<CategoryTreeVo> getListTree(Integer type, Integer status, List<Integer> categoryIdList) {
-        System.out.println("菜单列表:getListTree: type:" + type + "| status:" + status + "| categoryIdList:" + JSON.toJSONString(categoryIdList));
+        log.info("菜单列表:getListTree: type:" + type + "| status:" + status + "| categoryIdList:" + JSON.toJSONString(categoryIdList));
         return getTree(type, status,null,categoryIdList);
     }
 
@@ -327,7 +329,7 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryDao, Category> impl
                 list.add(tree);
             }
         }
-        System.out.println("无限极分类 : getTree:" + JSON.toJSONString(list));
+        log.info("无限极分类 : getTree:" + JSON.toJSONString(list));
         return list;
     }
 

crmeb-service/src/main/java/com/zbkj/service/service/impl/ExpressServiceImpl.java

@@ -19,6 +19,7 @@ import com.zbkj.common.request.ExpressUpdateShowRequest;
 import com.zbkj.service.dao.ExpressDao;
 import com.zbkj.service.service.ExpressService;
 import com.zbkj.service.util.OnePassUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -45,6 +46,7 @@ import java.util.stream.Collectors;
  *  +----------------------------------------------------------------------
 */
 @Service
+@Slf4j
 public class ExpressServiceImpl extends ServiceImpl<ExpressDao, Express> implements ExpressService {
 
     @Resource
@@ -215,7 +217,7 @@ public class ExpressServiceImpl extends ServiceImpl<ExpressDao, Express> impleme
         param.add("limit", 9999);
 
         JSONObject post = onePassUtil.postFrom(OnePassConstants.ONE_PASS_API_URL + OnePassConstants.ONE_PASS_API_EXPRESS_URI, param, header);
-        System.out.println("OnePass Express ALL post = " + post);
+        log.info("OnePass Express ALL post = " + post);
         JSONObject jsonObject = post.getJSONObject("data");
         JSONArray jsonArray = jsonObject.getJSONArray("data");
         if (CollUtil.isEmpty(jsonArray)) return;

crmeb-service/src/main/java/com/zbkj/service/service/impl/OnePassServiceImpl.java

@@ -24,6 +24,7 @@ import com.zbkj.service.service.OnePassService;
 import com.zbkj.service.service.StoreOrderService;
 import com.zbkj.service.service.SystemConfigService;
 import com.zbkj.service.util.OnePassUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +52,7 @@ import java.util.concurrent.TimeUnit;
  * +----------------------------------------------------------------------
  */
 @Service
+@Slf4j
 public class OnePassServiceImpl implements OnePassService {
 
     private final Logger logger = LoggerFactory.getLogger(OnePassServiceImpl.class);
@@ -296,7 +298,7 @@ public class OnePassServiceImpl implements OnePassService {
         MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
         params.add("url", url);
         JSONObject jsonObject = onePassUtil.postFrom(OnePassConstants.ONE_PASS_API_URL + OnePassConstants.ONE_PASS_API_COPY_GOODS_URI, params, header);
-        System.out.println("one pass copy product = " + jsonObject);
+        log.info("one pass copy product = " + jsonObject);
         return jsonObject.getJSONObject("data");
     }
 

crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderTaskServiceImpl.java

@@ -388,7 +388,7 @@ public class OrderTaskServiceImpl implements OrderTaskService {
             }
             order.setStatus(Constants.ORDER_STATUS_INT_COMPLETE);
             Boolean execute = transactionTemplate.execute(e -> {
-                System.out.println("操作的订单ID：" + order.getId());
+                log.info("操作的订单ID：" + order.getId());
                 storeOrderService.updateById(order);
                 storeProductReplyService.saveBatch(replyList);
                 return Boolean.TRUE;

crmeb-service/src/main/java/com/zbkj/service/service/impl/PayComponentDeliveryCompanyServiceImpl.java

@@ -13,6 +13,7 @@ import com.zbkj.service.dao.PayComponentDeliveryCompanyDao;
 import com.zbkj.service.service.ExpressService;
 import com.zbkj.service.service.PayComponentDeliveryCompanyService;
 import com.zbkj.service.service.WechatVideoDeliveryService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,6 +35,7 @@ import java.util.stream.Collectors;
  *  +----------------------------------------------------------------------
  */
 @Service
+@Slf4j
 public class PayComponentDeliveryCompanyServiceImpl extends ServiceImpl<PayComponentDeliveryCompanyDao, PayComponentDeliveryCompany> implements PayComponentDeliveryCompanyService {
 
     @Resource
@@ -64,7 +66,7 @@ public class PayComponentDeliveryCompanyServiceImpl extends ServiceImpl<PayCompo
         if (!saveBatch) {
             throw new CrmebException("批量更新物流公司错误");
         }
-        System.out.println("批量更新物流公司成功");
+        log.info("批量更新物流公司成功");
     }
 
     /**

crmeb-service/src/main/java/com/zbkj/service/service/impl/SmsServiceImpl.java

@@ -161,7 +161,7 @@ public class SmsServiceImpl implements SmsService {
             param.add("phone", sendSmsVo.getMobile());
             param.add("temp_id", sendSmsVo.getTemplate());
             map.entrySet().stream().forEach(entry -> param.add(StrUtil.format(SmsConstants.SMS_COMMON_PARAM_FORMAT, entry.getKey()), entry.getValue()));
-            System.out.println("============发送短信=========header = " + header);
+            log.info("============发送短信=========header = " + header);
             result = restTemplateUtil.postFromUrlencoded(OnePassConstants.ONE_PASS_API_URL + OnePassConstants.ONE_PASS_API_SEND_URI, param, header);
             checkResult(result);
         } catch (Exception e) {
@@ -533,8 +533,8 @@ public class SmsServiceImpl implements SmsService {
         RuntimeOptions runtime = new RuntimeOptions();
         try {
             SendSmsResponse sendSmsResponse = smsClient.sendSmsWithOptions(sendSmsRequest, runtime);
-            System.out.println("短信内容================" + sendSmsResponse.getBody().getMessage());
+            log.info("短信内容================" + sendSmsResponse.getBody().getMessage());
-            System.out.println("短信内容================" + sendSmsResponse.getBody().getCode());
+            log.info("短信内容================" + sendSmsResponse.getBody().getCode());
         } catch (Exception error) {
             log.error("错误信息===" ,error);
             // 如有需要，请打印 error

crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemRoleServiceImpl.java

@@ -27,6 +27,7 @@ import com.zbkj.service.service.CategoryService;
 import com.zbkj.service.service.SystemMenuService;
 import com.zbkj.service.service.SystemRoleMenuService;
 import com.zbkj.service.service.SystemRoleService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +53,7 @@ import java.util.stream.Stream;
  * +----------------------------------------------------------------------
  */
 @Service
+@Slf4j
 public class SystemRoleServiceImpl extends ServiceImpl<SystemRoleDao, SystemRole> implements SystemRoleService {
 
     @Resource
@@ -119,7 +121,7 @@ public class SystemRoleServiceImpl extends ServiceImpl<SystemRoleDao, SystemRole
     @Override
     public List<CategoryTreeVo> menu() {
         List<Integer> categoryIdList = getRoleListInRoleId();
-        System.out.println("权限列表:categoryIdList:"+ JSON.toJSONString(categoryIdList));
+        log.info("权限列表:categoryIdList:"+ JSON.toJSONString(categoryIdList));
         return categoryService.getListTree(Constants.CATEGORY_TYPE_MENU, 1, categoryIdList);
     }
 

crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatCallbackServiceImpl.java

@@ -22,6 +22,7 @@ import com.zbkj.common.vo.ShopSpuCommonVo;
 import com.zbkj.common.vo.ShopSpuVo;
 import com.zbkj.service.dao.WechatCallbackDao;
 import com.zbkj.service.service.*;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -47,6 +48,7 @@ import java.util.*;
  * +----------------------------------------------------------------------
  */
 @Service
+@Slf4j
 public class WechatCallbackServiceImpl extends ServiceImpl<WechatCallbackDao, WechatCallback> implements WechatCallbackService {
 
     private static final Logger logger = LoggerFactory.getLogger(WechatCallbackServiceImpl.class);
@@ -86,9 +88,9 @@ public class WechatCallbackServiceImpl extends ServiceImpl<WechatCallbackDao, We
      */
     @Override
     public String callback(String request) {
-        System.out.println("微信小程序回调：" + request);
+        log.info("微信小程序回调：" + request);
         JSONObject jsonObject = JSONObject.parseObject(request);
-        System.out.println("微信小程序回调jsonObject：" + jsonObject);
+        log.info("微信小程序回调jsonObject：" + jsonObject);
         WechatCallback wechatCallback = new WechatCallback();
         wechatCallback.setToUserName(jsonObject.getString("ToUserName"));
         wechatCallback.setFromUserName(jsonObject.getString("FromUserName"));
@@ -148,7 +150,7 @@ public class WechatCallbackServiceImpl extends ServiceImpl<WechatCallbackDao, We
     private void spuAuditEvent(JSONObject jsonObject) {
 //        JSONObject spuAudit = jsonObject.getJSONObject("OpenProductSpuAudit");
         String outProductId = jsonObject.getString("out_product_id");
-        System.out.println("outProductId = " + outProductId);
+        log.info("outProductId = " + outProductId);
         if (jsonObject.getInteger("status").equals(3)) {// 审核未通过
             logger.warn(StrUtil.format("商品审核未通过，商品id:{}，失败原因:{}", outProductId, jsonObject.getString("reject_reason")));
             // 查找对应的草稿商品

crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatNewServiceImpl.java

@@ -637,7 +637,7 @@ public class WechatNewServiceImpl implements WechatNewService {
             wxPayExceptionDispose(map, "微信申请退款业务异常");
             throw new CrmebException("微信申请退款失败2！" + responseVo.getErrCodeDes());
         }
-        System.out.println("================微信申请退款结束=========================");
+        log.info("================微信申请退款结束=========================");
         return responseVo;
     }
 
@@ -680,7 +680,7 @@ public class WechatNewServiceImpl implements WechatNewService {
             wxPayExceptionDispose(map, "微信查询退款业务异常");
             throw new CrmebException("微信查询退款失败2！" + responseVo.getErrCodeDes());
         }
-        System.out.println("================微信查询退款结束=========================");
+        log.info("================微信查询退款结束=========================");
         return responseVo;
     }
 

crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatVideoBeforeServiceImpl.java

@@ -10,6 +10,7 @@ import com.zbkj.common.utils.WxUtil;
 import com.zbkj.common.vo.*;
 import com.zbkj.service.service.WechatNewService;
 import com.zbkj.service.service.WechatVideoBeforeService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
@@ -31,6 +32,7 @@ import java.util.Map;
  *  +----------------------------------------------------------------------
  */
 @Service
+@Slf4j
 public class WechatVideoBeforeServiceImpl implements WechatVideoBeforeService {
 
     @Autowired
@@ -71,7 +73,7 @@ public class WechatVideoBeforeServiceImpl implements WechatVideoBeforeService {
         // 请求微信接口
         String url = StrUtil.format(WeChatConstants.WECHAT_SHOP_AUDIT_AUDIT_BRAND, miniAccessToken);
         String postStringData = restTemplateUtil.postStringData(url, JSONObject.toJSONString(brandMap));
-        System.out.println("postStringData = " + postStringData);
+        log.info("postStringData = " + postStringData);
         JSONObject jsonObject = JSONObject.parseObject(postStringData);
         WxUtil.checkResult(jsonObject);
         ShopAuditBrandResponseVo brandResponseVo = JSONObject.parseObject(postStringData, ShopAuditBrandResponseVo.class);

crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatVideoSpuServiceImpl.java

@@ -13,6 +13,7 @@ import com.zbkj.common.utils.WxUtil;
 import com.zbkj.common.vo.*;
 import com.zbkj.service.service.WechatNewService;
 import com.zbkj.service.service.WechatVideoSpuService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,6 +35,7 @@ import java.util.stream.Collectors;
  *  +----------------------------------------------------------------------
  */
 @Service
+@Slf4j
 public class WechatVideoSpuServiceImpl implements WechatVideoSpuService {
 
     @Autowired
@@ -63,7 +65,7 @@ public class WechatVideoSpuServiceImpl implements WechatVideoSpuService {
         JSONObject jsonObject = JSONObject.parseObject(s);
         WxUtil.checkResult(jsonObject);
         ShopCatVo shopCatVo = JSONObject.parseObject(jsonObject.toJSONString(), ShopCatVo.class);
-        System.out.println(StrUtil.format("请求微信数据返回，catData：" + jsonObject.toJSONString()));
+        log.info(StrUtil.format("请求微信数据返回，catData：" + jsonObject.toJSONString()));
         return shopCatVo.getThirdCatList();
     }
 
@@ -81,7 +83,7 @@ public class WechatVideoSpuServiceImpl implements WechatVideoSpuService {
         JSONObject jsonObject = JSONObject.parseObject(s);
         WxUtil.checkResult(jsonObject);
         List<ShopBrandVo> brandVoList = JSONArray.parseArray(jsonObject.getJSONObject("data").toJSONString(), ShopBrandVo.class);
-        System.out.println(StrUtil.format("请求微信数据返回，brandData：" + jsonObject.toJSONString()));
+        log.info(StrUtil.format("请求微信数据返回，brandData：" + jsonObject.toJSONString()));
         return brandVoList;
     }
 
@@ -92,13 +94,13 @@ public class WechatVideoSpuServiceImpl implements WechatVideoSpuService {
     @Override
     public ShopSpuAddResponseVo shopSpuAdd(ShopSpuAddVo shopSpuVo) {
         Map<String, Object> spuAddMap = assembleSpuAddMap(shopSpuVo);
-        System.out.println("spuAddMap = " + spuAddMap);
+        log.info("spuAddMap = " + spuAddMap);
         // 获取accessToken
         String miniAccessToken = wechatNewService.getMiniAccessToken();
         // 请求微信接口
         String url = StrUtil.format(WeChatConstants.WECHAT_SHOP_SPU_ADD_URL, miniAccessToken);
         String postStringData = restTemplateUtil.postStringData(url, JSONObject.toJSONString(spuAddMap));
-        System.out.println("postStringData = " + postStringData);
+        log.info("postStringData = " + postStringData);
         JSONObject jsonObject = JSONObject.parseObject(postStringData);
         WxUtil.checkResult(jsonObject);
         ShopSpuAddResponseVo addResponseVo = JSONObject.parseObject(jsonObject.getJSONObject("data").toJSONString(), ShopSpuAddResponseVo.class);
@@ -271,7 +273,7 @@ public class WechatVideoSpuServiceImpl implements WechatVideoSpuService {
     @Override
     public ShopSpuAddResponseVo shopSpuUpdate(ShopSpuAddVo shopSpuVo) {
         Map<String, Object> spuUpdateMap = assembleSpuAddMap(shopSpuVo);
-        System.out.println("spuUpdateMap = " + spuUpdateMap);
+        log.info("spuUpdateMap = " + spuUpdateMap);
         // 获取accessToken
         String miniAccessToken = wechatNewService.getMiniAccessToken();
         // 请求微信接口

crmeb-service/src/main/java/com/zbkj/service/util/DateUtils.java

@@ -1,5 +1,6 @@
 package com.zbkj.service.util;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 
@@ -16,6 +17,7 @@ import java.util.List;
  *
  * @author shuai.fan
  */
+@Slf4j
 public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	public static final String YYYY = "yyyy";
 
@@ -972,6 +974,6 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	}
 
 	public static void main(String[] args) {
-		System.out.println(DateUtils.convert2String(cutMonth(new Date(), 1)));
+		log.info(DateUtils.convert2String(cutMonth(new Date(), 1)));
 	}
 }

crmeb-service/src/main/java/com/zbkj/service/util/RedisLockUtil.java

@@ -790,7 +790,7 @@ public class RedisLockUtil {
 		List<String> list = Arrays.asList(new String[] {"123","abc","435"});
 
 		list.stream().filter(key -> !key.equals(s)).forEach(key -> {
-			System.out.println(key);
+			log.info(key);
 		});
 	}
 }

crmeb-service/src/main/java/com/zbkj/service/util/yly/HttpRequest.java

@@ -1,5 +1,7 @@
 package com.zbkj.service.util.yly;
 
+import lombok.extern.slf4j.Slf4j;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -8,7 +10,7 @@ import java.net.URL;
 import java.net.URLConnection;
 import java.util.List;
 import java.util.Map;
-
+@Slf4j
 class HttpRequest {
     public static String sendGet(String url, Map<String, String> paramMap) {
         String param = forMap(paramMap);
@@ -20,7 +22,7 @@ class HttpRequest {
             connection.connect();
             Map<String, List<String>> map = connection.getHeaderFields();
             for (String key : map.keySet())
-                System.out.println(key + "--->" + map.get(key));
+                log.info(key + "--->" + map.get(key));
             in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
             String line;
             while ((line = in.readLine()) != null)
@@ -83,7 +85,7 @@ class HttpRequest {
         String reqStr = "";
         if (null != paramMap && !paramMap.isEmpty()) {
             for (Map.Entry<String, String> entry : paramMap.entrySet()) {
-                System.out.println("key = " + (String)entry.getKey() + ", value = " + (String)entry.getValue());
+                log.info("key = " + (String)entry.getKey() + ", value = " + (String)entry.getValue());
                 reqStr = (String)entry.getKey() + "=" + (String)entry.getValue() + "&" + reqStr;
             }
             reqStr = reqStr.substring(0, reqStr.length() - 1);