Parcourir la source

将控制台打印语句去掉,替换成log.info

sunyaming il y a 3 ans
Parent
commit
3396cc3432

+ 10 - 8
suishenbang-common/src/main/java/com/dgtly/common/utils/file/FileUploadUtils.java

@@ -1,12 +1,5 @@
 package com.dgtly.common.utils.file;
 
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.util.Base64;
-
-import org.apache.commons.io.FilenameUtils;
-import org.springframework.web.multipart.MultipartFile;
 import com.dgtly.common.config.Global;
 import com.dgtly.common.constant.Constants;
 import com.dgtly.common.exception.file.FileNameLengthLimitExceededException;
@@ -15,12 +8,21 @@ import com.dgtly.common.exception.file.InvalidExtensionException;
 import com.dgtly.common.utils.DateUtils;
 import com.dgtly.common.utils.StringUtils;
 import com.dgtly.common.utils.security.Md5Utils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FilenameUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.Base64;
 
 /**
  * 文件上传工具类
  * 
  * @author dgtly
  */
+@Slf4j
 public class FileUploadUtils
 {
     /**
@@ -247,7 +249,7 @@ public class FileUploadUtils
     {
 
         File file = null;
-        System.out.println("文件名称:"+fileName);
+        log.info("文件名称:"+fileName);
         //创建文件目录
         String filePath=uploadPath + "/" + DateUtils.datePath() + "/";
         File  dir=new File(filePath);

+ 6 - 6
suishenbang-quartz/src/main/java/com/dgtly/quartz/task/RyTask.java

@@ -1,11 +1,10 @@
 package com.dgtly.quartz.task;
 
+import com.dgtly.common.utils.StringUtils;
 import com.dgtly.sync.service.AnalysisDiyCustomerComponent;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import com.dgtly.common.utils.StringUtils;
-
-import javax.annotation.PostConstruct;
 
 /**
  * 定时任务调度测试
@@ -13,6 +12,7 @@ import javax.annotation.PostConstruct;
  * @author dgtly
  */
 @Component("ryTask")
+@Slf4j
 public class RyTask
 {
 
@@ -27,17 +27,17 @@ public class RyTask
 
     public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
     {
-        System.out.println(StringUtils.format("执行多参方法: 字符串类型{},布尔类型{},长整型{},浮点型{},整形{}", s, b, l, d, i));
+        log.info(StringUtils.format("执行多参方法: 字符串类型{},布尔类型{},长整型{},浮点型{},整形{}", s, b, l, d, i));
     }
 
     public void ryParams(String params)
     {
-        System.out.println("执行有参方法:" + params);
+        log.info("执行有参方法:" + params);
     }
 
     public void ryNoParams()
     {
-        System.out.println("执行无参方法");
+        log.info("执行无参方法");
     }
 
     public void analyDiyCustomer(){

+ 3 - 6
suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysBatchSignForServiceImpl.java

@@ -1,15 +1,11 @@
 package com.dgtly.system.service.impl;
 
-import com.dgtly.common.core.text.Convert;
-import com.dgtly.common.utils.DateUtils;
-import com.dgtly.system.domain.AssRelcustomerinfo;
 import com.dgtly.system.domain.DeliverOrderBase;
 import com.dgtly.system.domain.SysBatchSignInfo;
 import com.dgtly.system.domain.TmsLogisticsStatus;
-import com.dgtly.system.mapper.AssRelcustomerinfoMapper;
 import com.dgtly.system.mapper.SysBatchSignForMapper;
-import com.dgtly.system.service.IAssRelcustomerinfoService;
 import com.dgtly.system.service.ISysBatchSignForService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
@@ -28,6 +24,7 @@ import java.util.stream.Collectors;
  * @author mxy
  * @date 2021-04-29
  */
+@Slf4j
 @Service
 public class SysBatchSignForServiceImpl implements ISysBatchSignForService {
 
@@ -61,7 +58,7 @@ public class SysBatchSignForServiceImpl implements ISysBatchSignForService {
                 tmsLogisticsStatusModel(listData)
         ).join();
 
-        System.out.println("前面都执行完了,这个才能执行");
+        log.info("前面都执行完了,这个才能执行");
 
         return 1;
     }

+ 4 - 13
suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/EsignController.java

@@ -1,17 +1,12 @@
 package com.dgtly.wxportal.controller;
 
-import com.alibaba.fastjson.JSONObject;
 import com.dgtly.common.annotation.ApiPassToken;
-import com.dgtly.common.config.Global;
 import com.dgtly.common.config.ServerConfig;
-import com.dgtly.common.constant.Constants;
 import com.dgtly.common.core.controller.ApiBaseController;
 import com.dgtly.common.core.domain.AjaxResult;
 import com.dgtly.common.core.domain.ParameterObject;
-import com.dgtly.system.domain.AssRelcustomerinfo;
 import com.dgtly.system.domain.CustomersExt;
 import com.dgtly.system.domain.SysUser;
-import com.dgtly.system.domain.SysUserExt;
 import com.dgtly.system.service.IAssRelcustomerinfoService;
 import com.dgtly.system.service.ICustomersExtService;
 import com.dgtly.system.service.ISysUserExtService;
@@ -20,16 +15,12 @@ import com.dgtly.wxportal.config.ESignConfig;
 import com.dgtly.wxportal.domain.ESignUpPDFModal;
 import com.dgtly.wxportal.domain.OrderFile;
 import com.dgtly.wxportal.service.*;
-import com.dgtly.wxportal.utils.ESign.ESignUrl;
-import com.dgtly.wxportal.utils.file.fileDownloadUtil;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.tomcat.util.digester.ArrayStack;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -37,7 +28,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.io.File;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -49,6 +39,7 @@ import java.util.Map;
 @RequestMapping("eSign")
 @RestController
 @ApiPassToken
+@Slf4j
 public class EsignController extends ApiBaseController {
 
     @Autowired
@@ -374,7 +365,7 @@ public class EsignController extends ApiBaseController {
         }else {//没有注册
             /*首先根据user.getLoginName()查询E签宝是否存在此账户*/
             String accountId = eSignService.getAccountIdByThirdId(user.getLoginName());
-            System.out.println("查询E签宝accountId:"+accountId);
+            log.info("查询E签宝accountId:"+accountId);
             SysUser euser = new SysUser();
             if( accountId != null ){
                 /*保存已注册信息*/
@@ -483,7 +474,7 @@ public class EsignController extends ApiBaseController {
         }else {//未注册
             /*首先根据customersExt.getChainsCode()查询E签宝是否存在此账户*/
                 String orgId = eSignService.getOrgIdByThirdId(customersExt.getChainsCode());
-                System.out.println("查询E签宝orgId:"+orgId);
+                log.info("查询E签宝orgId:"+orgId);
                 CustomersExt ecustomersExt=null;
                 if(orgId!=null){
                     ecustomersExt = customersExtService.selectCustomersExtById(user.getSysUserExt().getOrgCode());

+ 3 - 3
suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/service/impl/EReceivingNoteServiceImpl.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.dgtly.common.exception.base.BaseException;
 import com.dgtly.wxportal.domain.EReceivingNote;
 import com.dgtly.wxportal.service.IEReceivingNoteService;
-import com.dgtly.wxportal.utils.qywxutils.QyWxSendMessageUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,7 +13,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
 import java.util.Formatter;
-import java.util.List;
 
 /**
  * <p>
@@ -23,6 +22,7 @@ import java.util.List;
  * @author qxp
  * @since 2020-07-30
  */
+@Slf4j
 @Service
 public class EReceivingNoteServiceImpl implements IEReceivingNoteService {
 
@@ -52,7 +52,7 @@ public class EReceivingNoteServiceImpl implements IEReceivingNoteService {
 
         try{
             str = restTemplate.getForObject(url, String.class);
-            System.out.println(str);
+            log.info("str :"+str);
             JSONObject json = JSONObject.parseObject(str);
             if(json.getInteger("code")==200){
                  receivingNote = json.getObject("data",EReceivingNote.class);

+ 3 - 1
suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/service/impl/EsignSignServiceImpl.java

@@ -12,6 +12,7 @@ import com.dgtly.wxportal.service.IEsignSignService;
 import com.dgtly.wxportal.service.IOrderFileService;
 import com.dgtly.wxportal.utils.ESign.ESignHttpUtil;
 import com.dgtly.wxportal.utils.ESign.ESignUrl;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +33,7 @@ import java.util.List;
  * @author:qxm
  * @date:2020/10/13 10:31
  */
+@Slf4j
 @Service
 public class EsignSignServiceImpl implements IEsignSignService {
 
@@ -176,7 +178,7 @@ public class EsignSignServiceImpl implements IEsignSignService {
 //            String url =cloudPath+confirmUrl;
             String url =cloudPath+confirmUrl+param;
             String str = restTemplate.getForObject(url, String.class);
-            System.out.println(str);
+            log.info("result res : "+str);
             JSONObject result = JSONObject.parseObject(str);
 //        JSONObject result = (JSONObject) JSONObject.parse(HttpUtils.sendGet(url,param));
 

+ 5 - 3
suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/utils/ESign/ESignUploadUtil.java

@@ -1,5 +1,6 @@
 package com.dgtly.wxportal.utils.ESign;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
 
 import java.io.File;
@@ -18,6 +19,7 @@ import java.security.NoSuchAlgorithmException;
  * @date 2020-10-10 11:05
  * @since JDK1.8
  */
+@Slf4j
 public class ESignUploadUtil {
     /***
      * 计算字符串的Content-MD5
@@ -67,13 +69,13 @@ public class ESignUploadUtil {
             md5Bytes = md5.digest();
             fis.close();
         } catch (FileNotFoundException e) {
-            System.out.println(e.getMessage());
+            log.info(e.getMessage());
             e.printStackTrace();
         } catch (NoSuchAlgorithmException e) {
-            System.out.println(e.getMessage());
+            log.info(e.getMessage());
             e.printStackTrace();
         } catch (IOException e) {
-            System.out.println(e.getMessage());
+            log.info(e.getMessage());
             e.printStackTrace();
         }
         return md5Bytes;

+ 6 - 4
suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/utils/qywxutils/QyWxSendMessageUtil.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.dgtly.common.utils.http.HttpUtils;
 import com.dgtly.system.service.ISysUserService;
 import com.dgtly.system.service.impl.SysConfigServiceImpl;
-import com.dgtly.system.service.impl.SysUserServiceImpl;
 import com.dgtly.wxportal.domain.SendOrderNoticeTaskModel;
 import com.dgtly.wxportal.domain.SendOrderNoticeTaskModelCredit;
 import com.dgtly.wxportal.domain.WxSendMessage;
@@ -22,7 +21,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * 企业微信发送信息工具类
@@ -112,11 +114,11 @@ public class QyWxSendMessageUtil {
                 String conKey = "";
                 String form="";
                 if(type==0){
-                    System.out.println("发送经销商过信用");
+                    log.info("发送经销商过信用");
                     conKey ="wx.notification.credit.customer";
                     form="3";
                 }else {
-                    System.out.println("发送经销商未过信用");
+                    log.info("发送经销商未过信用");
                     conKey ="wx.notification.nocredit.customer";
                     form="7";
                 }