log

easydo-chengfa/pom.xml

@@ -23,7 +23,7 @@
             <id>dev</id>
             <!--默认激活dev 环境-->
             <activation>
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
                 <!--environment是自定义的字段（名字随便起），自定义字段可以有多个，确保与配置文件一致-->
@@ -42,7 +42,7 @@
         <profile>
             <id>test</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <properties>
                 <environment>test</environment>

easydo-chengfa/src/main/java/easydo/technology/controller/ApiController.java

@@ -1,17 +1,17 @@
 package easydo.technology.controller;
 
-import easydo.technology.components.JdbcClient;
-import easydo.technology.enums.ChengfaEnum;
-import easydo.technology.exception.BizException;
-import easydo.technology.model.*;
-import easydo.technology.model.vo.ContractVo;
-import easydo.technology.model.vo.GLDMessage;
-import easydo.technology.model.vo.MDMDept;
-import easydo.technology.model.vo.MDMSupplier;
-import easydo.technology.model.vo.MDMUser;
-import easydo.technology.system.domain.SysDept;
-import easydo.technology.utils.LocalDateUtil;
-import easydo.technology.utils.StringUtil;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+import javax.sql.DataSource;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.http.HttpStatus;
@@ -26,19 +26,27 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
 import cn.hutool.core.date.LocalDateTimeUtil;
-
-import javax.annotation.Resource;
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
+import easydo.technology.components.JdbcClient;
+import easydo.technology.enums.ChengfaEnum;
+import easydo.technology.exception.BizException;
+import easydo.technology.model.Message;
+import easydo.technology.model.Purchase;
+import easydo.technology.model.PurchaseBidNotice;
+import easydo.technology.model.PurchaseContract;
+import easydo.technology.model.PurchasePlan;
+import easydo.technology.model.Supplier;
+import easydo.technology.model.SupplierBank;
+import easydo.technology.model.SysUser;
+import easydo.technology.model.vo.ContractVo;
+import easydo.technology.model.vo.GLDMessage;
+import easydo.technology.model.vo.MDMDept;
+import easydo.technology.model.vo.MDMSupplier;
+import easydo.technology.model.vo.MDMUser;
+import easydo.technology.system.domain.SysDept;
+import easydo.technology.utils.LocalDateUtil;
+import easydo.technology.utils.StringUtil;
+import lombok.extern.java.Log;
+@Log
 @RestController
 @RequestMapping("/api")
 public class ApiController {
@@ -182,7 +190,7 @@ public class ApiController {
 
     @RequestMapping(value = "/mdmdept/push")
     public Object pushMdmDept(@RequestBody JSONObject object) throws Exception {
-        System.out.println("接收到MDM的组织数据======>" + object.toJSONString());
+        log.info("接收到MDM的组织数据======>" + object.toJSONString());
         Map<String, Object> result = new HashMap<>();
 
         JSONArray array = object.getJSONArray("Parameters");
@@ -244,7 +252,7 @@ public class ApiController {
 
     @RequestMapping(value = "/mdmuser/push")
     public Object pushMdmUser(@RequestBody JSONObject object) throws Exception {
-        System.out.println("接收到MDM的用户数据======>" + object.toJSONString());
+        log.info("接收到MDM的用户数据======>" + object.toJSONString());
         Map<String, Object> result = new HashMap<>();
 
         JSONArray array = object.getJSONArray("Parameters");
@@ -303,7 +311,7 @@ public class ApiController {
 
     @RequestMapping(value = "/mdmsupplier/push")
     public Object pushMdmSupplier(@RequestBody JSONObject object) throws Exception {
-        System.out.println("接收到MDM的供应商数据======>" + object.toJSONString());
+        log.info("接收到MDM的供应商数据======>" + object.toJSONString());
         Map<String, Object> result = new HashMap<>();
 
         JSONArray array = object.getJSONArray("Parameters");

easydo-chengfa/src/main/java/easydo/technology/controller/FinanceController.java

@@ -1,21 +1,24 @@
 package easydo.technology.controller;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
-import easydo.technology.exception.BizException;
-import easydo.technology.model.CftzBankInfo;
-import easydo.technology.model.SupplierBank;
-import easydo.technology.util.OracleClient;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.annotation.Resource;
+import javax.sql.DataSource;
+
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+
+import easydo.technology.exception.BizException;
+import easydo.technology.model.CftzBankInfo;
+import easydo.technology.util.OracleClient;
+import lombok.extern.java.Log;
+@Log
 @RestController
 @RequestMapping("/finance")
 @DS("oa")
@@ -56,7 +59,7 @@ public class FinanceController {
             map.put("current", 1);
             map.put("size", 10);
             Map<String, Object> page = oracleClient.getJdbcPage(map, CftzBankInfo.class, connection);
-            System.out.println(page);
+            log.info(page);
         } catch (Exception e) {
             oracleClient.finallyExecute(connection);
         }

easydo-chengfa/src/main/java/easydo/technology/controller/OaController.java

@@ -1,18 +1,11 @@
 package easydo.technology.controller;
 
-import com.alibaba.fastjson.JSONObject;
-import easydo.technology.service.OAService;
-import easydo.technology.system.security.config.bean.SecurityProperties;
-import easydo.technology.util.HttpClientUtil;
-import easydo.technology.components.JdbcClient;
-import easydo.technology.config.RsaProperties;
-import easydo.technology.model.OaPurchaseInfo;
-import easydo.technology.model.SysUser;
-import easydo.technology.system.security.security.TokenProvider;
-import easydo.technology.system.security.service.OnlineUserService;
-import easydo.technology.system.security.service.dto.JwtUserDto;
-import easydo.technology.utils.RsaUtils;
-import easydo.technology.utils.StringUtil;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -20,8 +13,6 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -29,12 +20,17 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.Map;
-
+import easydo.technology.components.JdbcClient;
+import easydo.technology.model.OaPurchaseInfo;
+import easydo.technology.model.SysUser;
+import easydo.technology.service.OAService;
+import easydo.technology.system.security.config.bean.SecurityProperties;
+import easydo.technology.system.security.security.TokenProvider;
+import easydo.technology.system.security.service.OnlineUserService;
+import easydo.technology.system.security.service.dto.JwtUserDto;
+import easydo.technology.utils.StringUtil;
+import lombok.extern.java.Log;
+@Log
 @RestController
 @RequestMapping("/oa")
 public class OaController {
@@ -66,7 +62,7 @@ public class OaController {
      */
     @GetMapping("/ssoLogin")
     public ModelAndView login(@RequestParam String ticket) {
-        System.out.println("ticket==============>" + ticket);
+        log.info("ticket==============>" + ticket);
         if (null != ticket) {
             try {
                 String username = oaService.getUsername(ticket);
@@ -78,7 +74,7 @@ public class OaController {
                     if (StringUtil.isNotEmpty(sysUser.getUserId())) {
                         ModelAndView modelAndView = new ModelAndView();
                         modelAndView.setViewName("redirect:" + redirectUrl + "?userId=" + sysUser.getUserId());
-                        System.out.println("redirect=========>" + modelAndView.toString());
+                        log.info("redirect=========>" + modelAndView.toString());
                         return modelAndView;
                     }
                 }

easydo-chengfa/src/main/java/easydo/technology/controller/TestController.java

@@ -1,53 +1,27 @@
 package easydo.technology.controller;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.Authenticator;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.PasswordAuthentication;
-import java.net.URL;
-import java.sql.Connection;
-import java.text.MessageFormat;
-import java.time.LocalDateTime;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.sql.DataSource;
 
-import org.apache.http.HttpHost;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.alibaba.fastjson.JSONObject;
-
 import easydo.technology.components.JdbcClient;
-import easydo.technology.exception.BizException;
-import easydo.technology.model.GldProject;
-import easydo.technology.model.ProjectInfo;
 import easydo.technology.service.GLDMasterService;
-import easydo.technology.system.domain.SysDept;
 import easydo.technology.util.HttpClientUtil;
-import easydo.technology.utils.LocalDateUtil;
 import easydo.technology.utils.RedisUtils;
 import easydo.technology.utils.StringUtil;
+import lombok.extern.java.Log;
 
+@Log
 @RestController
 @RequestMapping("/test")
 public class TestController {
@@ -72,7 +46,7 @@ public class TestController {
      * String tenantId = "5600001";
      * 
      * JSONObject object = HttpClientUtil.sendGLDGET_getTenantId(url, token);
-     * System.out.println(object.toJSONString());
+     * log.info(object.toJSONString());
      * //{"access_token":"cn-b3c73fac-2629-4337-94fb-e79c289d1979","scope":
      * "paas-clouddoc,paas-gdoc_tenant,paas-new-storage-service_admin,paas-organization_admin,paas-gws_tenant,paas-organization_tenant,paas-comment-service_tenant,paas-databag_tenant,paas-new-storage-service_tenant,paas-databag_admin,paas_databag_tenant,paas-raw-storage-service_tenant"
      * ,"token_type":"bearer","exp":1723342092,"expires_in":74670}
@@ -89,7 +63,7 @@ public class TestController {
     // header.put("x-tenant-id", "5600003");
 
     // JSONArray resObject = HttpClientUtil.sendGETWithHeader_Arr(url, header);
-    // System.out.println(resObject.toJSONString());
+    // log.info(resObject.toJSONString());
     // }
 
     /*
@@ -97,7 +71,7 @@ public class TestController {
      * // String url =
      * "http://218.201.101.181:8180/seeyon/thirdpartyController.do?ticket=-5127817351537210703";
      * // String username = HttpClientUtil.sendOaGET_USERNAME(url);
-     * // System.out.println(username);
+     * // log.info(username);
      * 
      * String url = "http://218.201.101.181:8180/seeyon/rest/token";
      * JSONObject object = new JSONObject();
@@ -105,7 +79,7 @@ public class TestController {
      * object.put("password", "2679fc6b-df18-4563-9b8e-773b59bdcb62");
      * JSONObject resObject = HttpClientUtil.sendPOST(url, object.toJSONString());
      * String accessToken = resObject.getString("id");
-     * System.out.println(accessToken);
+     * log.info(accessToken);
      * 
      * String getUserInfoUrl =
      * "http://218.201.101.181:8180/seeyon/rest/orgMember?loginName=guanglianda";
@@ -114,14 +88,14 @@ public class TestController {
      * // header.put("Authorization", "Bearer " + accessToken);
      * JSONObject resObj = HttpClientUtil.sendGETWithHeader_Obj(getUserInfoUrl,
      * header);
-     * System.out.println(resObj);
+     * log.info(resObj);
      * }
      */
 
     @RequestMapping(value = "/getPage")
     public Object getPage() throws Exception {
         redisUtils.set("test", "123456", 600);
-        System.out.println(redisUtils.get("test"));
+        log.info(redisUtils.get("test"));
         return "success";
     }
 
@@ -151,7 +125,7 @@ public class TestController {
     // object.put("userName", "zcxt");
     // object.put("password", "2679fc6b-df18-4563-9b8e-773b59bdcb62");
     // JSONObject resObject = HttpClientUtil.sendPOST(url, object.toJSONString());
-    // System.out.println("查询OAtoken的res======>" + resObject.toJSONString());
+    // log.info("查询OAtoken的res======>" + resObject.toJSONString());
     // String token = resObject.getString("id");
 
     // Map<String, String> header = new HashMap<>();
@@ -180,7 +154,7 @@ public class TestController {
 
     // JSONObject resObj = HttpClientUtil.sendPOSTWithHeader(sendTodoUrl,
     // object.toJSONString(), header);
-    // System.out.println("生成OA待办req======>" + object.toJSONString() + ",res======>"
+    // log.info("生成OA待办req======>" + object.toJSONString() + ",res======>"
     // + resObj.toJSONString());
 
     // String updateTodoUrl = "http://218.201.101.181:8180" +
@@ -193,7 +167,7 @@ public class TestController {
     // JSONObject resObj =
     // HttpClientUtil.sendPOSTWithHeader(updateTodoUrl,object.toJSONString(),
     // header);
-    // System.out.println("更新OA待办req======>" + object.toJSONString() + ",res======>"
+    // log.info("更新OA待办req======>" + object.toJSONString() + ",res======>"
     // + resObj.toJSONString());
 
     // String sendMessageUrl = "http://218.201.101.181:8180" +
@@ -210,7 +184,7 @@ public class TestController {
 
     // JSONObject resObj = HttpClientUtil.sendPOSTWithHeader(sendMessageUrl,
     // object.toJSONString(), header);
-    // System.out.println("推送OA消息req======>" + object.toJSONString() + ",res======>"
+    // log.info("推送OA消息req======>" + object.toJSONString() + ",res======>"
     // + resObj.toJSONString());
     // }
 

easydo-chengfa/src/main/java/easydo/technology/service/GLDApproveService.java

@@ -1,22 +1,24 @@
 package easydo.technology.service;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+
 import easydo.technology.components.JdbcClient;
 import easydo.technology.model.GldMember;
 import easydo.technology.model.SysUser;
 import easydo.technology.model.vo.GLDApproveVo;
 import easydo.technology.util.HttpClientUtil;
 import easydo.technology.utils.SecurityUtils;
-import easydo.technology.utils.StringUtil;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.Map;
-
+import lombok.extern.java.Log;
+@Log
 @Component
 public class GLDApproveService {
     @Value("${tenantId_gld_master}")
@@ -62,7 +64,7 @@ public class GLDApproveService {
         object.put("hiddenResubmit", true);
         object.put("startorId", member.getId());
         JSONObject resObj = HttpClientUtil.sendPOSTWithHeader(url, object.toJSONString(), header);
-        System.out.println("发起审批流req========>" + object.toJSONString() + "res========>" + resObj.toJSONString());
+        log.info("发起审批流req========>" + object.toJSONString() + "res========>" + resObj.toJSONString());
         return resObj.getString("id");
     }
 
@@ -73,7 +75,7 @@ public class GLDApproveService {
         header.put("X-CORAL-TENANT", tenantId);
         header.put("Authorization", authorization);
         JSONArray resArray = HttpClientUtil.sendGETWithHeader_Arr(url, header);
-        System.out.println("查询审批流res========>" + resArray.toJSONString());
+        log.info("查询审批流res========>" + resArray.toJSONString());
         if (resArray.size() > 0) {
             String instanceId = ((JSONObject) resArray.get(0)).getString("xmglInstanceId");
             String state = ((JSONObject) resArray.get(0)).getString("state");
@@ -90,6 +92,6 @@ public class GLDApproveService {
         header.put("X-CORAL-TENANT", "5600003");
         header.put("Authorization", "Basic YlFvc0tIeWJkSlZUZGtMcXA0U1VIMlE0ejNZQjc5eVA6b1ZmaU5zR1c1NVZzSW5ITTlDOVI3c2g0SHlpVGMxY2w=");
         JSONArray resArray = HttpClientUtil.sendGETWithHeader_Arr(url, header);
-        System.out.println("查询审批流res========>" + resArray.toJSONString());
+        log.info("查询审批流res========>" + resArray.toJSONString());
     }
 }

easydo-chengfa/src/main/java/easydo/technology/service/GLDCostService.java

@@ -1,16 +1,5 @@
 package easydo.technology.service;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import easydo.technology.enums.ChengfaEnum;
-import easydo.technology.exception.BizException;
-import easydo.technology.model.GldTenant;
-import easydo.technology.model.vo.GLDContract;
-import easydo.technology.util.HttpClientUtil;
-import easydo.technology.utils.StringUtil;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -21,6 +10,19 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+
+import easydo.technology.exception.BizException;
+import easydo.technology.model.vo.GLDContract;
+import easydo.technology.util.HttpClientUtil;
+import easydo.technology.utils.StringUtil;
+import lombok.extern.java.Log;
+
+@Log
 @Component
 public class GLDCostService {
     @Value("${tenantId_gld_cost}")
@@ -49,7 +51,7 @@ public class GLDCostService {
         header.put("Authorization", costAuthorization);
         header.put("X-CORAL-TENANT", tenantId);
         JSONObject resObj = HttpClientUtil.sendPOSTWithHeader(url, data.toJSONString(), header);
-        System.out.println("查询合约规划合约视角req========>" + data.toJSONString() + "res========>" + resObj.toJSONString());
+        log.info("查询合约规划合约视角req========>" + data.toJSONString() + "res========>" + resObj.toJSONString());
         return resObj;
     }
 
@@ -66,7 +68,7 @@ public class GLDCostService {
         header.put("Authorization", costAuthorization);
         header.put("X-CORAL-TENANT", tenantId);
         JSONObject resObj = HttpClientUtil.sendPOSTWithHeader(url, data.toJSONString(), header);
-        System.out.println("查询合约规划科目视角req========>" + data.toJSONString() + "res========>" + resObj.toJSONString());
+        log.info("查询合约规划科目视角req========>" + data.toJSONString() + "res========>" + resObj.toJSONString());
         return resObj;
     }
 
@@ -81,7 +83,7 @@ public class GLDCostService {
         header.put("Authorization", costAuthorization);
         header.put("X-CORAL-TENANT", tenantId);
         JSONObject resObj = HttpClientUtil.sendPOSTWithHeader(url, data.toJSONString(), header);
-        System.out.println("修改合约规划状态req========>" + data.toJSONString() + "res========>" + resObj.toJSONString());
+        log.info("修改合约规划状态req========>" + data.toJSONString() + "res========>" + resObj.toJSONString());
         if (!"success".equals(resObj.getString("code"))) {
             throw new BizException("修改合约规划状态异常");
         }
@@ -98,7 +100,7 @@ public class GLDCostService {
         header.put("Authorization", costAuthorization);
         header.put("X-CORAL-TENANT", tenantId);
         JSONObject resObj = HttpClientUtil.sendPOSTWithHeader(url, data.toJSONString(), header);
-        System.out.println("查询合同信息req========>" + data.toJSONString() + "res========>" + resObj.toJSONString());
+        log.info("查询合同信息req========>" + data.toJSONString() + "res========>" + resObj.toJSONString());
         JSONArray array = resObj.getJSONArray("data");
         List<GLDContract> list = new ArrayList<>();
         for (Object obj : array) {
@@ -151,7 +153,7 @@ public class GLDCostService {
     // header.put("X-CORAL-TENANT", "865509948108800");
     // JSONObject resObj = HttpClientUtil.sendPOSTWithHeader(url,
     // data.toJSONString(), header);
-    // // System.out.println("查询合同信息req========>" + data.toJSONString() +
+    // // log.info("查询合同信息req========>" + data.toJSONString() +
     // "res========>" + resObj.toJSONString());
 
     // JSONArray array = resObj.getJSONArray("data");
@@ -180,7 +182,7 @@ public class GLDCostService {
     // contract.setObjectId(contractObj.getString("objectId"));
     // list.add(contract);
     // }
-    // System.out.println(JSONArray.toJSONString(list));
+    // log.info(JSONArray.toJSONString(list));
     // }
 
 }

easydo-chengfa/src/main/java/easydo/technology/service/GLDMasterService.java

@@ -1,7 +1,21 @@
 package easydo.technology.service;
 
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+
 import easydo.technology.enums.RedisKeyEnum;
 import easydo.technology.exception.BizException;
 import easydo.technology.model.GldDept;
@@ -11,14 +25,9 @@ import easydo.technology.model.GldTenant;
 import easydo.technology.util.HttpClientUtil;
 import easydo.technology.utils.RedisUtils;
 import easydo.technology.utils.StringUtil;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
+import lombok.extern.java.Log;
 
+@Log
 @Component
 public class GLDMasterService {
     @Value("${GLD.host}")
@@ -48,7 +57,7 @@ public class GLDMasterService {
             Map<String, String> header = new HashMap<>();
             header.put("Authorization", masterAuthorization);
             JSONObject object = HttpClientUtil.sendPOSTWithHeader(url, new JSONObject().toJSONString(), header);
-            System.out.println("查询广联达主数据token的res======>" + object.toJSONString());
+            log.info("查询广联达主数据token的res======>" + object.toJSONString());
             String accessToken = object.getString("access_token");
             Integer expiresIn = object.getInteger("expires_in");
             if (StringUtil.isNotEmpty(accessToken) && StringUtil.isNotEmpty(expiresIn)) {
@@ -73,7 +82,7 @@ public class GLDMasterService {
         header.put("Authorization", "Bearer " + token);
         header.put("X-CORAL-TENANT", tenantId);
         JSONArray array = HttpClientUtil.sendGETWithHeader_Arr(url, header);
-        System.out.println("查询广联达主数据组织的res======>" + array.toJSONString());
+        log.info("查询广联达主数据组织的res======>" + array.toJSONString());
         List<GldDept> list = new ArrayList<>();
         for (Object obj : array) {
             JSONObject object = (JSONObject) obj;
@@ -95,7 +104,7 @@ public class GLDMasterService {
         header.put("Authorization", "Bearer " + token);
         header.put("X-CORAL-TENANT", tenantId);
         JSONArray array = HttpClientUtil.sendGETWithHeader_Arr(url, header);
-        System.out.println("查询广联达主数据用户的res======>" + array.toJSONString());
+        log.info("查询广联达主数据用户的res======>" + array.toJSONString());
         List<GldMember> list = new ArrayList<>();
         for (Object obj : array) {
             JSONObject object = (JSONObject) obj;
@@ -117,7 +126,7 @@ public class GLDMasterService {
         header.put("Authorization", "Bearer " + token);
         header.put("X-CORAL-TENANT", tenantId);
         JSONArray array = HttpClientUtil.sendGETWithHeader_Arr(url, header);
-        System.out.println("查询广联达主数据项目的res======>" + array.toJSONString());
+        log.info("查询广联达主数据项目的res======>" + array.toJSONString());
         List<GldProject> list = new ArrayList<>();
         for (Object obj : array) {
             JSONObject object = (JSONObject) obj;
@@ -138,7 +147,7 @@ public class GLDMasterService {
         Map<String, String> header = new HashMap<>();
         header.put("Authorization", "Bearer " + token);
         JSONObject resObject = HttpClientUtil.sendGETWithHeader_Obj(url, header);
-        System.out.println("查询广联达主数据租户的res======>" + resObject.toJSONString());
+        log.info("查询广联达主数据租户的res======>" + resObject.toJSONString());
         JSONArray array = resObject.getJSONArray("content");
         List<GldTenant> list = new ArrayList<>();
         for (Object obj : array) {

easydo-chengfa/src/main/java/easydo/technology/service/KafkaClient.java

@@ -1,6 +1,19 @@
 package easydo.technology.service;
 
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
+import javax.annotation.Resource;
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Profile;
+import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.stereotype.Component;
+
 import com.alibaba.fastjson.JSONObject;
+
 import easydo.technology.components.JdbcClient;
 import easydo.technology.enums.ChengfaEnum;
 import easydo.technology.exception.BizException;
@@ -15,18 +28,9 @@ import easydo.technology.model.PurchaseMatter;
 import easydo.technology.model.SysUser;
 import easydo.technology.system.domain.SysDept;
 import easydo.technology.utils.StringUtil;
+import lombok.extern.java.Log;
 
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Profile;
-import org.springframework.kafka.annotation.KafkaListener;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.Statement;
-
+@Log
 @Component
 @Profile({ "prod", "test" })
 public class KafkaClient {
@@ -52,7 +56,7 @@ public class KafkaClient {
         String taskId = taskSimpleInfo.getString("id");
         String state = taskSimpleInfo.getString("state");
         String targetType = taskSimpleInfo.getString("targetType");
-        System.out.println("zcxt listener======>" + object);
+        log.info("zcxt listener======>" + object);
 
         if (!(ChengfaEnum.APPROVE_STATE_ENDED.getValue().equals(state)
                 && ChengfaEnum.APPROVE_TOPIC_ENDED.getValue().equals(topic))
@@ -247,6 +251,6 @@ public class KafkaClient {
         long taskId = taskSimpleInfo.getLong("id");
         String state = taskSimpleInfo.getString("state");
 
-        System.out.println(topic + taskId + state);
+        log.info(topic + taskId + state);
     }
 }

easydo-chengfa/src/main/java/easydo/technology/service/OAService.java

@@ -16,7 +16,9 @@ import easydo.technology.model.SysUser;
 import easydo.technology.util.HttpClientUtil;
 import easydo.technology.utils.LocalDateUtil;
 import easydo.technology.utils.RedisUtils;
+import lombok.extern.java.Log;
 
+@Log
 @Component
 public class OAService {
     @Value("${OA.host}")
@@ -52,14 +54,14 @@ public class OAService {
         object.put("userName", username);
         object.put("password", password);
         JSONObject resObject = HttpClientUtil.sendPOST(url, object.toJSONString());
-        System.out.println("查询OAtoken的res======>" + resObject.toJSONString());
+        log.info("查询OAtoken的res======>" + resObject.toJSONString());
         return resObject.getString("id");
     }
 
     public String getUsername(String ticket) {
         String getLoginNameUrl = host + oaUsernamePath + ticket;
         String username = HttpClientUtil.sendOaGET_USERNAME(getLoginNameUrl);
-        System.out.println("查询OA username的ticket====>" + ticket + ",res======>" + username);
+        log.info("查询OA username的ticket====>" + ticket + ",res======>" + username);
         return HttpClientUtil.sendOaGET_USERNAME(getLoginNameUrl);
     }
 
@@ -69,7 +71,7 @@ public class OAService {
         Map<String, String> header = new HashMap<>();
         header.put("token", token);
         JSONObject resObj = HttpClientUtil.sendGETWithHeader_Obj(getLoginNameUrl, header);
-        System.out.println("查询OA telNumber的username======>" + username + ",res======>" + resObj.toJSONString());
+        log.info("查询OA telNumber的username======>" + username + ",res======>" + resObj.toJSONString());
         return resObj.getString("telNumber");
     }
 
@@ -103,7 +105,7 @@ public class OAService {
         object.put("noneBindingReceiver", sysUser.getUsername());
 
         JSONObject resObj = HttpClientUtil.sendPOSTWithHeader(sendTodoUrl, object.toJSONString(), header);
-        System.out.println("生成OA待办req======>" + object.toJSONString() + ",res======>" + resObj.toJSONString());
+        log.info("生成OA待办req======>" + object.toJSONString() + ",res======>" + resObj.toJSONString());
 
         resObj.put("url", object.getString("url"));
         return resObj;
@@ -122,7 +124,7 @@ public class OAService {
         object.put("state", state);
         object.put("subState", subState);
         JSONObject resObj = HttpClientUtil.sendPOSTWithHeader(updateTodoUrl, object.toJSONString(), header);
-        System.out.println("更新OA待办req======>" + object.toJSONString() + ",res======>" + resObj.toJSONString());
+        log.info("更新OA待办req======>" + object.toJSONString() + ",res======>" + resObj.toJSONString());
         return resObj.getBoolean("success");
     }
 
@@ -152,7 +154,7 @@ public class OAService {
         object.put("noneBindingReceiver", receiveUser.getUsername());
 
         JSONObject resObj = HttpClientUtil.sendPOSTWithHeader(sendMessageUrl, object.toJSONString(), header);
-        System.out.println("推送OA消息req======>" + object.toJSONString() + ",res======>" + resObj.toJSONString());
+        log.info("推送OA消息req======>" + object.toJSONString() + ",res======>" + resObj.toJSONString());
         return resObj.getBoolean("success");
     }
 }

easydo-chengfa/src/main/resources/config/application.yml

@@ -42,7 +42,7 @@ mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
     auto-mapping-behavior: full
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
   mapper-locations: classpath*:/mapper/*Mapper.xml
   global-config:
     db-config:
@@ -52,7 +52,7 @@ mybatis-plus:
 mybatis:
   type-aliases-package: com.pjb.entity #别名定义
   configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #指定 MyBatis 所用日志的具体实现，未指定时将自动查找
+    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl #指定 MyBatis 所用日志的具体实现，未指定时将自动查找
     map-underscore-to-camel-case: true #开启自动驼峰命名规则（camel case）映射
     lazy-loading-enabled: true #开启延时加载开关
     aggressive-lazy-loading: false #将积极加载改为消极加载（即按需加载）,默认值就是false

easydo-chengfa/src/main/resources/config/param.properties

@@ -1,72 +0,0 @@
-# Ftp配置  #
-ftp.serverHost=10.5.7.21
-ftp.serverPort=21
-ftp.username=ftptest
-ftp.password=123456
-ftp.bufferSize=1024
-ftp.encoding=utf-8
-# OSS配置 #
-#外网访问
-oss.endPoint=oss-cn-hangzhou.aliyuncs.com
-#  oss-cn-hangzhou.aliyuncs.com
-#内网访问
-#测试站
-#oss.endPoint-internal=oss-cn-hangzhou.aliyuncs.com
-#生产
-oss.endPoint-internal=oss-cn-hangzhou-internal.aliyuncs.com
-#bucketname
-oss.bucket=gyljr-product
-# 本地存放文件的目录 #
-directory.file=/u01/data/gxjr/
-# 文件显示配置 #
-file.server=
-# 下载路径 #
-download.server=
-#印章服务器#
-seal.server=
-#ra服务器#
-seal.raserver=
-#kt服务器#
-seal.ktip=
-#验证证书服务器服务器#
-verify.server=
-#证书校验--通信证书存放路径#
-keyStore.path=
-#证书校验--通信证书密码#
-keyStore.pwd=
-#证书校验--信任证书存放路径#
-trustStore.path=
-#证书校验--通信证书密码#
-trustStore.pwd=
-#平台手机号
-oms.phones=
-# 是否发送短信
-sms.isSend=y
-# 是否隐藏验证码、密码等关键信息
-sms.isHidden=n
-ukey.isDebug=y
-# 签章方式
-signType=
-# 核心系统api地址
-core.host=http://10.5.1.61:9080
-# token获取地址
-core.defaultManager=$hanbing$;
-core.getToken=/finance-console/admin/fanWeiLogin/getToken?userName=
-# 业务经理获取地址
-core.findEmployee=/finance-console/v1/supplychain/findEmployee
-core.findClientOwner=/finance-console/v1/supplychain/findClientOwner
-# 还款计划地址
-core.getRepayPlan=/finance-console/v1/supplychain/ticketLoan/repayPlan
-# 业务编号地址
-core.getTradeCode=/finance-console/v1/supplychain/ticketLoan/busiCd
-# 业务申请
-core.applyTrade=/finance-console/v1/supplychain/ticketLoan
-# 上传文件
-core.uploadAttachment=/finance-console/v1/supplychain/uploadAttachment
-#检验开户银行名称
-core.checkBank=/finance-console/v1/supplychain/checkBank
-#电票保相应接口
-core.guarantee.getTradeCode=/finance-console/v1/supplychain/ticketGuarantee/busiCd
-core.guarantee.applyTrade=/finance-console/v1/supplychain/ticketGuarantee
-core.guarantee.uploadAttachment=/finance-console/v1/supplychain/ticketGuarantee/uploadAttachment
-regist.protocolFile.url=https://gyljr-product.oss-cn-hangzhou.aliyuncs.com/protocol.pdf

easydo-chengfa/src/main/resources/log4j.properties

@@ -1,21 +0,0 @@
-#将等级为DEBUG的日志信息输出到console和file这两个目的地，console和file的定义在下面的代码
-log4j.rootLogger=DEBUG,console,file
-#控制台输出的相关设置
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.Target=System.out
-log4j.appender.console.Threshold=DEBUG
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=[%c]-%m%n
-#文件输出的相关设置
-log4j.appender.file=org.apache.log4j.RollingFileAppender
-log4j.appender.file.File=./log/kuang.log
-log4j.appender.file.MaxFileSize=10mb
-log4j.appender.file.Threshold=DEBUG
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=[%p][%d{yy-MM-dd}][%c]%m%n
-#日志输出级别
-log4j.logger.org.mybatis=DEBUG
-log4j.logger.java.sql=DEBUG
-log4j.logger.java.sql.Statement=DEBUG
-log4j.logger.java.sql.ResultSet=DEBUG
-log4j.logger.java.sql.PreparedStatement=DEBUG

easydo-chengfa/src/main/resources/logback.xml

@@ -20,6 +20,7 @@
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
             <pattern>===%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) Line:%-3L - %gray(%msg%n)</pattern>
+            <charset>UTF-8</charset>
         </encoder>
         <!--日志文件最大的大小-->
         <!--<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">-->