S JavaScriptem funguje tato webová stránka lépe.
Domů
Procházet
Nápověda
Registrovat se
Přihlásit se
zhenggm
/
smtweb2
Sledovat
1
Oblíbit
0
Rozštěpit
0
Zdrojový kód
Úkoly
0
Požadavky na natažení
0
Vydání
0
Wiki
Aktivita
Procházet zdrojové kódy
Merge remote-tracking branch 'origin/4.0' into 4.0
4.0
lip
před 1 rokem
rodič
d2c33685de
2c89970c44
revize
be1cac9b87
14 změnil soubory
, kde provedl
62 přidání
a
37 odebrání
Rozdělené zobrazení
Diff Options
Zobrazit statistiky
Stáhněte soubor opravy
Stáhněte rozdílový soubor
binární
smtweb-framework/bpm/doc/开发手册.doc
+1
-1
smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/lcltms/FlowLcLtMsService.java
+0
-8
smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/base/dict/dictList.js
+13
-0
smtweb-framework/canal/client/pom.xml
+1
-1
smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientStartedListener.java
+14
-2
smtweb-framework/canal/file/pom.xml
+4
-1
smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/CanalFileStartedListener.java
+2
-3
smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/common/AbstractFileWork.java
+7
-0
smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/common/FileDecodeConfig.java
+2
-5
smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/common/FileDecodeService.java
+3
-3
smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/impl/MySqlFileWork.java
+13
-0
smtweb-framework/canal/server/pom.xml
+1
-1
smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalStartedListener.java
+1
-12
smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/controller/scan/ApplicationScanner.java
binární
smtweb-framework/bpm/doc/开发手册.doc
Zobrazit soubor
smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/lcltms/FlowLcLtMs.java → smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/lcltms/FlowLcLtMsService.java
Zobrazit soubor
@@ -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 FlowLcLtMs
Service
extends FlowLcMsService {
}
+ 0
- 8
smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/base/dict/dictList.js
Zobrazit soubor
@@ -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,
}
}
});
+ 13
- 0
smtweb-framework/canal/client/pom.xml
Zobrazit soubor
@@ -207,4 +207,17 @@
</build>
</profile>
</profiles>
<distributionManagement>
<repository>
<id>nexus-releases</id>
<name>Nexus Release Repository</name>
<url>http://47.92.149.153:7000/repository/maven-releases/</url>
</repository>
<snapshotRepository>
<id>nexus-snapshots</id>
<name>Nexus Snapshot Repository</name>
<url>http://47.92.149.153:7000/repository/maven-snapshots/</url>
</snapshotRepository>
</distributionManagement>
</project>
+ 1
- 1
smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientStartedListener.java
Zobrazit soubor
@@ -16,7 +16,7 @@ public class ClientStartedListener implements IStartListener {
@Override
public int order() {
return SwConsts.DEFAULT_ORDER +
3
;
return SwConsts.DEFAULT_ORDER +
99
;
}
+ 14
- 2
smtweb-framework/canal/file/pom.xml
Zobrazit soubor
@@ -43,7 +43,7 @@
<version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<
!--<
dependency>
<groupId>cc.smtweb</groupId>
<artifactId>canal.example</artifactId>
<version>1.1.5</version>
@@ -53,7 +53,7 @@
<groupId>cc.smtweb</groupId>
<artifactId>canal.deployer</artifactId>
<version>1.1.5</version>
</dependency>
</dependency>
-->
<dependency>
@@ -92,4 +92,16 @@
</plugins>
</build>
<distributionManagement>
<repository>
<id>nexus-releases</id>
<name>Nexus Release Repository</name>
<url>http://47.92.149.153:7000/repository/maven-releases/</url>
</repository>
<snapshotRepository>
<id>nexus-snapshots</id>
<name>Nexus Snapshot Repository</name>
<url>http://47.92.149.153:7000/repository/maven-snapshots/</url>
</snapshotRepository>
</distributionManagement>
</project>
+ 4
- 1
smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/CanalFileStartedListener.java
Zobrazit soubor
@@ -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
+ 2
- 3
smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/common/AbstractFileWork.java
Zobrazit soubor
@@ -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 (StringUtil
s
.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 (StringUtil
s
.isEmpty(value)) {
if (StringUtil.isEmpty(value)) {
args.add(null);
} else {
args.add(value);
+ 7
- 0
smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/common/FileDecodeConfig.java
Zobrazit soubor
@@ -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;
}
}
+ 2
- 5
smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/common/FileDecodeService.java
Zobrazit soubor
@@ -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
+ 3
- 3
smtweb-framework/canal/file/src/main/java/cc/smtweb/system/canal/file/impl/MySqlFileWork.java
Zobrazit soubor
@@ -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 (StringUtil
s
.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 (StringUtil
s
.isEmpty(value)) {
if (StringUtil.isEmpty(value)) {
args.add(null);
} else {
args.add(value);
+ 13
- 0
smtweb-framework/canal/server/pom.xml
Zobrazit soubor
@@ -189,4 +189,17 @@
</build>
</profile>
</profiles>
<distributionManagement>
<repository>
<id>nexus-releases</id>
<name>Nexus Release Repository</name>
<url>http://47.92.149.153:7000/repository/maven-releases/</url>
</repository>
<snapshotRepository>
<id>nexus-snapshots</id>
<name>Nexus Snapshot Repository</name>
<url>http://47.92.149.153:7000/repository/maven-snapshots/</url>
</snapshotRepository>
</distributionManagement>
</project>
+ 1
- 1
smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalStartedListener.java
Zobrazit soubor
@@ -18,7 +18,7 @@ public class CanalStartedListener implements IStartListener {
@Override
public int order() {
return SwConsts.DEFAULT_ORDER +
2
;
return SwConsts.DEFAULT_ORDER +
90
;
}
+ 1
- 12
smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/controller/scan/ApplicationScanner.java
Zobrazit soubor
@@ -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);
}
}
Zapsat
Náhled
Načítá se…
Zrušit
Uložit