FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
gaojiabao
2023-06-14 15:57:41 +08:00
parent a67f4a1ce4 8690fcb35f
commit 5985b060a8
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java
+1 -1
View File
@@ -214,7 +214,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
paragraphString = paragraphString.replaceAll("\r\n",""); paragraphString = paragraphString.replaceAll("\r\n","");
paragraphString = paragraphString.replaceAll("\n",""); paragraphString = paragraphString.replaceAll("\n","");
paragraphString = paragraphString.trim(); paragraphString = paragraphString.trim();
if ("前言".equals(getChinese(paragraphString)) && (paragraphString.replaceAll("\t", "") if (getChinese("前言").equals(getChinese(paragraphString)) && (paragraphString.replaceAll("\t", "")
.replaceAll("\b", "").replaceAll(" ", "").length() == 2)) { // 前言后面有文本，判定为是目录中的前言 .replaceAll("\b", "").replaceAll(" ", "").length() == 2)) { // 前言后面有文本，判定为是目录中的前言
firstFlag = false; firstFlag = false;
} }
adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java
+3 -1
View File
@@ -29,12 +29,14 @@ public class SyncUserService {
String appkey = "Fxi5LHbI5yGbQQDpVp86GcCdXeC5Bjfe"; String appkey = "Fxi5LHbI5yGbQQDpVp86GcCdXeC5Bjfe";
AuthUtils util = new AuthUtils(appuser, appkey, null); AuthUtils util = new AuthUtils(appuser, appkey, null);
Long haoMiaoChuo = System.currentTimeMillis();
Long chuo = haoMiaoChuo / 1000;
List<String> json=new ArrayList<>(); List<String> json=new ArrayList<>();
byte[] cookie = null; byte[] cookie = null;
do { do {
Map<String, Object> params = new HashMap<String, Object>(); Map<String, Object> params = new HashMap<String, Object>();
params.put("cookie", Base64.encodeBase64String(cookie)); params.put("cookie", Base64.encodeBase64String(cookie));
params.put("timestamp", System.currentTimeMillis()); params.put("timestamp", chuo);
// 用户参数 // 用户参数
params.put("filter", "(userid=*)"); params.put("filter", "(userid=*)");