diff --git a/smtweb-framework/bpm/pom.xml b/smtweb-framework/bpm/pom.xml index 2fd5116..ada91ac 100644 --- a/smtweb-framework/bpm/pom.xml +++ b/smtweb-framework/bpm/pom.xml @@ -51,12 +51,12 @@ com.fasterxml.jackson.dataformat jackson-dataformat-yaml - 2.11.0 + 2.13.4 com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.11.0 + 2.13.4 diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/BpmStartedListener.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/BpmStartedListener.java index 88be51b..046ba99 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/BpmStartedListener.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/BpmStartedListener.java @@ -8,6 +8,7 @@ import cc.smtweb.framework.core.db.vo.ModelCatalog; import cc.smtweb.framework.core.mvc.controller.IStartListener; import cc.smtweb.framework.core.mvc.service.TreeHelper; import cc.smtweb.framework.core.systask.SysServiceFactory; +import cc.smtweb.framework.core.systask.SysThreadPool; import cc.smtweb.system.bpm.web.design.db.ModelCatalogTreeHelper; import cc.smtweb.system.bpm.web.sys.base.job.JobUtils; import cc.smtweb.system.bpm.web.sys.oneTimeService.OneTimeServiceFactory; @@ -27,7 +28,7 @@ public class BpmStartedListener implements IStartListener { SwConsts.SysParam.RUN_PROJECTS = "bpm"; SysServiceFactory.getInstance().reg(new OneTimeTaskCleanService()); TreeHelper.regTreeHelper(ModelCatalog.ENTITY_NAME, ModelCatalogTreeHelper.class); - + } @Override @@ -44,5 +45,6 @@ public class BpmStartedListener implements IStartListener { public void close() { OneTimeServiceFactory.getInstance().stop(); JobUtils.getInstance().stop(); + SysThreadPool.getInstance().stop(); } } diff --git a/smtweb-framework/canal/client/canal.example.iml b/smtweb-framework/canal/client/canal.example.iml deleted file mode 100644 index 7d2fbb7..0000000 --- a/smtweb-framework/canal/client/canal.example.iml +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/smtweb-framework/canal/client/pom.xml b/smtweb-framework/canal/client/pom.xml index 09c9462..47b1bb1 100644 --- a/smtweb-framework/canal/client/pom.xml +++ b/smtweb-framework/canal/client/pom.xml @@ -8,7 +8,7 @@ cc.smtweb - canal.client + canal.example 1.1.6 diff --git a/smtweb-framework/canal/client/src/main/assembly/dev.xml b/smtweb-framework/canal/client/src/main/assembly/dev.xml new file mode 100644 index 0000000..3c66c4c --- /dev/null +++ b/smtweb-framework/canal/client/src/main/assembly/dev.xml @@ -0,0 +1,54 @@ + + dist + + dir + + false + + + . + / + + README* + + + + ./src/main/bin + bin + + **/* + + 0755 + + + ./src/main/conf + /conf + + **/* + + + + ./src/main/resources + /conf + + **/* + + + + target + logs + + **/* + + + + + + lib + + junit:junit + + + + diff --git a/smtweb-framework/canal/client/src/main/assembly/release.xml b/smtweb-framework/canal/client/src/main/assembly/release.xml new file mode 100644 index 0000000..6a1f9ef --- /dev/null +++ b/smtweb-framework/canal/client/src/main/assembly/release.xml @@ -0,0 +1,54 @@ + + dist + + tar.gz + + false + + + . + / + + README* + + + + ./src/main/bin + bin + + **/* + + 0755 + + + ./src/main/conf + /conf + + **/* + + + + ./src/main/resources + /conf + + **/* + + + + target + logs + + **/* + + + + + + lib + + junit:junit + + + + diff --git a/smtweb-framework/canal/client/src/main/bin/restart.sh b/smtweb-framework/canal/client/src/main/bin/restart.sh new file mode 100644 index 0000000..3623edd --- /dev/null +++ b/smtweb-framework/canal/client/src/main/bin/restart.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +args=$@ + +case $(uname) in +Linux) + bin_abs_path=$(readlink -f $(dirname $0)) + ;; +*) + bin_abs_path=$(cd $(dirname $0) ||exit ; pwd) + ;; +esac + +sh "$bin_abs_path"/stop.sh $args +sh "$bin_abs_path"/startup.sh $args diff --git a/smtweb-framework/canal/client/src/main/bin/startup.bat b/smtweb-framework/canal/client/src/main/bin/startup.bat new file mode 100644 index 0000000..3072543 --- /dev/null +++ b/smtweb-framework/canal/client/src/main/bin/startup.bat @@ -0,0 +1,23 @@ +@echo off +@if not "%ECHO%" == "" echo %ECHO% +@if "%OS%" == "Windows_NT" setlocal + +set ENV_PATH=.\ +if "%OS%" == "Windows_NT" set ENV_PATH=%~dp0% + +set conf_dir=%ENV_PATH%\..\conf +set logback_configurationFile=%conf_dir%\logback.xml +set client_mode=Simple +if not "%1" == "" set client_mode=%1 + +set CLASSPATH=%conf_dir% +set CLASSPATH=%conf_dir%\..\lib\*;%CLASSPATH% + +set JAVA_MEM_OPTS= -Xms128m -Xmx512m -XX:PermSize=128m +set JAVA_OPTS_EXT= -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dapplication.codeset=UTF-8 -Dfile.encoding=UTF-8 +set JAVA_DEBUG_OPT= -server -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=9199,server=y,suspend=n +set CANAL_OPTS= -DappName=otter-canal-example -Dlogback.configurationFile="%logback_configurationFile%" + +set JAVA_OPTS= %JAVA_MEM_OPTS% %JAVA_OPTS_EXT% %JAVA_DEBUG_OPT% %CANAL_OPTS% + +java %JAVA_OPTS% -classpath "%CLASSPATH%" cc.smtweb.system.canal.example.ClientLauncher diff --git a/smtweb-framework/canal/client/src/main/bin/startup.sh b/smtweb-framework/canal/client/src/main/bin/startup.sh new file mode 100644 index 0000000..a64ecee --- /dev/null +++ b/smtweb-framework/canal/client/src/main/bin/startup.sh @@ -0,0 +1,105 @@ +#!/bin/bash + +current_path=`pwd` +case "`uname`" in + Linux) + bin_abs_path=$(readlink -f $(dirname $0)) + ;; + *) + bin_abs_path=`cd $(dirname $0); pwd` + ;; +esac +base=${bin_abs_path}/.. +client_mode="Simple" +logback_configurationFile=$base/conf/logback.xml +export LANG=en_US.UTF-8 +export BASE=$base + +if [ -f $base/bin/canal.pid ] ; then + echo "found canal.pid , Please run stop.sh first ,then startup.sh" 2>&2 + exit 1 +fi + +## set java path +if [ -z "$JAVA" ] ; then + JAVA=$(which java) +fi + +ALIBABA_JAVA="/usr/alibaba/java/bin/java" +TAOBAO_JAVA="/opt/taobao/java/bin/java" +if [ -z "$JAVA" ]; then + if [ -f $ALIBABA_JAVA ] ; then + JAVA=$ALIBABA_JAVA + elif [ -f $TAOBAO_JAVA ] ; then + JAVA=$TAOBAO_JAVA + else + echo "Cannot find a Java JDK. Please set either set JAVA or put java (>=1.5) in your PATH." 2>&2 + exit 1 + fi +fi + +case "$#" +in +0 ) + ;; +1 ) + client_mode=$* + ;; +2 ) + if [ "$1" = "debug" ]; then + DEBUG_PORT=$2 + DEBUG_SUSPEND="y" + JAVA_DEBUG_OPT="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=$DEBUG_PORT,server=y,suspend=$DEBUG_SUSPEND" + else + client_mode=$1 + fi;; +* ) + echo "THE PARAMETERS MUST BE TWO OR LESS.PLEASE CHECK AGAIN." + exit;; +esac + +JavaVersion=`$JAVA -version 2>&1 |awk 'NR==1{ gsub(/"/,""); print $3 }' | awk -F '.' '{print $1}'` +str=`file -L $JAVA | grep 64-bit` + +JAVA_OPTS="$JAVA_OPTS -Xss256k -XX:+AggressiveOpts -XX:-UseBiasedLocking -XX:-OmitStackTraceInFastThrow -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$base/logs" +if [ $JavaVersion -ge 11 ] ; then + #JAVA_OPTS="$JAVA_OPTS -Xlog:gc*:$base_log/gc.log:time " + JAVA_OPTS="$JAVA_OPTS" +else + #JAVA_OPTS="$JAVA_OPTS -Xloggc:$base/logs/canal/gc.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime" + JAVA_OPTS="$JAVA_OPTS -XX:+UseFastAccessorMethods -XX:+PrintAdaptiveSizePolicy -XX:+PrintTenuringDistribution" +fi + +if [ -n "$str" ]; then + # JAVA_OPTS="-server -Xms2048m -Xmx3072m -Xmn1024m -XX:SurvivorRatio=2 -XX:PermSize=96m -XX:MaxPermSize=256m -XX:MaxTenuringThreshold=15 -XX:+DisableExplicitGC $JAVA_OPTS" + # For G1 + JAVA_OPTS="-server -Xms2g -Xmx3g -XX:+UseG1GC -XX:MaxGCPauseMillis=250 -XX:+UseGCOverheadLimit -XX:+ExplicitGCInvokesConcurrent $JAVA_OPTS" +else + JAVA_OPTS="-server -Xms1024m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:MaxPermSize=128m $JAVA_OPTS" +fi + +JAVA_OPTS=" $JAVA_OPTS -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dfile.encoding=UTF-8" +CANAL_OPTS="-DappName=otter-canal-example -Dlogback.configurationFile=$logback_configurationFile" + +if [ -e $logback_configurationFile ] +then + + for i in $base/lib/*; + do CLASSPATH=$i:"$CLASSPATH"; + done + CLASSPATH="$base/conf:$CLASSPATH"; + + echo "cd to $bin_abs_path for workaround relative path" + cd $bin_abs_path + + echo LOG CONFIGURATION : $logback_configurationFile + echo client mode : $client_mode + echo CLASSPATH :$CLASSPATH + $JAVA $JAVA_OPTS $JAVA_DEBUG_OPT $CANAL_OPTS -classpath .:$CLASSPATH cc.smtweb.system.canal.example.ClientLauncher 1>>$base/bin/nohup.out 2>&1 & + + echo $! > $base/bin/canal.pid + echo "cd to $current_path for continue" + cd $current_path +else + echo "client mode("$client_mode") OR log configration file($logback_configurationFile) is not exist,please create then first!" +fi diff --git a/smtweb-framework/canal/client/src/main/bin/stop.sh b/smtweb-framework/canal/client/src/main/bin/stop.sh new file mode 100644 index 0000000..b8c997f --- /dev/null +++ b/smtweb-framework/canal/client/src/main/bin/stop.sh @@ -0,0 +1,53 @@ +#!/bin/bash + +cygwin=false; +case "`uname`" in + CYGWIN*) + cygwin=true + ;; +esac + +get_pid() { + STR=$1 + PID=$2 + if $cygwin; then + JAVA_CMD="$JAVA_HOME\bin\java" + JAVA_CMD=`cygpath --path --unix $JAVA_CMD` + JAVA_PID=`ps |grep $JAVA_CMD |awk '{print $1}'` + else + if [ ! -z "$PID" ]; then + JAVA_PID=`ps -C java -f --width 1000|grep "$STR"|grep "$PID"|grep -v grep|awk '{print $2}'` + else + JAVA_PID=`ps -C java -f --width 1000|grep "$STR"|grep -v grep|awk '{print $2}'` + fi + fi + echo $JAVA_PID; +} + +base=`dirname $0`/.. +pidfile=$base/bin/canal.pid +if [ ! -f "$pidfile" ];then + echo "canal is not running. exists" + exit +fi + +pid=`cat $pidfile` +if [ "$pid" == "" ] ; then + pid=`get_pid "appName=otter-canal-example"` +fi + +echo -e "`hostname`: stopping canal $pid ... " +kill $pid + +LOOPS=0 +while (true); +do + gpid=`get_pid "appName=otter-canal-example" "$pid"` + if [ "$gpid" == "" ] ; then + echo "Oook! cost:$LOOPS" + `rm $pidfile` + break; + fi + let LOOPS=LOOPS+1 + sleep 1 +done \ No newline at end of file diff --git a/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientApplication.java b/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientApplication.java new file mode 100644 index 0000000..8d7e97a --- /dev/null +++ b/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientApplication.java @@ -0,0 +1,13 @@ +package cc.smtweb.system.canal.example; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ClientApplication { + + public static void main(String[] args) { + SpringApplication.run(ClientApplication.class, args); + } + +} diff --git a/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientConfiguration.java b/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientConfiguration.java new file mode 100644 index 0000000..ad1b7b6 --- /dev/null +++ b/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientConfiguration.java @@ -0,0 +1,21 @@ +package cc.smtweb.system.canal.example; + +import cc.smtweb.framework.core.mvc.config.ControllerConfig; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; + +/** + * @author kevin + */ +@Configuration +@ComponentScan +public class ClientConfiguration { + /** + * 配置自定义service扫描路径 {module}/{service}/{method} + */ + @Bean + public ControllerConfig clientConfiguration() { + return new ControllerConfig("canalClient", "cc.smtweb.system.canal.client", null); + } +} diff --git a/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/client/ClientConsts.java b/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientConsts.java similarity index 98% rename from smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/client/ClientConsts.java rename to smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientConsts.java index c238ae9..fdda311 100644 --- a/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/client/ClientConsts.java +++ b/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientConsts.java @@ -1,4 +1,4 @@ -package cc.smtweb.system.canal.client; +package cc.smtweb.system.canal.example; import org.apache.commons.lang.StringUtils; diff --git a/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/client/ClientInstance.java b/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientInstance.java similarity index 98% rename from smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/client/ClientInstance.java rename to smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientInstance.java index a4415d1..4c87a73 100644 --- a/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/client/ClientInstance.java +++ b/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientInstance.java @@ -1,4 +1,4 @@ -package cc.smtweb.system.canal.client; +package cc.smtweb.system.canal.example; import cc.smtweb.framework.core.util.CommUtil; import cc.smtweb.framework.core.util.JsonUtil; @@ -70,9 +70,9 @@ public class ClientInstance { connector = CanalConnectors.newSingleConnector(new InetSocketAddress(ClientConsts.getIp(properties), ClientConsts.getPort(properties)), ClientConsts.getInstance(properties), ClientConsts.getUsername(properties), ClientConsts.getPassword(properties)); - connector.connect(); - connector.subscribe(ClientConsts.getFilter(properties)); - connector.rollback(); + //connector.connect(); + //connector.subscribe(ClientConsts.getFilter(properties)); + //connector.rollback(); Runtime.getRuntime().addShutdownHook(new Thread(() -> { try { diff --git a/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientLauncher.java b/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientLauncher.java new file mode 100644 index 0000000..c9216a6 --- /dev/null +++ b/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientLauncher.java @@ -0,0 +1,14 @@ +package cc.smtweb.system.canal.example; + +/** + * @Author yaoq + * @Date 2022年09月14日 10:27 + * @Description + */ +public class ClientLauncher { + + public static void main(String[] args) { + ClientInstance.getInstance().start(); + } + +} diff --git a/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/client/ClientStartedListener.java b/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientStartedListener.java similarity index 81% rename from smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/client/ClientStartedListener.java rename to smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientStartedListener.java index 5dad1df..f750878 100644 --- a/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/client/ClientStartedListener.java +++ b/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientStartedListener.java @@ -1,4 +1,4 @@ -package cc.smtweb.system.canal.client; +package cc.smtweb.system.canal.example; import cc.smtweb.framework.core.annotation.SwStartListener; import cc.smtweb.framework.core.common.SwConsts; @@ -29,4 +29,9 @@ public class ClientStartedListener implements IStartListener { public void run() { ClientInstance.getInstance().start(); } + + @Override + public void close() { + ClientInstance.getInstance().stop(); + } } diff --git a/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/client/ClientVO.java b/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientVO.java similarity index 96% rename from smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/client/ClientVO.java rename to smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientVO.java index 02cbb46..d55abec 100644 --- a/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/client/ClientVO.java +++ b/smtweb-framework/canal/client/src/main/java/cc/smtweb/system/canal/example/ClientVO.java @@ -1,4 +1,4 @@ -package cc.smtweb.system.canal.client; +package cc.smtweb.system.canal.example; import java.util.Map; diff --git a/smtweb-framework/canal/client/src/main/resources/META-INF/spring.factories b/smtweb-framework/canal/client/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..1476d0e --- /dev/null +++ b/smtweb-framework/canal/client/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ + cc.smtweb.system.canal.example.ClientConfiguration diff --git a/smtweb-framework/canal/client/src/main/resources/client.properties b/smtweb-framework/canal/client/src/main/resources/client.properties index 6314051..990225f 100644 --- a/smtweb-framework/canal/client/src/main/resources/client.properties +++ b/smtweb-framework/canal/client/src/main/resources/client.properties @@ -1,14 +1,14 @@ -#canal ??????? -# ??????? ??MB +#canal 客户端配置 +# 单次读取数据量大小 单位：MB canal.server.size=50 -# ?????? +# canal 服务端实例名，端口，IP canal.server.instance=example canal.server.ip=127.0.0.1 canal.server.port=11111 -# ????????? ?????? +# canal 服务端访问用户名，密码 canal.server.username= canal.server.password= -# ??????????.*\\..*??????scmz\\..* +# 数据库匹配规则.*\\..*, scmz\\..* canal.server.filter=.*\\..* diff --git a/smtweb-framework/canal/server/canal.server.iml b/smtweb-framework/canal/server/canal.server.iml deleted file mode 100644 index 9f6a7c5..0000000 --- a/smtweb-framework/canal/server/canal.server.iml +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/smtweb-framework/canal/server/pom.xml b/smtweb-framework/canal/server/pom.xml index 89b0415..6835884 100644 --- a/smtweb-framework/canal/server/pom.xml +++ b/smtweb-framework/canal/server/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 @@ -9,28 +10,16 @@ cc.smtweb - canal.server + canal.deployer 1.1.6 com.alibaba.otter - canal.protocol - 1.1.6 - - - com.alibaba.otter - canal.client - 1.1.6 - - - - com.alibaba.otter canal.server 1.1.6 - com.alibaba.otter @@ -91,27 +80,33 @@ jar-with-dependencies provided + org.springframework.boot spring-boot-autoconfigure + cc.smtweb sw-framework-core 3.1.0-SNAPSHOT - compile cc.smtweb sw-system-bpm 3.1.0-SNAPSHOT - compile + + + maven-jar-plugin @@ -127,7 +122,7 @@ - + org.apache.maven.plugins maven-dependency-plugin 2.10 @@ -187,7 +182,7 @@ ${basedir}/src/main/assembly/dev.xml - canal + canal-deployer ${project.build.directory} diff --git a/smtweb-framework/canal/server/src/main/bin/startup.bat b/smtweb-framework/canal/server/src/main/bin/startup.bat index 0cad8cb..bb43125 100644 --- a/smtweb-framework/canal/server/src/main/bin/startup.bat +++ b/smtweb-framework/canal/server/src/main/bin/startup.bat @@ -21,7 +21,7 @@ set CANAL_OPTS= -DappName=otter-canal -Dlogback.configurationFile="%logback_conf set JAVA_OPTS= %JAVA_MEM_OPTS% %JAVA_OPTS_EXT% %JAVA_DEBUG_OPT% %CANAL_OPTS% -set CMD_STR= java %JAVA_OPTS% -classpath "%CLASSPATH%" java %JAVA_OPTS% -classpath "%CLASSPATH%" CanalLauncher +set CMD_STR= java %JAVA_OPTS% -classpath "%CLASSPATH%" java %JAVA_OPTS% -classpath "%CLASSPATH%" cc.smtweb.system.canal.deployer.CanalLauncher echo start cmd : %CMD_STR% -java %JAVA_OPTS% -classpath "%CLASSPATH%" CanalLauncher +java %JAVA_OPTS% -classpath "%CLASSPATH%" cc.smtweb.system.canal.deployer.CanalLauncher diff --git a/smtweb-framework/canal/server/src/main/bin/startup.sh b/smtweb-framework/canal/server/src/main/bin/startup.sh index b8c0ed3..2a2be9b 100644 --- a/smtweb-framework/canal/server/src/main/bin/startup.sh +++ b/smtweb-framework/canal/server/src/main/bin/startup.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash current_path=`pwd` case "`uname`" in @@ -21,7 +21,7 @@ if [ -f $base/bin/canal.pid ] ; then exit 1 fi -if [ ! -d $base/logs/canal ] ; then +if [ ! -d $base/logs/canal ] ; then mkdir -p $base/logs/canal fi @@ -43,30 +43,30 @@ if [ -z "$JAVA" ]; then fi fi -case "$#" +case "$#" in -0 ) +0 ) ;; -1 ) +1 ) var=$* if [ "$var" = "local" ]; then canal_conf=$canal_local_conf else - if [ -f $var ] ; then + if [ -f $var ] ; then canal_conf=$var else echo "THE PARAMETER IS NOT CORRECT.PLEASE CHECK AGAIN." exit fi fi;; -2 ) +2 ) var=$1 if [ "$var" = "local" ]; then canal_conf=$canal_local_conf else if [ -f $var ] ; then canal_conf=$var - else + else if [ "$1" = "debug" ]; then DEBUG_PORT=$2 DEBUG_SUSPEND="n" @@ -103,24 +103,24 @@ JAVA_OPTS=" $JAVA_OPTS -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true CANAL_OPTS="-DappName=otter-canal -Dlogback.configurationFile=$logback_configurationFile -Dcanal.conf=$canal_conf" if [ -e $canal_conf -a -e $logback_configurationFile ] -then - +then + for i in $base/lib/*; do CLASSPATH=$i:"$CLASSPATH"; done CLASSPATH="$base/conf:$CLASSPATH"; - + echo "cd to $bin_abs_path for workaround relative path" cd $bin_abs_path - + echo LOG CONFIGURATION : $logback_configurationFile - echo canal conf : $canal_conf + echo canal conf : $canal_conf echo CLASSPATH :$CLASSPATH - $JAVA $JAVA_OPTS $JAVA_DEBUG_OPT $CANAL_OPTS -classpath .:$CLASSPATH com.alibaba.otter.canal.deployer.CanalLauncher 1>>$base/logs/canal/canal_stdout.log 2>&1 & - echo $! > $base/bin/canal.pid - + $JAVA $JAVA_OPTS $JAVA_DEBUG_OPT $CANAL_OPTS -classpath .:$CLASSPATH cc.smtweb.system.canal.server.CanalLauncher 1>>$base/logs/canal/canal_stdout.log 2>&1 & + echo $! > $base/bin/canal.pid + echo "cd to $current_path for continue" cd $current_path -else +else echo "canal conf("$canal_conf") OR log configration file($logback_configurationFile) is not exist,please create then first!" fi diff --git a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/CanalApplication.java b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalApplication.java similarity index 87% rename from smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/CanalApplication.java rename to smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalApplication.java index 7a644ac..4b4ac86 100644 --- a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/CanalApplication.java +++ b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalApplication.java @@ -1,4 +1,4 @@ -package cc.smtweb.system.canal.server; +package cc.smtweb.system.canal.deployer; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalConfiguration.java b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalConfiguration.java new file mode 100644 index 0000000..5519782 --- /dev/null +++ b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalConfiguration.java @@ -0,0 +1,21 @@ +package cc.smtweb.system.canal.deployer; + +import cc.smtweb.framework.core.mvc.config.ControllerConfig; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; + +/** + * @author kevin + */ +@Configuration +@ComponentScan +public class CanalConfiguration { + /** + * 配置自定义service扫描路径 {module}/{service}/{method} + */ + @Bean + public ControllerConfig canalConfiguration() { + return new ControllerConfig("canalServer", "cc.smtweb.system.canal.server", null); + } +} diff --git a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/CanalConstants.java b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalConstants.java similarity index 99% rename from smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/CanalConstants.java rename to smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalConstants.java index d9a6a48..cc8a1cb 100644 --- a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/CanalConstants.java +++ b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalConstants.java @@ -1,4 +1,4 @@ -package cc.smtweb.system.canal.server; +package cc.smtweb.system.canal.deployer; import java.text.MessageFormat; diff --git a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/CanalController.java b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalController.java similarity index 98% rename from smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/CanalController.java rename to smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalController.java index 75f2339..fde52aa 100644 --- a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/CanalController.java +++ b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalController.java @@ -1,12 +1,12 @@ -package cc.smtweb.system.canal.server; +package cc.smtweb.system.canal.deployer; import java.util.Map; import java.util.Properties; -import cc.smtweb.system.canal.server.monitor.InstanceAction; -import cc.smtweb.system.canal.server.monitor.InstanceConfigMonitor; -import cc.smtweb.system.canal.server.monitor.ManagerInstanceConfigMonitor; -import cc.smtweb.system.canal.server.monitor.SpringInstanceConfigMonitor; +import cc.smtweb.system.canal.deployer.monitor.InstanceAction; +import cc.smtweb.system.canal.deployer.monitor.InstanceConfigMonitor; +import cc.smtweb.system.canal.deployer.monitor.ManagerInstanceConfigMonitor; +import cc.smtweb.system.canal.deployer.monitor.SpringInstanceConfigMonitor; import org.I0Itec.zkclient.IZkStateListener; import org.I0Itec.zkclient.exception.ZkNoNodeException; import org.I0Itec.zkclient.exception.ZkNodeExistsException; @@ -24,7 +24,7 @@ import com.alibaba.otter.canal.common.zookeeper.running.ServerRunningData; import com.alibaba.otter.canal.common.zookeeper.running.ServerRunningListener; import com.alibaba.otter.canal.common.zookeeper.running.ServerRunningMonitor; import com.alibaba.otter.canal.common.zookeeper.running.ServerRunningMonitors; -import cc.smtweb.system.canal.server.InstanceConfig.InstanceMode; +import cc.smtweb.system.canal.deployer.InstanceConfig.InstanceMode; import com.alibaba.otter.canal.instance.core.CanalInstanceGenerator; import com.alibaba.otter.canal.instance.manager.PlainCanalInstanceGenerator; import com.alibaba.otter.canal.instance.manager.plain.PlainCanalConfigClient; diff --git a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/CanalLauncher.java b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalLauncher.java similarity index 99% rename from smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/CanalLauncher.java rename to smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalLauncher.java index e84b6f0..0cba780 100644 --- a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/CanalLauncher.java +++ b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalLauncher.java @@ -1,4 +1,4 @@ -package cc.smtweb.system.canal.server; +package cc.smtweb.system.canal.deployer; import com.alibaba.otter.canal.common.utils.AddressUtils; import com.alibaba.otter.canal.common.utils.NamedThreadFactory; diff --git a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/CanalStartedListener.java b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalStartedListener.java similarity index 95% rename from smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/CanalStartedListener.java rename to smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalStartedListener.java index 4530945..2721d91 100644 --- a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/CanalStartedListener.java +++ b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalStartedListener.java @@ -1,4 +1,4 @@ -package cc.smtweb.system.canal.server; +package cc.smtweb.system.canal.deployer; import cc.smtweb.framework.core.annotation.SwStartListener; import cc.smtweb.framework.core.common.SwConsts; diff --git a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/CanalStarter.java b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalStarter.java similarity index 98% rename from smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/CanalStarter.java rename to smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalStarter.java index 58b6621..f6dfbb0 100644 --- a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/CanalStarter.java +++ b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/CanalStarter.java @@ -1,4 +1,4 @@ -package cc.smtweb.system.canal.server; +package cc.smtweb.system.canal.deployer; import java.util.Properties; @@ -10,7 +10,7 @@ import org.slf4j.LoggerFactory; import com.alibaba.otter.canal.admin.netty.CanalAdminWithNetty; import com.alibaba.otter.canal.connector.core.spi.CanalMQProducer; import com.alibaba.otter.canal.connector.core.spi.ExtensionLoader; -import cc.smtweb.system.canal.server.admin.CanalAdminController; +import cc.smtweb.system.canal.deployer.admin.CanalAdminController; import com.alibaba.otter.canal.server.CanalMQStarter; /** diff --git a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/InstanceConfig.java b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/InstanceConfig.java similarity index 98% rename from smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/InstanceConfig.java rename to smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/InstanceConfig.java index 6775ca9..3fa9c8c 100644 --- a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/InstanceConfig.java +++ b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/InstanceConfig.java @@ -1,4 +1,4 @@ -package cc.smtweb.system.canal.server; +package cc.smtweb.system.canal.deployer; import org.apache.commons.lang.builder.ToStringBuilder; diff --git a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/admin/CanalAdminController.java b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/admin/CanalAdminController.java similarity index 94% rename from smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/admin/CanalAdminController.java rename to smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/admin/CanalAdminController.java index d504621..cc58950 100644 --- a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/admin/CanalAdminController.java +++ b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/admin/CanalAdminController.java @@ -1,4 +1,4 @@ -package cc.smtweb.system.canal.server.admin; +package cc.smtweb.system.canal.deployer.admin; import java.io.File; import java.security.NoSuchAlgorithmException; @@ -8,11 +8,11 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import cc.smtweb.system.canal.server.CanalStarter; -import cc.smtweb.system.canal.server.monitor.InstanceConfigMonitor; -import cc.smtweb.system.canal.server.monitor.ManagerInstanceConfigMonitor; -import cc.smtweb.system.canal.server.monitor.SpringInstanceConfigMonitor; -import cc.smtweb.system.canal.server.monitor.InstanceAction; +import cc.smtweb.system.canal.deployer.CanalStarter; +import cc.smtweb.system.canal.deployer.monitor.InstanceConfigMonitor; +import cc.smtweb.system.canal.deployer.monitor.ManagerInstanceConfigMonitor; +import cc.smtweb.system.canal.deployer.monitor.SpringInstanceConfigMonitor; +import cc.smtweb.system.canal.deployer.monitor.InstanceAction; import org.apache.commons.io.filefilter.TrueFileFilter; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; @@ -20,7 +20,7 @@ import org.slf4j.LoggerFactory; import com.alibaba.otter.canal.admin.CanalAdmin; import com.alibaba.otter.canal.common.utils.FileUtils; -import cc.smtweb.system.canal.server.InstanceConfig; +import cc.smtweb.system.canal.deployer.InstanceConfig; import com.alibaba.otter.canal.instance.core.CanalInstance; import com.alibaba.otter.canal.protocol.SecurityUtil; import com.alibaba.otter.canal.server.embedded.CanalServerWithEmbedded; diff --git a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/monitor/InstanceAction.java b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/monitor/InstanceAction.java similarity index 91% rename from smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/monitor/InstanceAction.java rename to smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/monitor/InstanceAction.java index f1ed700..7354a3d 100644 --- a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/monitor/InstanceAction.java +++ b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/monitor/InstanceAction.java @@ -1,4 +1,4 @@ -package cc.smtweb.system.canal.server.monitor; +package cc.smtweb.system.canal.deployer.monitor; /** * config配置变化 diff --git a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/monitor/InstanceConfigMonitor.java b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/monitor/InstanceConfigMonitor.java similarity index 88% rename from smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/monitor/InstanceConfigMonitor.java rename to smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/monitor/InstanceConfigMonitor.java index 702a2b9..cdc3852 100644 --- a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/monitor/InstanceConfigMonitor.java +++ b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/monitor/InstanceConfigMonitor.java @@ -1,4 +1,4 @@ -package cc.smtweb.system.canal.server.monitor; +package cc.smtweb.system.canal.deployer.monitor; import com.alibaba.otter.canal.common.CanalLifeCycle; diff --git a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/monitor/ManagerInstanceConfigMonitor.java b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/monitor/ManagerInstanceConfigMonitor.java similarity index 99% rename from smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/monitor/ManagerInstanceConfigMonitor.java rename to smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/monitor/ManagerInstanceConfigMonitor.java index d0aa043..ca413fa 100644 --- a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/monitor/ManagerInstanceConfigMonitor.java +++ b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/monitor/ManagerInstanceConfigMonitor.java @@ -1,4 +1,4 @@ -package cc.smtweb.system.canal.server.monitor; +package cc.smtweb.system.canal.deployer.monitor; import java.util.ArrayList; import java.util.List; diff --git a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/monitor/SpringInstanceConfigMonitor.java b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/monitor/SpringInstanceConfigMonitor.java similarity index 99% rename from smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/monitor/SpringInstanceConfigMonitor.java rename to smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/monitor/SpringInstanceConfigMonitor.java index 83a2b13..9d63a5c 100644 --- a/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/server/monitor/SpringInstanceConfigMonitor.java +++ b/smtweb-framework/canal/server/src/main/java/cc/smtweb/system/canal/deployer/monitor/SpringInstanceConfigMonitor.java @@ -1,4 +1,4 @@ -package cc.smtweb.system.canal.server.monitor; +package cc.smtweb.system.canal.deployer.monitor; import java.io.File; import java.util.ArrayList; diff --git a/smtweb-framework/canal/server/src/main/resources/META-INF/spring.factories b/smtweb-framework/canal/server/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..a599c24 --- /dev/null +++ b/smtweb-framework/canal/server/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ + cc.smtweb.system.canal.deployer.CanalConfiguration diff --git a/smtweb-framework/canal/server/src/main/resources/canal.properties b/smtweb-framework/canal/server/src/main/resources/canal.properties index 82992bc..5994072 100644 --- a/smtweb-framework/canal/server/src/main/resources/canal.properties +++ b/smtweb-framework/canal/server/src/main/resources/canal.properties @@ -1,17 +1,19 @@ ################################################# ######### common argument ############# ################################################# -# tcp bind ip +# 服务端IP 可以为空 canal.ip = -# register ip to zookeeper -canal.register.ip = +# 服务端口 canal.port = 11111 canal.metrics.pull.port = 11112 -# canal instance user/passwd +# 服务用户名，密码，可以为空 # canal.user = canal # canal.passwd = E3619321C1A937C46A0D8BD1DAC39F93B27D4458 -# canal admin config + +#######后面的配置不用管####### +canal.register.ip = +#canal admin config #canal.admin.manager = 127.0.0.1:8089 canal.admin.port = 11110 canal.admin.user = admin @@ -161,7 +163,7 @@ rocketmq.namespace = rocketmq.namesrv.addr = 127.0.0.1:9876 rocketmq.retry.times.when.send.failed = 0 rocketmq.vip.channel.enabled = false -rocketmq.tag = +rocketmq.tag = ################################################## ######### RabbitMQ ############# @@ -179,4 +181,4 @@ rabbitmq.deliveryMode = ################################################## pulsarmq.serverUrl = pulsarmq.roleToken = -pulsarmq.topicTenantPrefix = \ No newline at end of file +pulsarmq.topicTenantPrefix = diff --git a/smtweb-framework/canal/server/src/main/resources/example/instance.properties b/smtweb-framework/canal/server/src/main/resources/example/instance.properties index 7a1f752..1930760 100644 --- a/smtweb-framework/canal/server/src/main/resources/example/instance.properties +++ b/smtweb-framework/canal/server/src/main/resources/example/instance.properties @@ -1,11 +1,11 @@ ################################################# ## mysql serverId , v1.0.26+ will autoGen +# 从库ID 必须和主库不一致，多重库也不一致 canal.instance.mysql.slaveId=2 - # enable gtid use true/false canal.instance.gtidon=false - -# position info +# 主库信息 +# 主库地址及端口 canal.instance.master.address=172.28.123.25:3306 #canal.instance.master.journal.name= #canal.instance.master.position= @@ -22,7 +22,6 @@ canal.instance.tsdb.enable=true #canal.instance.tsdb.url=jdbc:mysql://127.0.0.1:3306/canal_tsdb #canal.instance.tsdb.dbUsername=canal #canal.instance.tsdb.dbPassword=canal - #canal.instance.standby.address = #canal.instance.standby.journal.name = #canal.instance.standby.position = diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/systask/SysServiceFactory.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/systask/SysServiceFactory.java index c90f6f8..5779b0b 100644 --- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/systask/SysServiceFactory.java +++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/systask/SysServiceFactory.java @@ -29,7 +29,7 @@ public class SysServiceFactory { private List listService = new ArrayList<>(); public SysServiceFactory() { - + } //注册任务 @@ -53,6 +53,6 @@ public class SysServiceFactory { //停止任务 public void stop() { - schedule.shutdown(); + if (schedule != null) schedule.shutdown(); } } diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/systask/SysThreadPool.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/systask/SysThreadPool.java index 0e8df2c..80291c0 100644 --- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/systask/SysThreadPool.java +++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/systask/SysThreadPool.java @@ -38,7 +38,7 @@ public class SysThreadPool { SecurityManager s = System.getSecurityManager(); group = (s != null) ? s.getThreadGroup() : Thread.currentThread().getThreadGroup(); - namePrefix = "DfpPool-" + + namePrefix = "SysPool-" + poolNumber.getAndIncrement() + "-Thread-"; } @@ -63,14 +63,14 @@ public class SysThreadPool { } try { threadPool.execute(worker); - log.debug("add task to DfpPool success -> [PoolSize：" + threadPool.getPoolSize() + "，ActiveCount：" + threadPool.getActiveCount() + "，CompletedTaskCount：" + threadPool.getCompletedTaskCount() + "]"); + log.debug("add task to SysPool success -> [PoolSize：" + threadPool.getPoolSize() + "，ActiveCount：" + threadPool.getActiveCount() + "，CompletedTaskCount：" + threadPool.getCompletedTaskCount() + "]"); } catch (Exception e) { - log.debug("add task to DfpPool pools error：", e); + log.debug("add task to SysPool pools error：", e); } } //停止任务 - protected void stop() { + public void stop() { if (threadPool != null) threadPool.shutdown(); } diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/systask/SysThreadWorker.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/systask/SysThreadWorker.java index 8d84183..903a80b 100644 --- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/systask/SysThreadWorker.java +++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/systask/SysThreadWorker.java @@ -23,7 +23,7 @@ public abstract class SysThreadWorker implements Runnable { try { localWork(); } catch (Exception e) { - log.error("DfpPool handle error：", e); + log.error("SysPool handle error：", e); } }