Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java

@@ -214,7 +214,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
                     paragraphString = paragraphString.replaceAll("\r\n","");
                     paragraphString = paragraphString.replaceAll("\n","");
                     paragraphString = paragraphString.trim();
-                    if ("前言".equals(getChinese(paragraphString)) && (paragraphString.replaceAll("\t", "")
+                    if (getChinese("前言").equals(getChinese(paragraphString)) && (paragraphString.replaceAll("\t", "")
                             .replaceAll("\b", "").replaceAll(" ", "").length() == 2)) { // 前言后面有文本，判定为是目录中的前言
                         firstFlag = false;
                     }

adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java

@@ -29,12 +29,14 @@ public class SyncUserService {
         String appkey = "Fxi5LHbI5yGbQQDpVp86GcCdXeC5Bjfe";
         AuthUtils util = new AuthUtils(appuser, appkey, null);
 
+        Long haoMiaoChuo = System.currentTimeMillis();
+        Long chuo = haoMiaoChuo / 1000;
         List<String> json=new ArrayList<>();
         byte[] cookie = null;
         do {
             Map<String, Object> params = new HashMap<String, Object>();
             params.put("cookie", Base64.encodeBase64String(cookie));
-            params.put("timestamp", System.currentTimeMillis());
+            params.put("timestamp", chuo);
 
             // 用户参数
             params.put("filter", "(userid=*)");