From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/service/data/PublishService.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/lf/server/service/data/PublishService.java b/src/main/java/com/lf/server/service/data/PublishService.java
index 6908ce1..51febe1 100644
--- a/src/main/java/com/lf/server/service/data/PublishService.java
+++ b/src/main/java/com/lf/server/service/data/PublishService.java
@@ -7,11 +7,13 @@
import com.lf.server.entity.ctrl.RegisterEntity;
import com.lf.server.entity.data.MetaEntity;
import com.lf.server.entity.data.PublishEntity;
+import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.PathHelper;
import com.lf.server.helper.RestHelper;
import com.lf.server.helper.StringHelper;
import com.lf.server.helper.WebHelper;
import com.lf.server.mapper.data.PublishMapper;
+import com.lf.server.service.sys.TokenService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Value;
@@ -43,6 +45,9 @@
@Resource
PathHelper pathHelper;
+
+ @Resource
+ TokenService tokenService;
private final static Log log = LogFactory.getLog(PublishService.class);
@@ -214,6 +219,11 @@
}
for (PublishEntity entity : list) {
+ // 閬垮厤閲嶅娉ㄥ唽
+ if (null != entity.getUpdateTime()) {
+ continue;
+ }
+
String url = entity.getUrl().replace("{host}", iisHost);
String type = getServerType(entity);
@@ -310,7 +320,12 @@
PubEntity entity = new PubEntity();
entity.setIds(ids);
entity.setDircode("00");
- entity.setToken(WebHelper.getToken(req));
+
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ entity.setUserId(ue.getId());
+ entity.setToken(WebHelper.getToken(req));
+ }
long rows = postForPub(entity, "/Convert/DeleteFiles");
}
@@ -333,4 +348,21 @@
return msg.getCount();
}
+
+ /**
+ * 娴嬭瘯鏌ヨ
+ */
+ public String selectForTest(Integer seconds) {
+ String str = RestHelper.get(exportServer + "/TB/Wait?seconds=" + seconds);
+ if (StringHelper.isEmpty(str)) {
+ return null;
+ }
+
+ ResponseMsg<String> msg = JSON.parseObject(str, ResponseMsg.class);
+ if (msg == null || msg.getCode() != StaticData.TWO_HUNDRED) {
+ return null;
+ }
+
+ return msg.getResult();
+ }
}
--
Gitblit v1.9.3