commit：同步2.3版本

2026-01-17 18:46:36 +08:00 · 2022-02-20 13:40:36 +08:00
parent c7cc3f5354
commit cbe0f7947d
668 changed files with 172592 additions and 821 deletions
--- a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/FilterConfig.java
+++ b/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/FilterConfig.java
@@ -28,10 +28,14 @@ public class FilterConfig {
        UrlBasedCorsConfigurationSource configSource = new UrlBasedCorsConfigurationSource();
        CorsConfiguration corsConfiguration = new CorsConfiguration();
        if (StringUtils.isNotBlank(applicationConfig.getCredentialIpList())) {
-            String[] credentialIpList = StringUtils.split(applicationConfig.getCredentialIpList(), ",");
-            if (credentialIpList.length > 0) {
-                for (String ip : credentialIpList) {
-                    corsConfiguration.addAllowedOrigin(ip);
+            if ("*".equals(applicationConfig.getCredentialIpList())) {
+                corsConfiguration.addAllowedOriginPattern("*");
+            } else {
+                String[] credentialIpList = StringUtils.split(applicationConfig.getCredentialIpList(), ",");
+                if (credentialIpList.length > 0) {
+                    for (String ip : credentialIpList) {
+                        corsConfiguration.addAllowedOrigin(ip);
+                    }
                }
            }
            corsConfiguration.addAllowedHeader("*");
--- a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDeptRelationMapper.java
+++ b/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDeptRelationMapper.java
@@ -26,7 +26,7 @@ public interface SysDeptRelationMapper extends BaseDaoMapper<SysDeptRelation> {
    /**
     * 批量插入部门关联数据。
     * 由于目前版本(3.4.1)的Mybatis Plus没有提供真正的批量插入，为了保证效率需要自己实现。
-     * 目前我们仅仅给出MySQL的insert list实现作为参考，其他数据库需要自行修改。
+     * 目前我们仅仅给出MySQL和PostgresSQL的insert list实现作为参考，其他数据库需要自行修改。
     *
     * @param deptRelationList 部门关联关系数据列表。
     */
--- a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPostMapper.xml
+++ b/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPostMapper.xml
@@ -5,7 +5,7 @@
        <id column="post_id" jdbcType="BIGINT" property="postId"/>
        <result column="post_name" jdbcType="VARCHAR" property="postName"/>
        <result column="level" jdbcType="INTEGER" property="level"/>
-        <result column="leader_post" jdbcType="BIT" property="leaderPost"/>
+        <result column="leader_post" jdbcType="BOOLEAN" property="leaderPost"/>
        <result column="create_user_id" jdbcType="BIGINT" property="createUserId"/>
        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
        <result column="update_user_id" jdbcType="BIGINT" property="updateUserId"/>
--- a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/resources/application-dev.yml
+++ b/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/resources/application-dev.yml
@@ -0,0 +1,98 @@
+spring:
+  # aj-captcha 对redis缓存的依赖。
+  redis:
+    database: 2
+    host: localhost
+    port: 6379
+    password: ''
+    timeout: 60000
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    druid:
+          # 数据库链接 [主数据源]
+      main:
+        url: jdbc:mysql://localhost:3306/zzdemo-online?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
+        username: root
+        password: 123456
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      name: application-webadmin
+      initialSize: 10
+      minIdle: 10
+      maxActive: 50
+      maxWait: 60000
+      timeBetweenEvictionRunsMillis: 60000
+      minEvictableIdleTimeMillis: 300000
+      poolPreparedStatements: true
+      maxPoolPreparedStatementPerConnectionSize: 20
+      maxOpenPreparedStatements: 20
+      validationQuery: SELECT 'x'
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+      filters: stat,wall
+      useGlobalDataSourceStat: true
+      web-stat-filter:
+        enabled: true
+        url-pattern: /*
+        exclusions: "*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*,/actuator/*"
+      stat-view-servlet:
+        enabled: true
+        urlPattern: /druid/*
+        resetEnable: true
+
+application:
+  # Jwt令牌加密的签名值。该值的长度要超过10个字符(过短会报错)。
+  tokenSigningKey: DemoFlow-signing-key
+  # Jwt令牌在Http Header中的键名称。
+  tokenHeaderKey: Authorization
+  # Jwt令牌刷新后在Http Header中的键名称。
+  refreshedTokenHeaderKey: RefreshedToken
+  # Jwt令牌过期时间(毫秒)。
+  expiration: 72000000
+  # 初始化密码。
+  defaultUserPassword: 123456
+  # 缺省的文件上传根目录。
+  uploadFileBaseDir: ./zz-resource/upload-files/app
+  # 跨域的IP(http://192.168.10.10:8086)白名单列表，多个IP之间逗号分隔(* 表示全部信任，空白表示禁用跨域信任)。
+  credentialIpList: "*"
+  # Session的用户和数据权限在Redis中的过期时间(秒)。
+  sessionExpiredSeconds: 86400
+
+sequence:
+  # Snowflake 分布式Id生成算法所需的WorkNode参数值。
+  snowflakeWorkNode: 1
+
+# 存储session数据的Redis，所有服务均需要，因此放到公共配置中。
+# 根据实际情况，该Redis也可以用于存储其他数据。
+redis:
+  # redisson的配置。每个服务可以自己的配置文件中覆盖此选项。
+  redisson:
+    # 如果该值为false，系统将不会创建RedissionClient的bean。
+    enabled: true
+    # mode的可用值为，single/cluster/sentinel/master-slave
+    mode: single
+    # single: 单机模式
+    #   address: redis://localhost:6379
+    # cluster: 集群模式
+    #   每个节点逗号分隔，同时每个节点前必须以redis://开头。
+    #   address: redis://localhost:6379,redis://localhost:6378,...
+    # sentinel:
+    #   每个节点逗号分隔，同时每个节点前必须以redis://开头。
+    #   address: redis://localhost:6379,redis://localhost:6378,...
+    # master-slave:
+    #   每个节点逗号分隔，第一个为主节点，其余为从节点。同时每个节点前必须以redis://开头。
+    #   address: redis://localhost:6379,redis://localhost:6378,...
+    address: redis://localhost:6379
+    # 链接超时，单位毫秒。
+    timeout: 6000
+    # 单位毫秒。分布式锁的超时检测时长。
+    # 如果一次锁内操作超该毫秒数，或在释放锁之前异常退出，Redis会在该时长之后主动删除该锁使用的key。
+    lockWatchdogTimeout: 60000
+    # redis 密码，空可以不填。
+    password:
+    pool:
+      # 连接池数量。
+      poolSize: 20
+      # 连接池中最小空闲数量。
+      minIdle: 5
--- a/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/resources/application.yml
+++ b/orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/resources/application.yml
@@ -59,43 +59,13 @@ pagehelper:
  supportMethodsArguments: false
  params: count=countSql

-# 存储session数据的Redis，所有服务均需要，因此放到公共配置中。
-# 根据实际情况，该Redis也可以用于存储其他数据。
-redis:
-  # redisson的配置。每个服务可以自己的配置文件中覆盖此选项。
-  redisson:
-    # 如果该值为false，系统将不会创建RedissionClient的bean。
-    enabled: true
-    # mode的可用值为，single/cluster/sentinel/master-slave
-    mode: single
-    # single: 单机模式
-    #   address: redis://localhost:6379
-    # cluster: 集群模式
-    #   每个节点逗号分隔，同时每个节点前必须以redis://开头。
-    #   address: redis://localhost:6379,redis://localhost:6378,...
-    # sentinel:
-    #   每个节点逗号分隔，同时每个节点前必须以redis://开头。
-    #   address: redis://localhost:6379,redis://localhost:6378,...
-    # master-slave:
-    #   每个节点逗号分隔，第一个为主节点，其余为从节点。同时每个节点前必须以redis://开头。
-    #   address: redis://localhost:6379,redis://localhost:6378,...
-    address: redis://localhost:6379
-    # 链接超时，单位毫秒。
-    timeout: 6000
-    # 单位毫秒。分布式锁的超时检测时长。
-    # 如果一次锁内操作超该毫秒数，或在释放锁之前异常退出，Redis会在该时长之后主动删除该锁使用的key。
-    lockWatchdogTimeout: 60000
-    # redis 密码，空可以不填。
-    password:
-    pool:
-      # 连接池数量。
-      poolSize: 20
-      # 连接池中最小空闲数量。
-      minIdle: 5
+common-core:
+  # 可选值为 mysql / postgresql
+  databaseType: mysql

 common-online:
  # 可选值为 mysql / postgresql
-  datasourceType: mysql
+  databaseType: mysql
  # 注意不要以反斜杠(/)结尾。
  operationUrlPrefix: /admin/online
  # 在线表单业务数据上传资源路径
@@ -108,21 +78,25 @@ common-online-api:
  urlPrefix: /admin/online
  # 下面的url列表，请保持反斜杠(/)结尾。
  viewUrlList:
-    - ${common-online.operationUrlPrefix}/onlineOperation/viewByDatasourceId/
-    - ${common-online.operationUrlPrefix}/onlineOperation/viewByOneToManyRelationId/
-    - ${common-online.operationUrlPrefix}/onlineOperation/listByDatasourceId/
-    - ${common-online.operationUrlPrefix}/onlineOperation/listByOneToManyRelationId/
-    - ${common-online.operationUrlPrefix}/onlineOperation/downloadDatasource/
-    - ${common-online.operationUrlPrefix}/onlineOperation/downloadOneToManyRelation/
+  - ${common-online.operationUrlPrefix}/onlineOperation/viewByDatasourceId/
+  - ${common-online.operationUrlPrefix}/onlineOperation/viewByOneToManyRelationId/
+  - ${common-online.operationUrlPrefix}/onlineOperation/listByDatasourceId/
+  - ${common-online.operationUrlPrefix}/onlineOperation/listByOneToManyRelationId/
+  - ${common-online.operationUrlPrefix}/onlineOperation/exportByDatasourceId/
+  - ${common-online.operationUrlPrefix}/onlineOperation/exportByOneToManyRelationId/
+  - ${common-online.operationUrlPrefix}/onlineOperation/downloadDatasource/
+  - ${common-online.operationUrlPrefix}/onlineOperation/downloadOneToManyRelation/
  editUrlList:
-    - ${common-online.operationUrlPrefix}/onlineOperation/addDatasource/
-    - ${common-online.operationUrlPrefix}/onlineOperation/addOneToManyRelation/
-    - ${common-online.operationUrlPrefix}/onlineOperation/updateDatasource/
-    - ${common-online.operationUrlPrefix}/onlineOperation/updateOneToManyRelation/
-    - ${common-online.operationUrlPrefix}/onlineOperation/deleteDatasource/
-    - ${common-online.operationUrlPrefix}/onlineOperation/deleteOneToManyRelation/
-    - ${common-online.operationUrlPrefix}/onlineOperation/uploadDatasource/
-    - ${common-online.operationUrlPrefix}/onlineOperation/uploadOneToManyRelation/
+  - ${common-online.operationUrlPrefix}/onlineOperation/addDatasource/
+  - ${common-online.operationUrlPrefix}/onlineOperation/addOneToManyRelation/
+  - ${common-online.operationUrlPrefix}/onlineOperation/updateDatasource/
+  - ${common-online.operationUrlPrefix}/onlineOperation/updateOneToManyRelation/
+  - ${common-online.operationUrlPrefix}/onlineOperation/deleteDatasource/
+  - ${common-online.operationUrlPrefix}/onlineOperation/deleteOneToManyRelation/
+  - ${common-online.operationUrlPrefix}/onlineOperation/deleteBatchDatasource/
+  - ${common-online.operationUrlPrefix}/onlineOperation/deleteBatchOneToManyRelation/
+  - ${common-online.operationUrlPrefix}/onlineOperation/uploadDatasource/
+  - ${common-online.operationUrlPrefix}/onlineOperation/uploadOneToManyRelation/

 common-flow:
  # 请慎重修改urlPrefix的缺省配置，注意不要以反斜杠(/)结尾。如必须修改其他路径，请同步修改数据库脚本。
@@ -168,8 +142,7 @@ management:
      # keys-to-sanitize:
      keys-to-sanitize: password
  server:
-    servlet:
-      context-path: "/"
+    base-path: "/"

 aj:
  captcha:
@@ -206,137 +179,3 @@ aj:
    aes-status: true
    # 滑动干扰项(0/1/2)
    interference-options: 2
-
-# 开发数据库相关配置
---
-spring:
-  profiles: dev
-  # aj-captcha 对redis缓存的依赖。
-  redis:
-    database: 2
-    host: localhost
-    port: 6379
-    password: ''
-    timeout: 60000
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    druid:
-      main:
-        url: jdbc:mysql://localhost:3306/zzdemo-online?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
-        username: root
-        password: 123456
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      name: application-webadmin
-      initialSize: 10
-      minIdle: 10
-      maxActive: 50
-      maxWait: 60000
-      timeBetweenEvictionRunsMillis: 60000
-      minEvictableIdleTimeMillis: 300000
-      poolPreparedStatements: true
-      maxPoolPreparedStatementPerConnectionSize: 20
-      maxOpenPreparedStatements: 20
-      validationQuery: SELECT 'x'
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-      filters: stat,wall
-      useGlobalDataSourceStat: true
-      web-stat-filter:
-        enabled: true
-        url-pattern: /*
-        exclusions: "*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*,/actuator/*"
-      stat-view-servlet:
-        enabled: true
-        urlPattern: /druid/*
-        resetEnable: true
-
-application:
-  # Jwt令牌加密的签名值。该值的长度要超过10个字符(过短会报错)。
-  tokenSigningKey: DemoFlow-signing-key
-  # Jwt令牌在Http Header中的键名称。
-  tokenHeaderKey: Authorization
-  # Jwt令牌刷新后在Http Header中的键名称。
-  refreshedTokenHeaderKey: RefreshedToken
-  # Jwt令牌过期时间(毫秒)。
-  expiration: 72000000
-  # 初始化密码。
-  defaultUserPassword: 123456
-  # 缺省的文件上传根目录。
-  uploadFileBaseDir: ./zz-resource/upload-files/app
-  # 跨域的IP(http://192.168.10.10:8086)白名单列表，多个IP之间逗号分隔(* 表示全部信任，空白表示禁用跨域信任)。
-  credentialIpList: "*"
-  # Session的用户和数据权限在Redis中的过期时间(秒)。
-  sessionExpiredSeconds: 86400
-
-sequence:
-  # Snowflake 分布式Id生成算法所需的WorkNode参数值。
-  snowflakeWorkNode: 1
-
-# 发布数据库相关配置
---
-spring:
-  profiles: product
-  # aj-captcha 对redis缓存的依赖。
-  redis:
-    database: 2
-    host: localhost
-    port: 6379
-    password: ''
-    timeout: 60000
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    druid:
-      main:
-        url: jdbc:mysql://localhost:3306/zzdemo-online?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
-        username: root
-        password: 123456
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      name: application-webadmin
-      initialSize: 10
-      minIdle: 10
-      maxActive: 50
-      maxWait: 60000
-      timeBetweenEvictionRunsMillis: 60000
-      minEvictableIdleTimeMillis: 300000
-      poolPreparedStatements: true
-      maxPoolPreparedStatementPerConnectionSize: 20
-      maxOpenPreparedStatements: 20
-      validationQuery: SELECT 'x'
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-      filters: stat,wall
-      useGlobalDataSourceStat: true
-      web-stat-filter:
-        enabled: true
-        url-pattern: /*
-        exclusions: "*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*,/actuator/*"
-      stat-view-servlet:
-        enabled: true
-        urlPattern: /druid/*
-        resetEnable: true
-
-application:
-  # Jwt令牌加密的签名值。该值的长度要超过10个字符(过短会报错)。
-  tokenSigningKey: DemoFlow-signing-key
-  # Jwt令牌在Http Header中的键名称。
-  tokenHeaderKey: Authorization
-  # Jwt令牌刷新后在Http Header中的键名称。
-  refreshedTokenHeaderKey: RefreshedToken
-  # Jwt令牌过期时间(毫秒)。
-  expiration: 72000000
-  # 初始化密码。
-  defaultUserPassword: 123456
-  # 缺省的文件上传根目录。
-  uploadFileBaseDir: ./zz-resource/upload-files/app
-  # 跨域的IP(http://192.168.10.10:8086)白名单列表，多个IP之间逗号分隔(* 表示全部信任，空白表示禁用跨域信任)。
-  credentialIpList: "*"
-  # Session的用户和数据权限在Redis中的过期时间(秒)。
-  sessionExpiredSeconds: 86400
-
-sequence:
-  # Snowflake 分布式Id生成算法所需的WorkNode参数值。
-  snowflakeWorkNode: 1