diff --git a/smtweb-framework/bpm/doc/开发手册.doc b/smtweb-framework/bpm/doc/开发手册.doc new file mode 100644 index 0000000..17b9ccc Binary files /dev/null and b/smtweb-framework/bpm/doc/开发手册.doc differ diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/lcltms/FlowLcLtMs.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/lcltms/FlowLcLtMsService.java similarity index 84% rename from smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/lcltms/FlowLcLtMs.java rename to smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/lcltms/FlowLcLtMsService.java index 5814ab6..9831605 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/lcltms/FlowLcLtMs.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/lcltms/FlowLcLtMsService.java @@ -9,5 +9,5 @@ import cc.smtweb.system.bpm.web.engine.model.flow.listcard.lcms.FlowLcMsService; * 模型：FLOW_LT_MS 服务类 */ @SwService -public class FlowLcLtMs extends FlowLcMsService { +public class FlowLcLtMsService extends FlowLcMsService { } diff --git a/smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/base/dict/dictList.js b/smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/base/dict/dictList.js index 2327a8a..a0e46f8 100644 --- a/smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/base/dict/dictList.js +++ b/smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/base/dict/dictList.js @@ -14,17 +14,9 @@ window.$swEvent.setup("bpm.sys.base.dict.dictList", { const afterDelDict = () => { $api.loadOne("dictList"); }; - const exportExcel = () => { - $$http.post("bpm/dict/exportExcel").then( (rt) => { - console.info("exportExcel:",rt); - const url = $$http.downloadFileUrl(rt.data.filePath,rt.data.fileName,true); - $$http.downloadFile(url,{fileName: rt.data.fileName}); - }); - } return { afterDelDictType, afterDelDict, - exportExcel, } } }); diff --git a/smtweb-framework/canal/client/pom.xml b/smtweb-framework/canal/client/pom.xml index b4af862..19186cb 100644 --- a/smtweb-framework/canal/client/pom.xml +++ b/smtweb-framework/canal/client/pom.xml @@ -207,4 +207,17 @@ + + + + nexus-releases + Nexus Release Repository + http://47.92.149.153:7000/repository/maven-releases/ + + + nexus-snapshots + Nexus Snapshot Repository + http://47.92.149.153:7000/repository/maven-snapshots/ + + diff --git a/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientStartedListener.java b/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientStartedListener.java index 58c58a8..ec5a5e7 100644 --- a/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientStartedListener.java +++ b/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientStartedListener.java @@ -16,7 +16,7 @@ public class ClientStartedListener implements IStartListener { @Override public int order() { - return SwConsts.DEFAULT_ORDER + 3; + return SwConsts.DEFAULT_ORDER + 99; } diff --git a/smtweb-framework/canal/file/pom.xml b/smtweb-framework/canal/file/pom.xml index be23a69..8284aa1 100644 --- a/smtweb-framework/canal/file/pom.xml +++ b/smtweb-framework/canal/file/pom.xml @@ -43,7 +43,7 @@ 3.1.0-SNAPSHOT - + @@ -92,4 +92,16 @@ + + + nexus-releases + Nexus Release Repository + http://47.92.149.153:7000/repository/maven-releases/ + + + nexus-snapshots + Nexus Snapshot Repository + http://47.92.149.153:7000/repository/maven-snapshots/ + + diff --git a/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/CanalFileStartedListener.java b/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/CanalFileStartedListener.java index 80c52bc..fea1b11 100644 --- a/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/CanalFileStartedListener.java +++ b/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/CanalFileStartedListener.java @@ -4,6 +4,8 @@ import cc.smtweb.framework.core.annotation.SwStartListener; import cc.smtweb.framework.core.common.SwConsts; import cc.smtweb.framework.core.mvc.controller.IStartListener; import cc.smtweb.framework.core.systask.SysServiceFactory; +import cc.smtweb.framework.core.util.SpringUtil; +import cc.smtweb.system.canal.file.common.FileDecodeConfig; import cc.smtweb.system.canal.file.common.FileDecodeService; import lombok.extern.slf4j.Slf4j; @@ -24,9 +26,10 @@ public class CanalFileStartedListener implements IStartListener { @Override public void init() { + FileDecodeConfig config = SpringUtil.getBean(FileDecodeConfig.class); SwConsts.SysParam.enableCanal = true; SwConsts.SysParam.RUN_PROJECTS = ""; - SysServiceFactory.getInstance().reg(new FileDecodeService()); + if(config.isEnable()) SysServiceFactory.getInstance().reg(new FileDecodeService()); } @Override diff --git a/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/common/AbstractFileWork.java b/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/common/AbstractFileWork.java index 21551e6..89967e4 100644 --- a/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/common/AbstractFileWork.java +++ b/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/common/AbstractFileWork.java @@ -7,7 +7,6 @@ import cc.smtweb.framework.core.exception.SwException; import cc.smtweb.framework.core.util.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Component; import java.io.File; @@ -140,7 +139,7 @@ public abstract class AbstractFileWork { for (String field : fields) { sql.append("?").append(","); String value = data.get(field); - if (StringUtils.isEmpty(value)) { + if (StringUtil.isEmpty(value)) { args.add(null); } else { args.add(value); @@ -161,7 +160,7 @@ public abstract class AbstractFileWork { if (field.equals(canalVO.getIdField())) continue; sql.append(field).append("=").append("?").append(","); String value = data.get(field); - if (StringUtils.isEmpty(value)) { + if (StringUtil.isEmpty(value)) { args.add(null); } else { args.add(value); diff --git a/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/common/FileDecodeConfig.java b/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/common/FileDecodeConfig.java index d1b73cf..ae5f1ef 100644 --- a/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/common/FileDecodeConfig.java +++ b/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/common/FileDecodeConfig.java @@ -14,9 +14,16 @@ public class FileDecodeConfig { @Value("${canal.file.path}") private String path; + @Value("${canal.file.enable}") + private boolean enable; + public String getPath() { return path; } + + public boolean isEnable() { + return enable; + } } diff --git a/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/common/FileDecodeService.java b/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/common/FileDecodeService.java index 95bf30f..8264ada 100644 --- a/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/common/FileDecodeService.java +++ b/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/common/FileDecodeService.java @@ -4,10 +4,7 @@ import cc.smtweb.framework.core.db.DbEngine; import cc.smtweb.framework.core.systask.BaseSysService; import lombok.extern.slf4j.Slf4j; -/** - * Created by Akmm at 2021/12/6 19:19 - * 清除当前已结束任务, 10分钟一次 - */ + @Slf4j public class FileDecodeService extends BaseSysService { @Override @@ -17,7 +14,7 @@ public class FileDecodeService extends BaseSysService { @Override public int getInterval() { - return 5; + return 10; } @Override diff --git a/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/impl/MySqlFileWork.java b/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/impl/MySqlFileWork.java index 9fd17e9..752ea97 100644 --- a/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/impl/MySqlFileWork.java +++ b/smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/impl/MySqlFileWork.java @@ -2,8 +2,8 @@ package cc.smtweb.system.canal.file.impl; import cc.smtweb.framework.core.common.CanalVO; import cc.smtweb.framework.core.common.SwEnum; +import cc.smtweb.framework.core.util.StringUtil; import cc.smtweb.system.canal.file.common.AbstractFileWork; -import org.apache.commons.lang.StringUtils; import java.util.ArrayList; import java.util.List; @@ -47,7 +47,7 @@ public class MySqlFileWork extends AbstractFileWork { for (String field : fields) { sql.append("?").append(","); String value = data.get(field); - if (StringUtils.isEmpty(value)) { + if (StringUtil.isEmpty(value)) { args.add(null); } else { args.add(value); @@ -69,7 +69,7 @@ public class MySqlFileWork extends AbstractFileWork { if (field.equals(canalVO.getIdField())) continue; sql.append(field).append("=").append("?").append(","); String value = data.get(field); - if (StringUtils.isEmpty(value)) { + if (StringUtil.isEmpty(value)) { args.add(null); } else { args.add(value); diff --git a/smtweb-framework/canal/server/pom.xml b/smtweb-framework/canal/server/pom.xml index 6abf965..2d0229e 100644 --- a/smtweb-framework/canal/server/pom.xml +++ b/smtweb-framework/canal/server/pom.xml @@ -189,4 +189,17 @@ + + + + nexus-releases + Nexus Release Repository + http://47.92.149.153:7000/repository/maven-releases/ + + + nexus-snapshots + Nexus Snapshot Repository + http://47.92.149.153:7000/repository/maven-snapshots/ + + diff --git a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalStartedListener.java b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalStartedListener.java index 5c11711..bb65467 100644 --- a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalStartedListener.java +++ b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalStartedListener.java @@ -18,7 +18,7 @@ public class CanalStartedListener implements IStartListener { @Override public int order() { - return SwConsts.DEFAULT_ORDER + 2; + return SwConsts.DEFAULT_ORDER + 90; } diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/controller/scan/ApplicationScanner.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/controller/scan/ApplicationScanner.java index 34ac3e3..5f4868f 100644 --- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/controller/scan/ApplicationScanner.java +++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/controller/scan/ApplicationScanner.java @@ -1,8 +1,5 @@ package cc.smtweb.framework.core.mvc.controller.scan; -import cc.smtweb.framework.core.cache.AbstractCache; -import cc.smtweb.framework.core.cache.CacheManager; -import cc.smtweb.framework.core.cache.ISwCache; import cc.smtweb.framework.core.mvc.config.ControllerConfig; import cc.smtweb.framework.core.mvc.controller.ApiConfigBean; import cc.smtweb.framework.core.mvc.controller.MethodAccessManager; @@ -60,14 +57,6 @@ public class ApplicationScanner { log.info("[smt] scan ok."); } - - // 处理权限管理和启动定时任务 - AbstractCache realmCache = CacheManager.getIntance().getCache(ISwCache.REALM_CACHE); - - if (realmCache == null) { - log.error("not find RealmCache"); - } - - methodAccessManager.init(beanManager, realmCache); + methodAccessManager.init(beanManager, null); } }