test

jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -114,7 +114,6 @@ org/jeecg/common/util/DySmsHelper.class
 org/jeecg/common/system/vo/SelectTreeModel.class
 org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.class
 org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.class
-org/jeecg/config/WebSocketConfig.class
 org/jeecg/config/StaticConfig.class
 org/jeecg/config/shiro/filters/ResourceCheckFilter.class
 org/jeecg/common/util/dynamic/db/DbTypeUtils.class

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -39,10 +39,10 @@ spring:
   quartz:
     job-store-type: jdbc
     initialize-schema: embedded
-    #定时任务启动开关，true-开  false-关
-    auto-startup: true
     #延迟1秒启动定时任务
     startup-delay: 1s
+    #定时任务启动开关，true-开  false-关
+    auto-startup: true
     #启动时更新己存在的Job
     overwrite-existing-jobs: true
     properties:
@@ -116,21 +116,21 @@ spring:
         # 初始化大小，最小，最大
         initial-size: 5
         min-idle: 5
-        maxActive: 20
+        maxActive: 1000
         # 配置获取连接等待超时的时间
         maxWait: 60000
         # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
         timeBetweenEvictionRunsMillis: 60000
         # 配置一个连接在池中最小生存的时间，单位是毫秒
         minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1
+        validationQuery: SELECT 1 FROM DUAL
         testWhileIdle: true
         testOnBorrow: false
         testOnReturn: false
         # 打开PSCache，并且指定每个连接上PSCache的大小
         poolPreparedStatements: true
         maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，wall用于防火墙
+        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
         filters: stat,wall,slf4j
         # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
@@ -167,7 +167,7 @@ mybatis-plus:
     banner: false
     db-config:
       #主键类型  0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
-      id-type: auto
+      id-type: ASSIGN_ID
       # 默认数据库表下划线命名
       table-underline: true
   configuration:
@@ -183,26 +183,27 @@ jeecg:
   safeMode: false
   # 签名密钥串(前后端要一致，正式发布请自行修改)
   signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
-  # 本地：local\Minio：minio\阿里云: alioss
-  uploadType: local
+  # 本地：local\Minio：minio\阿里云：alioss
+  uploadType: alioss
   path:
     #文件上传根目录 设置
-    upload: /opt/upFiles
+    upload: /opt/jeecg-boot/upload
     #webapp文件路径
-    webapp: /opt/webapp
+    webapp: /opt/jeecg-boot/webapp
   shiro:
-    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
+    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/api/getUserInfo
   #阿里云oss存储和大鱼短信秘钥配置
   oss:
     accessKey: ??
     secretKey: ??
     endpoint: oss-cn-beijing.aliyuncs.com
     bucketName: jeecgdev
-  # ElasticSearch 6设置
+    staticDomain: https://static.jeecg.com
+  # ElasticSearch 设置
   elasticsearch:
     cluster-name: jeecg-ES
     cluster-nodes: 127.0.0.1:9200
-    check-enabled: false
+    check-enabled: true
   # 表单设计器配置
   desform:
     # 主题颜色（仅支持 16进制颜色代码）
@@ -213,7 +214,7 @@ jeecg:
       # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
       baidu: ??
   # 在线预览文件服务器地址配置
-  file-view-domain: 127.0.0.1:8012
+  file-view-domain: http://fileview.jeecg.com
   # minio文件上传
   minio:
     minio_url: http://minio.jeecg.com
@@ -222,20 +223,13 @@ jeecg:
     bucketName: otatest
   #大屏报表参数设置
   jmreport:
-    mode: dev
+    mode: prod
     #数据字典是否进行saas数据隔离，自己看自己的字典
     saas: false
     #是否需要校验token
     is_verify_token: true
     #必须校验方法
     verify_methods: remove,delete,save,add,update
-    #自定义项目前缀
-    customPrePath:
-    pageSize:
-      - 10
-      - 20
-      - 30
-      - 40
   #Wps在线文档
   wps:
     domain: https://wwo.wps.cn/office/
@@ -278,7 +272,7 @@ knife4j:
   #开启生产环境屏蔽
   production: false
   basic:
-    enable: false
+    enable: true
     username: jeecg
     password: jeecg1314
 #第三方登录

jeecg-boot-module-system/src/main/resources/application-prod.yml

@@ -137,8 +137,8 @@ spring:
       datasource:
         master:
           url: jdbc:mysql://115.29.148.71:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-            username: mili
-            password: 1qaz@WSX
+          username: mili
+          password: 1qaz@WSX
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
@@ -149,7 +149,7 @@ spring:
   #redis 配置
   redis:
     database: 0
-    host: 127.0.0.1
+    host: 115.29.148.71
     lettuce:
       pool:
         max-active: 8   #最大连接数据库连接数,设 -1 为没有限制

jeecg-boot-module-system/target/classes/application-dev.yml

@@ -39,10 +39,10 @@ spring:
   quartz:
     job-store-type: jdbc
     initialize-schema: embedded
-    #定时任务启动开关，true-开  false-关
-    auto-startup: true
     #延迟1秒启动定时任务
     startup-delay: 1s
+    #定时任务启动开关，true-开  false-关
+    auto-startup: true
     #启动时更新己存在的Job
     overwrite-existing-jobs: true
     properties:
@@ -116,21 +116,21 @@ spring:
         # 初始化大小，最小，最大
         initial-size: 5
         min-idle: 5
-        maxActive: 20
+        maxActive: 1000
         # 配置获取连接等待超时的时间
         maxWait: 60000
         # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
         timeBetweenEvictionRunsMillis: 60000
         # 配置一个连接在池中最小生存的时间，单位是毫秒
         minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1
+        validationQuery: SELECT 1 FROM DUAL
         testWhileIdle: true
         testOnBorrow: false
         testOnReturn: false
         # 打开PSCache，并且指定每个连接上PSCache的大小
         poolPreparedStatements: true
         maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，wall用于防火墙
+        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
         filters: stat,wall,slf4j
         # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
@@ -167,7 +167,7 @@ mybatis-plus:
     banner: false
     db-config:
       #主键类型  0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
-      id-type: auto
+      id-type: ASSIGN_ID
       # 默认数据库表下划线命名
       table-underline: true
   configuration:
@@ -183,26 +183,27 @@ jeecg:
   safeMode: false
   # 签名密钥串(前后端要一致，正式发布请自行修改)
   signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
-  # 本地：local\Minio：minio\阿里云: alioss
-  uploadType: local
+  # 本地：local\Minio：minio\阿里云：alioss
+  uploadType: alioss
   path:
     #文件上传根目录 设置
-    upload: /opt/upFiles
+    upload: /opt/jeecg-boot/upload
     #webapp文件路径
-    webapp: /opt/webapp
+    webapp: /opt/jeecg-boot/webapp
   shiro:
-    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
+    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/api/getUserInfo
   #阿里云oss存储和大鱼短信秘钥配置
   oss:
     accessKey: ??
     secretKey: ??
     endpoint: oss-cn-beijing.aliyuncs.com
     bucketName: jeecgdev
-  # ElasticSearch 6设置
+    staticDomain: https://static.jeecg.com
+  # ElasticSearch 设置
   elasticsearch:
     cluster-name: jeecg-ES
     cluster-nodes: 127.0.0.1:9200
-    check-enabled: false
+    check-enabled: true
   # 表单设计器配置
   desform:
     # 主题颜色（仅支持 16进制颜色代码）
@@ -213,7 +214,7 @@ jeecg:
       # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
       baidu: ??
   # 在线预览文件服务器地址配置
-  file-view-domain: 127.0.0.1:8012
+  file-view-domain: http://fileview.jeecg.com
   # minio文件上传
   minio:
     minio_url: http://minio.jeecg.com
@@ -222,20 +223,13 @@ jeecg:
     bucketName: otatest
   #大屏报表参数设置
   jmreport:
-    mode: dev
+    mode: prod
     #数据字典是否进行saas数据隔离，自己看自己的字典
     saas: false
     #是否需要校验token
     is_verify_token: true
     #必须校验方法
     verify_methods: remove,delete,save,add,update
-    #自定义项目前缀
-    customPrePath:
-    pageSize:
-      - 10
-      - 20
-      - 30
-      - 40
   #Wps在线文档
   wps:
     domain: https://wwo.wps.cn/office/
@@ -278,7 +272,7 @@ knife4j:
   #开启生产环境屏蔽
   production: false
   basic:
-    enable: false
+    enable: true
     username: jeecg
     password: jeecg1314
 #第三方登录

jeecg-boot-module-system/target/classes/application-prod.yml

@@ -136,9 +136,9 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          username: root
-          password: root
+          url: jdbc:mysql://115.29.148.71:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          username: mili
+          password: 1qaz@WSX
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
@@ -149,7 +149,7 @@ spring:
   #redis 配置
   redis:
     database: 0
-    host: 127.0.0.1
+    host: 115.29.148.71
     lettuce:
       pool:
         max-active: 8   #最大连接数据库连接数,设 -1 为没有限制