fix: 完善升级到2.0.3

binfast-archetype-light/src/main/resources/archetype-resources/admin/pom.xml

@@ -24,10 +24,6 @@
             <groupId>top.binfast</groupId>
             <artifactId>daemon-codegen</artifactId>
         </dependency>
-        <dependency>
-            <groupId>top.binfast</groupId>
-            <artifactId>common-crypto</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
@@ -51,7 +47,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12.4</version>
+                <version>${maven-surefire-plugin.version}</version>
                 <configuration>
                     <skipTests>true</skipTests>
                 </configuration>

binfast-archetype-light/src/main/resources/archetype-resources/admin/src/main/java/config/CorsConfig.java

-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-package ${package}.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-//@Profile("dev")
-//@Configuration(proxyBeanMethods = false)
-public class CorsConfig implements WebMvcConfigurer {
-    @Override
-    public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/**")
-                .allowedOriginPatterns("*")
-                .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
-                .allowedHeaders("*")
-                .allowCredentials(true)
-                .maxAge(3600);
-    }
-}
\ No newline at end of file

binfast-archetype-light/src/main/resources/archetype-resources/admin/src/main/resources/application-dev.yml

 spring:
   datasource:
     dynamic:
-      # 性能分析插件(有性能损耗 不建议生产环境使用)
-      p6spy: true
       primary: master
       strict: false
       datasource:
@@ -28,6 +26,14 @@ logging:
     org.apache.fury: warn
   config: classpath:logback-spring-dev.xml
 
+--- # MyBatis Plus 配置
+mybatis-plus:
+  sql-log:
+    # 完整 SQL 输出开关
+    enabled: true
+    # 输出方式，可选 console、log
+    output: console
+
 springdoc:
   api-docs:
     # 是否开启接口文档

binfast-archetype-light/src/main/resources/archetype-resources/admin/src/main/resources/application.yml

@@ -4,20 +4,12 @@ server:
     context-path: /api
   # 开启优雅停机，默认值：immediate 为立即关闭
   shutdown: graceful
-  # undertow 配置
-  undertow:
+  # Tomcat 配置
+  tomcat:
     # HTTP post内容的最大大小。当值为-1时，默认值为大小是无限的
-    max-http-post-size: -1
-    # 以下的配置会影响buffer,这些buffer会用于服务器连接的IO操作,有点类似netty的池化内存管理
-    # 每块buffer的空间大小,越小的空间被利用越充分
-    buffer-size: 512
-    # 是否分配的直接内存
-    direct-buffers: true
+    max-http-form-post-size: -1
     threads:
-      # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程
-      io: 8
-      # 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载
-      worker: 256
+      max: 200
 
 spring:
   profiles:
@@ -43,8 +35,15 @@ spring:
       # 设置总上传的文件大小
       max-request-size: 20MB
   jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
+    serialization:
+      # 格式化输出
+      indent_output: false
+      # 忽略无法转换的对象
+      fail_on_empty_beans: false
+    deserialization:
+      # 允许对象忽略json中不存在的属性
+      fail_on_unknown_properties: false
   #缓存配置
   cache:
     type: redis
@@ -54,6 +53,10 @@ spring:
 #    redisson:
 #      config: classpath:redisson.yml
 
+binfast:
+  admin:
+    enabled: true
+
 # 用户配置
 user:
   password:
@@ -89,6 +92,11 @@ mybatis-plus:
       # 默认数据库表下划线命名
       table-underline: true
 
+# mybaits-plus-join配置
+mybatis-plus-join:
+  #是否打印 mybatis plus join banner 默认true
+  banner: false
+
 # Sa-Token配置
 sa-token:
   # token名称 (同时也是cookie名称)
@@ -160,23 +168,6 @@ security:
     rsaPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArEdFkBHeQw7Fwt93IbTUFCFt5nAP+TrfUrjVQ61jm3mytouDlFqHlNY6KS9LK7XWRJja8pghW3wQp+6eC0E6xUIT0+JQQAweoPpursAWvfalkzVt2XLqbP1+ldEMapEo1Qgnmkf2EaKoJFBSB05BcchbN522RRgF1J8q0G+lOQapM3CYQeeMwC+juEeo8QAqUJlQU9OoIzlg/2rF3NIGb7+dmJCKNW8DDAI8HRXx5AEZ+NOFmjyD5+nm19OxM8rSsqHiGV2hvf0tf35ooSkQDsvxfmahJZyYwVUd4heCpIhY0jFTPGO5quoXGiwhlhkwftKmTmj3Dp1sVuMOnZH12wIDAQAB
     aesKey: 1NGHsHvI8LHtF60HI5Bqcg==
 
-easy-trans:
-  #启用redis缓存 如果不用redis请设置为false
-  is-enable-redis: true
-  #启用全局翻译(拦截所有responseBody进行自动翻译)，如果对于性能要求很高可关闭此配置在方法上使用注解翻译
-  is-enable-global: false
-  #启用平铺模式 手动翻译无效
-  is-enable-tile: true
-  #字典缓存放到redis 微服务模式请开启
-  dict-use-redis: true
-  #使用@RpcTrans来标记哪些类可以进行RPC翻译，默认为关闭，多团队协作推荐开启
-  is-enable-custom-rpc: false
-  # ruoyi相关的框架请开启
-  is-enable-map-result: false
-  # 反向翻译数据库类型 mysql
-  db-type: mysql
-  # Mybatis-plus 为 3.5.3.2版本以上的3.x 版本请设置为true
-  mp-new: true
 dict:
   basePackages:
     - top.binfast.app.admin.services
@@ -191,21 +182,34 @@ captcha:
   # 验证码类型 math 数组计算 char 字符验证
   type: MATH
   # line 线段干扰 circle 圆圈干扰 shear 扭曲干扰
-  category: CIRCLE
+  category: SHEAR
   # 数字验证码位数
   numberLength: 1
   # 字符验证码长度
   charLength: 4
 
---- # 默认/推荐使用sse推送
-sse:
+--- # 统一消息推送配置
+message:
   enabled: true
-  path: /resource/sse
+  # sse / websocket
+  transport: sse
+  # 统一访问路径
+  path: /resource/message
+  # websocket 允许的跨域来源
+  allowedOrigins: '*'
+  # SSE 连接超时时间，单位毫秒
+  sse-timeout: 86400000
+  # 本地连接心跳检测间隔，单位秒
+  heartbeat-interval: 60
+  # WebSocket 单次发送超时时间，单位毫秒
+  web-socket-send-time-limit: 10000
+  # WebSocket 发送缓冲区大小
+  web-socket-buffer-size-limit: 64000
 
 --- # warm-flow工作流配置
 warm-flow:
   # 是否开启工作流，默认true
-  enabled: true
+  enabled: false
   # 是否显示banner图，默认是
   banner: false
   # 是否开启设计器ui
@@ -221,12 +225,27 @@ warm-flow:
   # 默认Authorization，如果有多个token，用逗号分隔
   token-name: ${sa-token.token-name},clientid
 
+--- # LiteFlow 业务规则编排
+liteflow:
+  # 跟随工作流模块开关，避免禁用工作流时仍加载任务办理链
+  enable: ${warm-flow.enabled:true}
+  metrics:
+    # 指标自动配置使用独立开关，需同步关闭以避免初始化未启用的 LiteFlow
+    enabled: ${liteflow.enable:true}
+  # 工作流模块用于编排任务办理链路
+  rule-source: classpath:liteflow/*.el.xml
+  # 开启虚拟线程
+  enable-virtual-thread: true
+  #liteflow的banner打印是否开启，默认为true
+  print-banner: false
+
+
 # api接口加密
 api-decrypt:
   # 是否开启全局接口加密
   enabled: true
   # AES 加密头标识
-  headerFlag: crypto-key
+  headerFlag: encrypt-key
   # 响应加密公钥 非对称算法的公私钥 如：SM2，RSA 使用者请自行更换
   # 对应前端解密私钥 MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAmc3CuPiGL/LcIIm7zryCEIbl1SPzBkr75E2VMtxegyZ1lYRD+7TZGAPkvIsBcaMs6Nsy0L78n2qh+lIZMpLH8wIDAQABAkEAk82Mhz0tlv6IVCyIcw/s3f0E+WLmtPFyR9/WtV3Y5aaejUkU60JpX4m5xNR2VaqOLTZAYjW8Wy0aXr3zYIhhQQIhAMfqR9oFdYw1J9SsNc+CrhugAvKTi0+BF6VoL6psWhvbAiEAxPPNTmrkmrXwdm/pQQu3UOQmc2vCZ5tiKpW10CgJi8kCIFGkL6utxw93Ncj4exE/gPLvKcT+1Emnoox+O9kRXss5AiAMtYLJDaLEzPrAWcZeeSgSIzbL+ecokmFKSDDcRske6QIgSMkHedwND1olF8vlKsJUGK3BcdtM8w4Xq7BpSBwsloE=
   publicKey: MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAmc3CuPiGL/LcIIm7zryCEIbl1SPzBkr75E2VMtxegyZ1lYRD+7TZGAPkvIsBcaMs6Nsy0L78n2qh+lIZMpLH8wIDAQABAkEAk82Mhz0tlv6IVCyIcw/s3f0E+WLmtPFyR9/WtV3Y5aaejUkU60JpX4m5xNR2VaqOLTZAYjW8Wy0aXr3zYIhhQQIhAMfqR9oFdYw1J9SsNc+CrhugAvKTi0+BF6VoL6psWhvbAiEAxPPNTmrkmrXwdm/pQQu3UOQmc2vCZ5tiKpW10CgJi8kCIFGkL6utxw93Ncj4exE/gPLvKcT+1Emnoox+O9kRXss5AiAMtYLJDaLEzPrAWcZeeSgSIzbL+ecokmFKSDDcRske6QIgSMkHedwND1olF8vlKsJUGK3BcdtM8w4Xq7BpSBwsloE=

binfast-archetype-light/src/main/resources/archetype-resources/admin/src/main/resources/redisson-dev.yml

+password: antaikeji2020
 singleServerConfig:
   address: "redis://119.184.127.215:16379"
   database: 12
-  password: antaikeji2020
   idleConnectionTimeout: 10000
   connectTimeout: 10000
   timeout: 3000
   retryAttempts: 3
-  retryInterval: 1500
   clientName: null
   subscriptionConnectionMinimumIdleSize: 1
   subscriptionConnectionPoolSize: 5

binfast-archetype-light/src/main/resources/archetype-resources/admin/src/main/resources/spy.properties

-# p6spy 性能分析插件配置文件
-modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6spy.engine.outage.P6OutageFactory
-# 自定义日志打印
-logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger
-#日志输出到控制台
-appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger
-# 使用日志系统记录 sql
-#appender=com.p6spy.engine.spy.appender.Slf4JLogger
-# 设置 p6spy driver 代理
-#deregisterdrivers=true
-# 取消JDBC URL前缀
-useprefix=true
-# 配置记录 Log 例外,可去掉的结果集有error,info,batch,debug,statement,commit,rollback,result,resultset.
-excludecategories=info,debug,result,commit,resultset
-# 日期格式
-dateformat=yyyy-MM-dd HH:mm:ss
-# SQL语句打印时间格式
-databaseDialectTimestampFormat=yyyy-MM-dd HH:mm:ss
-# 实际驱动可多个
-#driverlist=org.h2.Driver
-# 是否开启慢SQL记录
-outagedetection=true
-# 慢SQL记录标准 2 秒
-outagedetectioninterval=2
-# 是否过滤 Log
-filter=true
-# 过滤 Log 时所排除的 sql 关键字，以逗号分隔
-exclude=SELECT 1

binfast-archetype-light/src/main/resources/archetype-resources/pom.xml

@@ -10,16 +10,16 @@
 
     <properties>
         <java.version>21</java.version>
-        <spring-boot.version>3.5.9</spring-boot.version>
+        <spring-boot.version>4.1.0</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
-        <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
-        <mapstruct-plus.version>1.4.8</mapstruct-plus.version>
+        <maven-jar-plugin.version>3.5.0</maven-jar-plugin.version>
+        <maven-compiler-plugin.version>3.15.0</maven-compiler-plugin.version>
+        <mapstruct-plus.version>1.5.1</mapstruct-plus.version>
         <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
         <therapi-javadoc.version>0.15.0</therapi-javadoc.version>
-        <binfast.version>1.3.5</binfast.version>
-        <lombok.version>1.18.38</lombok.version>
+        <binfast.version>2.0.3</binfast.version>
+        <lombok.version>1.18.46</lombok.version>
     </properties>
 
     <modules>
@@ -81,7 +81,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12.4</version>
+                <version>${maven-surefire-plugin.version}</version>
                 <configuration>
                     <skipTests>true</skipTests>
                 </configuration>
@@ -93,7 +93,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>${maven-compiler-plugin.version}</version>
                 <configuration>
                     <target>${java.version}</target>
                     <source>${java.version}</source>