diff --git a/nutzfw-common/src/main/java/com/nutzfw/modules/sys/biz/impl/UserAccountBizImpl.java b/nutzfw-common/src/main/java/com/nutzfw/modules/sys/biz/impl/UserAccountBizImpl.java index 06197ce534526cbe9ea8186ae8da0d7dfa144fd3..0c5d9ac974f06edc1547279a09eebe447a884862 100644 --- a/nutzfw-common/src/main/java/com/nutzfw/modules/sys/biz/impl/UserAccountBizImpl.java +++ b/nutzfw-common/src/main/java/com/nutzfw/modules/sys/biz/impl/UserAccountBizImpl.java @@ -22,7 +22,7 @@ import com.nutzfw.modules.organize.entity.UserImportHistory; import com.nutzfw.modules.organize.service.*; import com.nutzfw.modules.organize.thread.CheckUserDataThread; import com.nutzfw.modules.sys.biz.UserAccountBiz; -import net.sf.ehcache.util.NamedThreadFactory; +import com.zaxxer.hikari.util.DefaultThreadFactory; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; @@ -55,8 +55,8 @@ import java.util.concurrent.TimeUnit; @IocBean(name = "userAccountBiz") @SqlsXml("UserAccountBizImpl.xml") public class UserAccountBizImpl implements UserAccountBiz, ISqlDaoExecuteService, ISqlTpl { - private static ExecutorService executorService = new ThreadPoolExecutor(1, 1, 0, TimeUnit.SECONDS, new LinkedBlockingDeque<>(100), - new NamedThreadFactory("用户导入线程", false)); + private static ExecutorService executorService = new ThreadPoolExecutor(1, 1, 0, TimeUnit.SECONDS, + new LinkedBlockingDeque<>(100), new DefaultThreadFactory("用户导入线程", false)); @Inject protected UserAccountService userAccountService; @Inject diff --git a/nutzfw-common/src/main/java/com/nutzfw/modules/tabledata/action/DataMaintainAction.java b/nutzfw-common/src/main/java/com/nutzfw/modules/tabledata/action/DataMaintainAction.java index 832db67962113f57f26b4a90ee4931e0730dfbb4..3bd27500f28ab5a804818f16538b66536216ce24 100644 --- a/nutzfw-common/src/main/java/com/nutzfw/modules/tabledata/action/DataMaintainAction.java +++ b/nutzfw-common/src/main/java/com/nutzfw/modules/tabledata/action/DataMaintainAction.java @@ -26,7 +26,7 @@ import com.nutzfw.modules.tabledata.enums.FieldType; import com.nutzfw.modules.tabledata.service.DataImportHistoryService; import com.nutzfw.modules.tabledata.thread.CheckDataThread; import com.nutzfw.modules.tabledata.vo.SingeDataMaintainQueryVO; -import net.sf.ehcache.util.NamedThreadFactory; +import com.zaxxer.hikari.util.DefaultThreadFactory; import org.apache.commons.collections4.CollectionUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; @@ -66,7 +66,7 @@ public class DataMaintainAction extends BaseAction { * 数据导入线程 */ private static ExecutorService executorService = new ThreadPoolExecutor(1, 1, 0, TimeUnit.SECONDS, new LinkedBlockingDeque<>(100), - new NamedThreadFactory("数据导入线程", false)); + new DefaultThreadFactory("数据导入线程", false)); @Inject DataTableService tableService; @Inject diff --git a/nutzfw-web-flowable/src/main/java/com/nutzfw/core/plugin/flowable/service/impl/FlowTaskServiceImpl.java b/nutzfw-web-flowable/src/main/java/com/nutzfw/core/plugin/flowable/service/impl/FlowTaskServiceImpl.java index adbfa4b13f040d8e573657144dddf6ac1acf3847..54cb7d2eea183ec284bae4d393061a1fea25d3b3 100644 --- a/nutzfw-web-flowable/src/main/java/com/nutzfw/core/plugin/flowable/service/impl/FlowTaskServiceImpl.java +++ b/nutzfw-web-flowable/src/main/java/com/nutzfw/core/plugin/flowable/service/impl/FlowTaskServiceImpl.java @@ -548,7 +548,7 @@ public class FlowTaskServiceImpl implements FlowTaskService { List tasks = taskService.createTaskQuery().processInstanceId(processInstanceId).list(); List currentActivityIds = tasks.stream().map(task -> task.getTaskDefinitionKey()).collect(Collectors.toList()); FlowElement endFlowElement = flowProcessDefinitionService.findEndFlowElement(processInstance.getProcessDefinitionId()); - this.addComment(null,task.getProcessInstanceId(), "[终止] " + reason); + taskService.addComment(null,processInstanceId, "[终止] " + stopReason); runtimeService.createChangeActivityStateBuilder() .processInstanceId(processInstanceId) .moveActivityIdsToSingleActivityId(currentActivityIds, endFlowElement.getId()).changeState();