diff --git a/acs/nladmin-system/pom.xml b/acs/nladmin-system/pom.xml index 2095112..0a1f1db 100644 --- a/acs/nladmin-system/pom.xml +++ b/acs/nladmin-system/pom.xml @@ -66,6 +66,12 @@ org.openscada.utgard org.openscada.opc.lib 1.5.0 + + + org.bouncycastle + bcprov-jdk15on + + com.squareup.okhttp3 diff --git a/lms/nladmin-system/nlsso-server/pom.xml b/lms/nladmin-system/nlsso-server/pom.xml index 5bca905..4737bde 100644 --- a/lms/nladmin-system/nlsso-server/pom.xml +++ b/lms/nladmin-system/nlsso-server/pom.xml @@ -33,16 +33,32 @@ + + + + org.fusesource.jansi + jansi + 1.17.1 + + + org.dromara.dynamictp dynamic-tp-spring-boot-starter-common 1.1.6.1 + + + cn.hutool + hutool-core + + org.dromara.dynamictp dynamic-tp-spring-boot-starter-adapter-webserver 1.1.6.1 + com.yomahub diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java index 7662a87..a119464 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java @@ -3,7 +3,7 @@ package org.nl; import cn.dev33.satoken.annotation.SaIgnore; import com.alicp.jetcache.anno.config.EnableCreateCacheAnnotation; import com.alicp.jetcache.anno.config.EnableMethodCache; -import io.swagger.annotations.Api; +import org.dromara.dynamictp.core.spring.EnableDynamicTp; import org.mybatis.spring.annotation.MapperScan; import org.nl.common.annotation.Limit; import org.nl.config.SpringContextHolder; @@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.RestController; */ @EnableAsync @RestController -@Api(hidden = true) +@EnableDynamicTp @SpringBootApplication(exclude = { org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class }) @@ -48,12 +48,7 @@ public class AppRun { return new SpringContextHolder(); } - @Bean - public ServletWebServerFactory webServerFactory() { - TomcatServletWebServerFactory fa = new TomcatServletWebServerFactory(); - fa.addConnectorCustomizers(connector -> connector.setProperty("relaxedQueryChars", "[]{}")); - return fa; - } + /** * 访问首页提示 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/TestCollector.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/TestCollector.java index f6c0900..c919f76 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/TestCollector.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/TestCollector.java @@ -11,7 +11,9 @@ import org.dromara.dynamictp.core.monitor.collector.AbstractCollector; public class TestCollector extends AbstractCollector { @Override public void collect(ThreadPoolStats threadPoolStats) { - System.out.println("ssssssssssssssss:" + threadPoolStats); + if (threadPoolStats.getPoolName().equals("el-thread")) { + System.out.println("ssssssssssssssss:" + threadPoolStats); + } } @Override diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/ThreadPoolExecutorUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/ThreadPoolExecutorUtil.java index 334d20f..d73c7fb 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/ThreadPoolExecutorUtil.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/ThreadPoolExecutorUtil.java @@ -16,7 +16,12 @@ package org.nl.config.thread; +import org.dromara.dynamictp.core.support.DynamicTp; import org.nl.config.SpringContextHolder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; @@ -28,16 +33,22 @@ import java.util.concurrent.TimeUnit; * @author Zheng Jie * @date 2019年10月31日18:16:47 */ +@Configuration public class ThreadPoolExecutorUtil { - public static ThreadPoolExecutor getPoll() { - AsyncTaskProperties properties = SpringContextHolder.getBean(AsyncTaskProperties.class); + @Autowired + private AsyncTaskProperties asyncTaskProperties; + + @Bean + @Primary + @DynamicTp("el-thread") + public ThreadPoolExecutor threadPoolExecutor() { return new ThreadPoolExecutor( - properties.getCorePoolSize(), - properties.getMaxPoolSize(), - properties.getKeepAliveSeconds(), + asyncTaskProperties.getCorePoolSize(), + asyncTaskProperties.getMaxPoolSize(), + asyncTaskProperties.getKeepAliveSeconds(), TimeUnit.SECONDS, - new ArrayBlockingQueue<>(properties.getQueueCapacity()), + new ArrayBlockingQueue<>(asyncTaskProperties.getQueueCapacity()), new TheadFactoryName() ); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java index b94a635..2d11215 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java @@ -34,7 +34,6 @@ import java.util.concurrent.TimeUnit; @Slf4j @RestController @RequestMapping("/auth") - public class AuthorizationController { @Autowired private RedisUtils redisUtils; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/ExecutionJob.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/ExecutionJob.java index 50fe912..9faf0da 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/ExecutionJob.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/ExecutionJob.java @@ -15,6 +15,8 @@ import org.nl.system.service.quartz.impl.SysQuartzJobServiceImpl; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.quartz.QuartzJobBean; @@ -35,7 +37,9 @@ public class ExecutionJob extends QuartzJobBean { /** * 该处仅供参考 */ - private final static ThreadPoolExecutor EXECUTOR = ThreadPoolExecutorUtil.getPoll(); + @Autowired + @Qualifier("threadPoolExecutor") + private ThreadPoolExecutor EXECUTOR; @Override protected void executeInternal(JobExecutionContext context) throws JobExecutionException { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java index f4abece..354b428 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java @@ -1,7 +1,6 @@ package org.nl.wms.cockpit.service.impl; import lombok.extern.slf4j.Slf4j; -import org.nl.config.thread.ThreadPoolExecutorUtil; import org.nl.wms.cockpit.service.CockpitService; import org.nl.wms.cockpit.service.dao.MonthlyWorkOrderVo; import org.nl.wms.cockpit.service.dao.PressProductHeaderVo; @@ -10,6 +9,7 @@ import org.nl.wms.cockpit.service.dao.ShiftProductionVo; import org.nl.wms.cockpit.service.mapper.CockPitMapper; import org.nl.wms.util.CommonUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import java.util.List; @@ -28,9 +28,12 @@ public class CockpitServiceImpl implements CockpitService { @Autowired private CockPitMapper cockPitMapper; + @Autowired + @Qualifier("threadPoolExecutor") + private ThreadPoolExecutor pool; + @Override public ConcurrentHashMap PressedMonitor() { - ThreadPoolExecutor pool = ThreadPoolExecutorUtil.getPoll(); ConcurrentHashMap map = new ConcurrentHashMap<>(); // 1、当前班次、计划生产、已生产、不合格产品数 // 白班、晚班 diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml index 0a90fc4..21303f4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml +++ b/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml @@ -5,77 +5,14 @@ spring: enabledCollect: true # 是否开启监控指标采集，默认true collectorTypes: logging,test_collect # 监控数据采集器类型（logging | micrometer | internal_logging），默认micrometer logPath: C:\log\lms # 监控日志数据路径，默认 ${user.home}/logs，采集类型非logging不用配置 - monitorInterval: 5 - executors: # 动态线程池配置，都有默认值，采用默认值的可以不配置该项，减少配置量 - - threadPoolName: el-thread - threadPoolAliasName: 测试线程池 # 线程池别名 - executorType: common # 线程池类型 common、eager、ordered、scheduled，默认 common - corePoolSize: 6 # 核心线程数，默认1 - maximumPoolSize: 8 # 最大线程数，默认cpu核数 - queueCapacity: 2000 # 队列容量，默认1024 - queueType: VariableLinkedBlockingQueue # 任务队列，查看源码QueueTypeEnum枚举类，默认VariableLinkedBlockingQueue - rejectedHandlerType: CallerRunsPolicy # 拒绝策略，查看RejectedTypeEnum枚举类，默认AbortPolicy - keepAliveTime: 60 # 空闲线程等待超时时间，默认60 - threadNamePrefix: el-pool # 线程名前缀，默认dtp - allowCoreThreadTimeOut: false # 是否允许核心线程池超时，默认false - waitForTasksToCompleteOnShutdown: true # 参考spring线程池设计，优雅关闭线程池，默认false - awaitTerminationSeconds: 5 # 优雅关闭线程池时，阻塞等待线程池中任务执行时间，默认0，单位（s） - preStartAllCoreThreads: false # 是否预热所有核心线程，默认false - runTimeout: 200 # 任务执行超时阈值，目前只做告警用，单位（ms），默认0 - queueTimeout: 100 # 任务在队列等待超时阈值，目前只做告警用，单位（ms），默认0 - taskWrapperNames: [ "ttl", "mdc" ] # 任务包装器名称，继承TaskWrapper接口 - notifyEnabled: true # 是否开启报警，默认true - notifyItems: # 报警项，不配置自动会按默认值配置（变更通知、容量报警、活性报警、拒绝报警、任务超时报警） - - type: change - enabled: true - - type: capacity # 队列容量使用率，报警项类型，查看源码 NotifyTypeEnum枚举类 - enabled: true - threshold: 80 # 报警阈值，默认70，意思是队列使用率达到70%告警 - interval: 120 # 报警间隔（单位：s），默认120 - - type: liveness # 线程池活性 - enabled: true - threshold: 80 # 报警阈值，默认 70，意思是活性达到70%告警 - - type: reject # 触发任务拒绝告警 - enabled: true - threshold: 100 # 默认阈值10 - - type: run_timeout # 任务执行超时告警 - enabled: true - threshold: 100 # 默认阈值10 - - type: queue_timeout # 任务排队超时告警 - enabled: true - threshold: 100 # 默认阈值10 - tomcat-tp: - threadPoolName: tomcatTp + monitorInterval: 8 + tomcatTp: # tomcat webserver 线程池配置 threadPoolAliasName: tomcat 线程池 # 线程池别名，可选 corePoolSize: 100 maximumPoolSize: 200 keepAliveTime: 60 runTimeout: 200 queueTimeout: 100 - notifyItems: # 报警项，不配置自动会按默认值配置（变更通知、容量报警、活性报警、拒绝报警、任务超时报警） - - type: change - enabled: true - - - type: capacity # 队列容量使用率，报警项类型，查看源码 NotifyTypeEnum枚举类 - enabled: true - threshold: 80 # 报警阈值，默认70，意思是队列使用率达到70%告警 - interval: 120 # 报警间隔（单位：s），默认120 - - - type: liveness # 线程池活性 - enabled: true - threshold: 80 # 报警阈值，默认 70，意思是活性达到70%告警 - - - type: reject # 触发任务拒绝告警 - enabled: true - threshold: 100 # 默认阈值10 - - - type: run_timeout # 任务执行超时告警 - enabled: true - threshold: 100 # 默认阈值10 - - - type: queue_timeout # 任务排队超时告警 - enabled: true - threshold: 100 datasource: druid: initial-size: 5 #初始化时建立物理连接的个数 diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/log/XgAgvDeviceDriver.xml b/lms/nladmin-system/nlsso-server/src/main/resources/log/XgAgvDeviceDriver.xml index c805802..b1c296c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/log/XgAgvDeviceDriver.xml +++ b/lms/nladmin-system/nlsso-server/src/main/resources/log/XgAgvDeviceDriver.xml @@ -23,12 +23,12 @@ - - + diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml index dfb520e..c27d02c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml +++ b/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml @@ -21,7 +21,9 @@ https://juejin.cn/post/6844903775631572999 - + + true + ${log.pattern} @@ -61,7 +63,7 @@ https://juejin.cn/post/6844903775631572999 - + 0 500 @@ -73,58 +75,58 @@ https://juejin.cn/post/6844903775631572999 - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -136,40 +138,40 @@ https://juejin.cn/post/6844903775631572999 - + - + - + - + - + - + - + - + - + - + - + - + @@ -180,19 +182,19 @@ https://juejin.cn/post/6844903775631572999 - + - + - + - + - +