add 1

acs/nladmin-system/pom.xml

@@ -66,6 +66,12 @@
             <groupId>org.openscada.utgard</groupId>
             <artifactId>org.openscada.opc.lib</artifactId>
             <version>1.5.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcprov-jdk15on</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>

lms/nladmin-system/nlsso-server/pom.xml

@@ -33,16 +33,32 @@
     </properties>
 
     <dependencies>
+
+<!--        控制台高亮-->
+        <dependency>
+            <groupId>org.fusesource.jansi</groupId>
+            <artifactId>jansi</artifactId>
+            <version>1.17.1</version>
+        </dependency>
+
+
         <dependency>
             <groupId>org.dromara.dynamictp</groupId>
             <artifactId>dynamic-tp-spring-boot-starter-common</artifactId>
             <version>1.1.6.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>cn.hutool</groupId>
+                    <artifactId>hutool-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.dromara.dynamictp</groupId>
             <artifactId>dynamic-tp-spring-boot-starter-adapter-webserver</artifactId>
             <version>1.1.6.1</version>
         </dependency>
+
         <!--        日志链路追踪 https://tlog.yomahub.com/pages/f62a84/#%E5%90%8C%E6%AD%A5%E6%97%A5%E5%BF%97-->
         <dependency>
             <groupId>com.yomahub</groupId>

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;
-    }
+    
 
     /**
      * 访问首页提示

lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/TestCollector.java

@@ -11,8 +11,10 @@ import org.dromara.dynamictp.core.monitor.collector.AbstractCollector;
 public class TestCollector extends AbstractCollector {
     @Override
     public void collect(ThreadPoolStats threadPoolStats) {
+        if (threadPoolStats.getPoolName().equals("el-thread")) {
             System.out.println("ssssssssssssssss:" + threadPoolStats);
         }
+    }
 
     @Override
     public String type() {

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()
         );
     }

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;

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 {

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<String, Object> PressedMonitor() {
-        ThreadPoolExecutor pool = ThreadPoolExecutorUtil.getPoll();
         ConcurrentHashMap<String, Object> map = new ConcurrentHashMap<>();
         // 1、当前班次、计划生产、已生产、不合格产品数
         // 白班、晚班

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 #初始化时建立物理连接的个数

lms/nladmin-system/nlsso-server/src/main/resources/log/XgAgvDeviceDriver.xml

@@ -23,12 +23,12 @@
 
     </appender>
 
-    <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
+    <!--  <logger name="org.nl.start.Init" level="info" additivity="true">
           <appender-ref ref="FILE3"/>
       </logger>-->
 
     <!-- 打印sql -->
-    <logger name="org.nl.system.service.lucene.impl.LuceneExecuteLogServiceImpl" level="info" additivity="false">
+    <logger name="org.nl.system.service.lucene.impl.LuceneExecuteLogServiceImpl" level="info" additivity="true">
         <appender-ref ref="FILE_XGAGV"/>
     </logger>
 </included>

lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml

@@ -21,7 +21,9 @@ https://juejin.cn/post/6844903775631572999
     <include resource="log/XgAgvDeviceDriver.xml"/>
 
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
+        <!--withJansi 参数改为true-->
+        <withJansi>true</withJansi>
+        <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
             <pattern>${log.pattern}</pattern>
            <!-- <charset>${log.charset}</charset>-->
         </encoder>
@@ -61,7 +63,7 @@ https://juejin.cn/post/6844903775631572999
     </appender>
 
     <!--异步到文件-->
-    <appender name="asyncFileAppender" class="ch.qos.logback.classic.AsyncAppender">
+    <appender name="asyncFileAppender" class="com.yomahub.tlog.core.enhance.logback.async.AspectLogbackAsyncAppender">
         <discardingThreshold>0</discardingThreshold>
         <queueSize>500</queueSize>
         <appender-ref ref="FILE"/>
@@ -73,58 +75,58 @@ https://juejin.cn/post/6844903775631572999
             <appender-ref ref="asyncFileAppender"/>
             <appender-ref ref="asyncLuceneAppender"/>
         </root>
-        <logger name="org.springframework" level="ERROR" additivity="false">
+        <logger name="org.springframework" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="com.baomidou.dynamic.datasource.DynamicRoutingDataSource" level="INFO" additivity="false">
+        <logger name="com.baomidou.dynamic.datasource.DynamicRoutingDataSource" level="INFO" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="org.redisson.connection.pool.MasterPubSubConnectionPool" level="INFO" additivity="false">
+        <logger name="org.redisson.connection.pool.MasterPubSubConnectionPool" level="INFO" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="org.redisson.connection.pool.MasterConnectionPool" level="INFO" additivity="false">
+        <logger name="org.redisson.connection.pool.MasterConnectionPool" level="INFO" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="org.redisson.Version" level="INFO" additivity="false">
+        <logger name="org.redisson.Version" level="INFO" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="com.alibaba.druid.pool.DruidDataSource" level="INFO" additivity="false">
+        <logger name="com.alibaba.druid.pool.DruidDataSource" level="INFO" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="org.nl.config.RedisConfig" level="INFO" additivity="false">
+        <logger name="org.nl.config.RedisConfig" level="INFO" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="org.apache" level="ERROR" additivity="false">
+        <logger name="org.apache" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="org.hibernate" level="ERROR" additivity="false">
+        <logger name="org.hibernate" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="io.netty" level="ERROR" additivity="false">
+        <logger name="io.netty" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="jdbc" level="ERROR" additivity="false">
+        <logger name="jdbc" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="io.lettuce" level="ERROR" additivity="false">
+        <logger name="io.lettuce" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="com.fasterxml" level="ERROR" additivity="false">
+        <logger name="com.fasterxml" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="org.quartz" level="ERROR" additivity="false">
+        <logger name="org.quartz" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="com.google" level="ERROR" additivity="false">
+        <logger name="com.google" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="springfox" level="ERROR" additivity="false">
+        <logger name="springfox" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="log4jdbc" level="ERROR" additivity="false">
+        <logger name="log4jdbc" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="nl.basjes" level="ERROR" additivity="false">
+        <logger name="nl.basjes" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
     </springProfile>
@@ -136,40 +138,40 @@ https://juejin.cn/post/6844903775631572999
             <appender-ref ref="asyncFileAppender"/>
             <appender-ref ref="asyncLuceneAppender"/>
         </root>
-        <logger name="org.springframework" level="ERROR" additivity="false">
+        <logger name="org.springframework" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
-        <logger name="org.apache" level="ERROR" additivity="false">
+        <logger name="org.apache" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
-        <logger name="org.hibernate" level="ERROR" additivity="false">
+        <logger name="org.hibernate" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
-        <logger name="io.netty" level="ERROR" additivity="false">
+        <logger name="io.netty" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
-        <logger name="jdbc" level="ERROR" additivity="false">
+        <logger name="jdbc" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
-        <logger name="io.lettuce" level="ERROR" additivity="false">
+        <logger name="io.lettuce" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
-        <logger name="com.fasterxml" level="ERROR" additivity="false">
+        <logger name="com.fasterxml" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
-        <logger name="org.quartz" level="ERROR" additivity="false">
+        <logger name="org.quartz" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
-        <logger name="com.google" level="ERROR" additivity="false">
+        <logger name="com.google" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
-        <logger name="springfox" level="ERROR" additivity="false">
+        <logger name="springfox" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
-        <logger name="log4jdbc" level="ERROR" additivity="false">
+        <logger name="log4jdbc" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
-        <logger name="nl.basjes" level="ERROR" additivity="false">
+        <logger name="nl.basjes" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
     </springProfile>
@@ -180,19 +182,19 @@ https://juejin.cn/post/6844903775631572999
         <root level="INFO">
             <appender-ref ref="asyncFileAppender"/>
         </root>
-        <logger name="jdbc.audit" level="ERROR" additivity="false">
+        <logger name="jdbc.audit" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="jdbc.resultset" level="ERROR" additivity="false">
+        <logger name="jdbc.resultset" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="springfox.documentation" level="ERROR" additivity="false">
+        <logger name="springfox.documentation" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="jdbc.resultsettable" level="ERROR" additivity="false">
+        <logger name="jdbc.resultsettable" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="jdbc.sqlonly" level="ERROR" additivity="false">
+        <logger name="jdbc.sqlonly" level="ERROR" additivity="true">
             <appender-ref ref="CONSOLE"/>
         </logger>
     </springProfile>