合并分支 'lql' 到 'qa'

src/main/java/com/sfa/job/consumer/feishu/EventCallbackLuzx.java

@@ -55,7 +55,7 @@ public class EventCallbackLuzx {
             byte[] keyBs = digest.digest(encryptKeyP.getBytes(StandardCharsets.UTF_8));
             String decrypt = decrypt(encrypt,keyBs);
             JSONObject req = JSONObject.parseObject(decrypt);
-            log.info("飞书事件回调数据：{}\n解析：{}",eventObj,req);
+            log.info("飞书事件监听数据：{}；解析后：{}",eventObj,req);
 
             /**
              * 审批实例 状态变更 事件处理

src/main/java/com/sfa/job/service/feishu/EventCallbackServiceImpl.java

@@ -140,7 +140,7 @@ public class EventCallbackServiceImpl implements IEventCallbackService{
         String preferredName = emp.getPersonInfo().getPreferredName();
         // 判断部门，当部门为【新人训练营】时跳过，不做人员异动
         if (deptCode.equals("BM0131")){
-            log.info("T100-AU-USER skip user：{}-{}-{}", preferredName,employeeNumber,deptCode);
+            log.info("T100-AU-USER skip user：{}{}-新人训练营{}", preferredName,employeeNumber,deptCode);
             return;
         }
         BankAccount bankAccount = emp.getPersonInfo().getBankAccountList()[0];
@@ -179,25 +179,19 @@ public class EventCallbackServiceImpl implements IEventCallbackService{
     }
 
     private void createOrUpdateDept(JSONObject deptT100){
-
         JSONObject service = new JSONObject();
         service.put("name","department.create");
-
         JSONObject datakey = new JSONObject();
         datakey.put("CompanyId","BJHQ");
         datakey.put("EntId","80");
-
         JSONObject host = new JSONObject();
         host.put("acct","tiptop");
         host.put("ip","192.168.100.20");
         host.put("lang","zh_CN");
         host.put("prod","CRM");
         host.put("timestamp",DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MS_PATTERN));
-
-
         JSONObject payload = new JSONObject();
         payload.putObject("std_data").putObject("parameter").putArray("master_data").add(deptT100);
-
         JSONObject deptJson = new JSONObject();
         deptJson.put("service",service);
         deptJson.put("datakey",datakey);
@@ -207,25 +201,19 @@ public class EventCallbackServiceImpl implements IEventCallbackService{
     }
 
     private void createOrUpdateUser(JSONObject userT100){
-
         JSONObject service = new JSONObject();
         service.put("name","employee.create");
-
         JSONObject datakey = new JSONObject();
         datakey.put("CompanyId","BJHQ");
         datakey.put("EntId","80");
-
         JSONObject host = new JSONObject();
         host.put("acct","tiptop");
         host.put("ip","192.168.100.20");
         host.put("lang","zh_CN");
         host.put("prod","CRM");
         host.put("timestamp",DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MS_PATTERN));
-
-
         JSONObject payload = new JSONObject();
         payload.putObject("std_data").putObject("parameter").putArray("master_data").add(userT100);
-
         JSONObject userJson = new JSONObject();
         userJson.put("service",service);
         userJson.put("datakey",datakey);

src/main/java/com/sfa/job/util/T100Util.java

@@ -28,8 +28,10 @@ public class T100Util {
         header.put("digi-srvcode","000");
         header.put("digi-type","sync");
         header.put("digi-key","f63b06af224e90ea3f9f08e0226fc91e");
+        log.info("T100-AU-DEPT参数：{}",deptJson);
         String body = HttpUtil.createPost(url).addHeaders(header).body(deptJson.toString()).execute().body();
-        log.info("T100-AU-DEPT参数：{},结果：{}",deptJson,body);
+        String msg = body.replaceAll("\n", "");
+        log.info("T100-AU-DEPT结果：{}",msg);
     }
 
     public void createOrUpdateUser(JSONObject userJson) {
@@ -40,8 +42,10 @@ public class T100Util {
         header.put("digi-srvcode","000");
         header.put("digi-type","sync");
         header.put("digi-key","f63b06af224e90ea3f9f08e0226fc91e");
+        log.info("T100-AU-USER参数：{}",userJson);
         String body = HttpUtil.createPost(url).addHeaders(header).body(userJson.toString()).execute().body();
-        log.info("T100-AU-USER参数：{},结果：{}",userJson,body);
+        String msg = body.replaceAll("\n", "");
+        log.info("T100-AU-USER结果：{}",msg);
 
     }
 }