From b492001eab2a9e8751a4073432789efb7e945c4a Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 01 八月 2023 14:40:04 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/PublishService.java | 17 ++++++++++++++++-
src/main/java/com/lf/server/controller/data/TaskController.java | 7 ++++++-
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/TaskController.java b/src/main/java/com/lf/server/controller/data/TaskController.java
index aa486c9..6c08bda 100644
--- a/src/main/java/com/lf/server/controller/data/TaskController.java
+++ b/src/main/java/com/lf/server/controller/data/TaskController.java
@@ -182,7 +182,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 = publishService.postForPub(entity, "/Convert/DeleteTask");
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..ba6b7f1 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");
}
--
Gitblit v1.9.3