!32 🔖 🔖 🔖 Releasing / Version tags. 2.2.1

Merge pull request !32 from 周周/dev

Author: zhouhuan751312

fast-admin/pom.xml

@@ -48,7 +48,6 @@
 <!--		  <groupId>p6spy</groupId>-->
 <!--		  <artifactId>p6spy</artifactId>-->
 <!--		</dependency>-->
-
 	</dependencies>
 
 	<build>
@@ -138,7 +137,7 @@
 						</execution>
 					</executions>
 			 </plugin>
-			 -->
+			-->
 			</plugins>
     </build>
 </project>

fast-admin/src/main/build/package.xml

@@ -37,6 +37,7 @@
             <!-- Added packaging to filter uncompressed core JS(打包排除核心未压缩的文件)-->
             <excludes>
                 <exclude>static/libs/SM4.js</exclude>
+                <exclude>static/plugins/blockUI/jquery.blockUI.js</exclude>
                 <exclude>static/plugins/captcha/ase.js</exclude>
                 <exclude>static/plugins/captcha/crypto-js.js</exclude>
                 <exclude>static/plugins/captcha/verify.js</exclude>

fast-admin/src/main/java/com/j2eefast/modules/sys/controller/SysConfigController.java

@@ -46,7 +46,6 @@ public String config(){
 		return urlPrefix + "/config";
 	}
 
-
 	/**
 	 * 新增参数配置
 	 */

fast-admin/src/main/java/com/j2eefast/modules/sys/controller/SysLoginController.java

@@ -259,8 +259,8 @@ public ResponseData login(String username, String password, HttpServletRequest r
 				throw new RxcException("解密失败,数据异常","50004");
 			}
 			if(loginUser.getUsername().equals(username)){
-				Integer number = redisUtil.get(RedisKeys.getUserLoginKey(username),Integer.class); //用户锁屏密码错误次数
-
+				//用户锁屏密码错误次数
+				Integer number = redisUtil.get(RedisKeys.getUserLoginKey(username),Integer.class);
 				if( number != null  && number >= Global.getLoginNumCode()) {
 					String kaptcha = UserUtils.getKaptcha(Constant.KAPTCHA_SESSION_KEY);
 					String captcha = (String) ServletUtil.getRequest().getParameter("captcha");
@@ -285,8 +285,8 @@ public ResponseData login(String username, String password, HttpServletRequest r
 						redisUtil.set(RedisKeys.getUserLoginKey(username), number, RedisUtil.MINUTE * Global.getLockTime());
 					}
 					AsyncManager.me().execute(AsyncFactory.recordLogininfor(username,loginUser.getCompId(),loginUser.getDeptId(), "50010","锁屏账号或密码不正确,输入错误"+number+" 次!"));
-					if(number >= Global.getLoginNumCode()) { //错误3次
-						throw new RxcException(ToolUtil.message("sys.login.password.retry.limit.count",Global.getLoginMaxCount()),"50004"); //错误3次
+					if(number >= Global.getLoginNumCode()) {
+						throw new RxcException(ToolUtil.message("sys.login.password.retry.limit.count",Global.getLoginMaxCount()),"50004");
 					}
 					throw new RxcException(ToolUtil.message("sys.login.password.retry.limit.count",Global.getLoginMaxCount()),"50005");
 				}

fast-admin/src/main/resources/application-Dev.yml

@@ -1,68 +1,11 @@
-fast:
-    #工作流是否开启 如果工作流开启 必须开启 rabbitmq消息队列 否则系统人员 与 角色同步就会有异常
-    flowable:
-        enabled: false
-    #是否演示模式
-    demoMode:
-        enabled: false
-        #配置拦截规则
-        post: 'edit,del,remove,clean,updateAvatar,updateUser,add,resetPwd,updatePass,genCode,uploadLic,status,insertAuthRoles,changeStatus,insertAuthUsers,cancel,upload'
-        get: 'del,remove,clean,dirTreeData'
-        urlPatterns: '/sys/*,/tool/*,/file/ueditor/*,/bpm/procdef/*,/bpm/model/*,/app/rest/models,/bpm/processInstance/*,/gen/test/*,/sys/comm/*'
-        ip:
-    #是否开启HTTPS false 则以server:port
-    ssl:
-        enabled: false
-    #配置文件yml文件中敏感数据加密key /*注意 数据加密安全性其实是相对的,什么加密如果私钥或者key泄露都是无用,这个世界上没有一种加密方法是绝对安全的。
-    #这种加密方法只能做到：防君子不防小人*/
-    #此参数可以配置可以不配置,如果不配置则自动获取系统key,或者使用环境变量方式储存，使用启动命令方式,建议不配置key 让系统自己生成 因为系统是生成key是根居机器码,只有这台机器才能解密
-    #需要加密的参数 DES{} 包裹 或者 SM4{} 包裹
-    encrypt:
-        key: '123456789'
-    xss:
-        # 过滤开关
-        enabled: true
-        # 排除链接（多个用逗号分隔）
-        excludes: /sys/notice/*,/sys/database/add
-        # 匹配链接
-        urlPatterns: /sys/*,/tool/*
-    #是否开启csrf 防护,此开启针对需要系统授权所有的POST请求
-    csrf:
-        enabled: true
-        #防盗链允许的网站来源地址配置多个URL , 分割
-        #urlReferer: 'http:127.0.0.1, http:loclhost'
-    #JTA 分布式事务，建议启用多数据源的时候开启
-    jta:
-        enabled: false
-########################License认证相关#####################
-#License相关配置
-license:
-    #主题
-    subject: fastOS
-    #公钥别称
-    publicAlias: j2eefastCert
-    #访问公钥的密码
-    storePass: j2eefast.com
-    #license位置 如果不是绝对地址 则会找项目资源路径
-    licensePath: license/license.lic
-    #公钥位置 如果不是绝对地址 则会找项目资源路径
-    publicKeysStorePath: license/publicCerts.keystore
-
-    ######生成许可证书信息 *此信息应当绝对保密 正式项目应该分离单独存放用于生成许证书*  你可以屏蔽############私钥库别名
-    privateAlias:
-    #私钥库密码
-    keyPass:
-    #私钥库路径
-    privateKeysStorePath:
-########################License认证相关#####################
-
 spring:
+    #数据库配置
     datasource:
         #默认(主)数据库配置
         master:
+            #mysql 数据库配置
             driverClassName: com.mysql.cj.jdbc.Driver
-            url: jdbc:mysql://127.0.0.1:3306/fastdb?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=CTT
-#            url: jdbc:mysql://192.168.20.110:3306/fastdb?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=CTT
+            url: jdbc:mysql://192.168.20.110:3306/fastdb?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=CTT
             #url: ENC{6mrUX1SZ/wgmN11iXmMyqplOpIbLBTlo3wh3K7T9qieephrFWPxUeOeswsLG+HKDvzd1wbo0DONij81tZUjIIEX/2gADAjSoJewZaxIeuVD1foEoEjzB/US3uf3gJYkee3IJPFEhABPSefwJGthT4xceWx27axifRKC6SfDzl5A=}
             username: fast
             password: fast@123$
@@ -77,57 +20,25 @@ spring:
 
             #oracle 数据库配置
             #driverClassName: oracle.jdbc.driver.OracleDriver
-            #url: jdbc:oracle:thin:@192.168.20.112:1521/orcl
-            #username: fast
-            #password: fast@123$
+            #url: jdbc:oracle:thin:@192.168.1.127:8080/orcl
+            #username: fastdb
+            #password: fastdb@123$
             #filters: wall,mergeStat
-        ###############工作流数据库配置
-#        flowable:
-#          driverClassName: com.mysql.cj.jdbc.Driver
-#          url: jdbc:mysql://192.168.20.110:3306/fast_flowabledb?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
-#          username: fast_flowable
-#          password: fast_flowable@123$
-#          filters: wall,mergeStat
-  #redis数据库服务器
+
+            #mssql 2012以上版本 数据库配置
+            #driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+            #url: jdbc:sqlserver://ip:端口;database=fastdb
+            #username: fastdb
+            #password: fastdb@123$
+            #filters: wall,mergeStat
+
+    #redis数据库服务器
     redis:
         database: 10
-#        host: 192.168.20.110
-        host: 127.0.0.1
+        host: 192.168.20.110
         port: 6379
-        password: 123456     # 密码（默认为空）
-        timeout: 6000ms  # 连接超时时长（毫秒）
-    jedis:
-        pool:
-            max-active: 1000  # 连接池最大连接数（使用负值表示没有限制）
-            max-wait: -1ms      # 连接池最大阻塞等待时间（使用负值表示没有限制）
-            max-idle: 10      # 连接池中的最大空闲连接
-            min-idle: 5       # 连接池中的最小空闲连接
-    #消息队列
-    rabbitmq:
-        #addresses: 192.168.20.110:5672
-        addresses: 127.0.0.1:5672
-        # RabbitMQ 默认的用户名和密码都是guest 而虚拟主机名称是 "/"
-        # 如果配置其他虚拟主机地址，需要预先用管控台或者图形界面创建 图形界面地址 http://主机地址:15672
-        username: system
-        password: system
-        virtual-host: /
-        # 是否启用发布者确认 具体确认回调实现见代码
-        publisher-confirms: true
-        # 是否启用发布者返回 具体返回回调实现见代码
-        publisher-returns: true
-        # 是否启用强制消息 保证消息的有效监听
-        template.mandatory: true
-        #消费端配置
-        listener:
-            simple:
-                #消费端
-                concurrency: 5
-                #最大消费端数
-                max-concurrency: 10
-                #自动签收auto  手动 manual
-                acknowledge-mode: manual
-                #限流（海量数据，同时只能过来一条）
-                prefetch: 1
+        #redis密码 请为你的redis 设置连接密码、 如果无密码、请注释 #password,否则会报连接异常
+        password: 123456
 
 mybatis-plus:
     #实体扫描，多个package用逗号或者分号分隔

fast-admin/src/main/resources/application-Prod.yml

@@ -1,75 +1,43 @@
-fast:
-    flowable:
-        enabled: true
-    demoMode:
-        enabled: false
-        post: 'edit,del,remove,clean,updateAvatar,updateUser,add,resetPwd,updatePass,genCode,uploadLic,status,insertAuthRoles'
-        get: 'del,remove,clean,dirTreeData'
-        urlPatterns: '/sys/*,/tool/*,/file/ueditor/*,/bpm/procdef/*,/bpm/model/*,/bpm/processInstance/*,/gen/test/*'
-        ip:
-    ssl:
-        enabled: true
-    encrypt:
-        key:
-    xss:
-        enabled: true
-        excludes: /sys/notice/*,/sys/database/add
-        urlPatterns: /sys/*,/tool/*
-    csrf:
-        enabled: true
-    jta:
-        enabled: false
-license:
-    subject: fastOS
-    publicAlias: j2eefastCert
-    storePass: j2eefast.com
-    licensePath: license/license.lic
-    publicKeysStorePath: license/publicCerts.keystore
-
-    privateAlias:
-    keyPass:
-    privateKeysStorePath:
-
 spring:
+	#数据库配置
     datasource:
+        #默认(主)数据库配置
         master:
+            #mysql 数据库配置
             driverClassName: com.mysql.cj.jdbc.Driver
-            url:
-            username:
-            password:
+            url: jdbc:mysql://127.0.0.1:3306/fastdb?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=CTT
+            username: 
+            password: 
             filters: mergeStat
-        flowable:
-            driverClassName:
-            url:
-            username:
-            password:
-            filters:
+
+            #PostgreSql 数据库配置
+            #driverClassName: org.postgresql.Driver
+            #url: jdbc:postgresql://127.0.0.1:5432/fastdb
+            #username: 
+            #password: 
+            #filters: mergeStat
+
+            #oracle 数据库配置
+            #driverClassName: oracle.jdbc.driver.OracleDriver
+            #url: jdbc:oracle:thin:@127.0.0.1:1521/orcl
+            #username: 
+            #password: 
+            #filters: wall,mergeStat
+
+            #mssql 2012以上版本 数据库配置
+            #driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+            #url: jdbc:sqlserver://ip:1433;database=fastdb
+            #username: 
+            #password: 
+            #filters: wall,mergeStat
+    #redis数据库服务器
     redis:
         database: 10
-        host:
-        port:
-        password:
-        timeout: 6000ms
-        jedis:
-            pool:
-                max-active: 1000
-                max-wait: -1ms
-                max-idle: 10
-                min-idle: 5
-    rabbitmq:
-        addresses: ip:5672
-        username:
+        host: 127.0.0.1
+        port: 6379
+        #redis密码 请为你的redis 设置连接密码、 如果无密码、请注释 #password,否则会报连接异常
         password:
-        virtual-host: /
-        publisher-confirms: true
-        publisher-returns: true
-        template.mandatory: true
-        listener:
-            simple:
-                concurrency: 5
-                max-concurrency: 10
-                acknowledge-mode: manual
-                prefetch: 1
+
 mybatis-plus:
     type-aliases-package: com.j2eefast.*.*.entity
     mapper-package: com.j2eefast.*.*.mapper