发布 2.3.0

ruoyi/src/main/resources/application-dev.yml

@@ -67,13 +67,38 @@ spring:
     password:
     # 连接超时时间
     timeout: 10s
-    lettuce:
-      pool:
-        # 连接池中的最小空闲连接
-        min-idle: 0
-        # 连接池中的最大空闲连接
-        max-idle: 8
-        # 连接池的最大数据库连接数
-        max-active: 8
-        # #连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-wait: -1ms
+    # 是否开启ssl
+    ssl: false
+
+--- # redisson 客户端配置
+redisson:
+  # 线程池数量
+  threads: 16
+  # Netty线程池数量
+  nettyThreads: 32
+  # 传输模式
+  transportMode: "NIO"
+  # 单节点配置
+  singleServerConfig:
+    # 客户端名称
+    clientName: ${ruoyi-vue-plus.name}
+    # 最小空闲连接数
+    connectionMinimumIdleSize: 32
+    # 连接池大小
+    connectionPoolSize: 64
+    # 连接空闲超时，单位：毫秒
+    idleConnectionTimeout: 10000
+    # 命令等待超时，单位：毫秒
+    timeout: 3000
+    # 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。
+    retryAttempts: 3
+    # 命令重试发送时间间隔，单位：毫秒
+    retryInterval: 1500
+    # 发布和订阅连接的最小空闲连接数
+    subscriptionConnectionMinimumIdleSize: 1
+    # 发布和订阅连接池大小
+    subscriptionConnectionPoolSize: 50
+    # 单个连接最大订阅数量
+    subscriptionsPerConnection: 5
+    # DNS监测时间间隔，单位：毫秒
+    dnsMonitoringInterval: 5000

ruoyi/src/main/resources/application-prod.yml

@@ -67,13 +67,38 @@ spring:
     password:
     # 连接超时时间
     timeout: 10s
-    lettuce:
-      pool:
-        # 连接池中的最小空闲连接
-        min-idle: 0
-        # 连接池中的最大空闲连接
-        max-idle: 8
-        # 连接池的最大数据库连接数
-        max-active: 8
-        # #连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-wait: -1ms
+    # 是否开启ssl
+    ssl: false
+
+--- # redisson 客户端配置
+redisson:
+  # 线程池数量
+  threads: 16
+  # Netty线程池数量
+  nettyThreads: 32
+  # 传输模式
+  transportMode: "NIO"
+  # 单节点配置
+  singleServerConfig:
+    # 客户端名称
+    clientName: ${ruoyi-vue-plus.name}
+    # 最小空闲连接数
+    connectionMinimumIdleSize: 32
+    # 连接池大小
+    connectionPoolSize: 64
+    # 连接空闲超时，单位：毫秒
+    idleConnectionTimeout: 10000
+    # 命令等待超时，单位：毫秒
+    timeout: 3000
+    # 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。
+    retryAttempts: 3
+    # 命令重试发送时间间隔，单位：毫秒
+    retryInterval: 1500
+    # 发布和订阅连接的最小空闲连接数
+    subscriptionConnectionMinimumIdleSize: 1
+    # 发布和订阅连接池大小
+    subscriptionConnectionPoolSize: 50
+    # 单个连接最大订阅数量
+    subscriptionsPerConnection: 5
+    # DNS监测时间间隔，单位：毫秒
+    dnsMonitoringInterval: 5000

ruoyi/src/main/resources/mapper/demo/ChkjTestMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.demo.mapper.ChkjTestMapper">
+
+    <resultMap type="com.ruoyi.demo.domain.ChkjTest" id="ChkjTestResult">
+        <result property="id" column="id"/>
+        <result property="testKey" column="test_key"/>
+        <result property="value" column="value"/>
+        <result property="version" column="version"/>
+        <result property="createTime" column="create_time"/>
+        <result property="deleted" column="deleted"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="orderNum" column="order_num"/>
+    </resultMap>
+
+
+</mapper>

ruoyi/src/main/resources/mapper/demo/TestDemoMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.demo.mapper.TestDemoMapper">
+
+    <resultMap type="com.ruoyi.demo.domain.TestDemo" id="TestDemoResult">
+        <result property="id" column="id"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="orderNum" column="order_num"/>
+        <result property="testKey" column="test_key"/>
+        <result property="value" column="value"/>
+        <result property="version" column="version"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="delFlag" column="del_flag"/>
+    </resultMap>
+
+
+</mapper>

ruoyi/src/main/resources/mapper/demo/TestTreeMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.demo.mapper.TestTreeMapper">
+
+    <resultMap type="com.ruoyi.demo.domain.TestTree" id="TestTreeResult">
+        <result property="id" column="id"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="treeName" column="tree_name"/>
+        <result property="version" column="version"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="delFlag" column="del_flag"/>
+    </resultMap>
+
+
+</mapper>

ruoyi/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -40,7 +40,9 @@
             AND status = #{status}
         </if>
         <!-- 数据范围过滤 -->
-        ${params.dataScope}
+        <if test="params.dataScope != null and params.dataScope != ''">
+            AND ( ${params.dataScope} )
+        </if>
         order by d.parent_id, d.order_num
     </select>
 
@@ -55,4 +57,17 @@
         order by d.parent_id, d.order_num
     </select>
 
+    <update id="updateDeptChildren" parameterType="java.util.List">
+        update sys_dept set ancestors =
+        <foreach collection="depts" item="item" index="index"
+                 separator=" " open="case dept_id" close="end">
+            when #{item.deptId} then #{item.ancestors}
+        </foreach>
+        where dept_id in
+        <foreach collection="depts" item="item" index="index"
+                 separator="," open="(" close=")">
+            #{item.deptId}
+        </foreach>
+    </update>
+
 </mapper>

ruoyi/src/main/resources/mapper/system/SysRoleDeptMapper.xml

@@ -9,4 +9,11 @@
         <result property="deptId" column="dept_id"/>
     </resultMap>
 
-</mapper> 
+    <insert id="batchRoleDept">
+        insert into sys_role_dept(role_id, dept_id) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            (#{item.roleId},#{item.deptId})
+        </foreach>
+    </insert>
+
+</mapper>

ruoyi/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -58,7 +58,9 @@
             and date_format(r.create_time,'%y%m%d') <= date_format(#{role.params.endTime},'%y%m%d')
         </if>
         <!-- 数据范围过滤 -->
-        ${role.params.dataScope}
+        <if test="role.params.dataScope != null and role.params.dataScope != ''">
+            AND ( ${role.params.dataScope} )
+        </if>
         order by r.role_sort
     </select>
 
@@ -81,7 +83,9 @@
             and date_format(r.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
         </if>
         <!-- 数据范围过滤 -->
-        ${params.dataScope}
+        <if test="params.dataScope != null and params.dataScope != ''">
+            AND ( ${params.dataScope} )
+        </if>
         order by r.role_sort
     </select>
 

ruoyi/src/main/resources/mapper/system/SysRoleMenuMapper.xml

@@ -9,4 +9,11 @@
         <result property="menuId" column="menu_id"/>
     </resultMap>
 
-</mapper> 
+    <insert id="batchRoleMenu">
+        insert into sys_role_menu(role_id, menu_id) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            (#{item.roleId},#{item.menuId})
+        </foreach>
+    </insert>
+
+</mapper>

ruoyi/src/main/resources/mapper/system/SysUserMapper.xml

@@ -106,7 +106,9 @@
             ancestors) ))
         </if>
         <!-- 数据范围过滤 -->
-        ${user.params.dataScope}
+        <if test="user.params.dataScope != null and user.params.dataScope != ''">
+            AND ( ${user.params.dataScope} )
+        </if>
     </select>
 
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
@@ -135,7 +137,9 @@
             ancestors) ))
         </if>
         <!-- 数据范围过滤 -->
-        ${params.dataScope}
+        <if test="params.dataScope != null and params.dataScope != ''">
+            AND ( ${params.dataScope} )
+        </if>
     </select>
 
     <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">

ruoyi/src/main/resources/mapper/system/SysUserPostMapper.xml

@@ -9,4 +9,11 @@
         <result property="postId" column="post_id"/>
     </resultMap>
 
-</mapper> 
+    <insert id="batchUserPost">
+        insert into sys_user_post(user_id, post_id) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            (#{item.userId},#{item.postId})
+        </foreach>
+    </insert>
+
+</mapper>

ruoyi/src/main/resources/mapper/system/SysUserRoleMapper.xml

@@ -9,4 +9,11 @@
         <result property="roleId" column="role_id"/>
     </resultMap>
 
-</mapper> 
+    <insert id="batchUserRole">
+        insert into sys_user_role(user_id, role_id) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            (#{item.userId},#{item.roleId})
+        </foreach>
+    </insert>
+
+</mapper>

ruoyi/src/main/resources/vm/java/addBo.java.vm

@@ -24,6 +24,7 @@ public class ${ClassName}AddBo {
 
 #foreach ($column in $columns)
 #if($column.isInsert && $column.isPk!=1)
+
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")
 #if($column.javaType == 'Date')

ruoyi/src/main/resources/vm/java/domain.java.vm

@@ -11,7 +11,7 @@ import com.ruoyi.common.annotation.Excel;
 
 /**
  * ${functionName}对象 ${tableName}
- * 
+ *
  * @author ${author}
  * @date ${datetime}
  */
@@ -21,7 +21,7 @@ import com.ruoyi.common.annotation.Excel;
 @TableName("${tableName}")
 public class ${ClassName} implements Serializable {
 
-private static final long serialVersionUID=1L;
+    private static final long serialVersionUID=1L;
 
 #foreach ($column in $columns)
 
@@ -35,6 +35,9 @@ private static final long serialVersionUID=1L;
 #if($column.javaField=='delFlag')
     @TableLogic
 #end
+#if($column.javaField=='version')
+    @Version
+#end
 #if($column.isPk==1)
     @TableId(value = "$column.columnName")
 #end

ruoyi/src/main/resources/vm/java/service.java.vm

@@ -32,6 +32,7 @@ public interface I${ClassName}Service extends IServicePlus<${ClassName}> {
 	 */
     TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}QueryBo bo);
 #end
+
 	/**
 	 * 查询列表
 	 */

ruoyi/src/main/resources/vm/java/vo.java.vm

@@ -13,7 +13,7 @@ import java.util.Date;
 
 
 /**
- * ${functionName}视图对象 mall_package
+ * ${functionName}视图对象 ${tableName}
  *
  * @author ${author}
  * @date ${datetime}
@@ -21,6 +21,7 @@ import java.util.Date;
 @Data
 @ApiModel("${functionName}视图对象")
 public class ${ClassName}Vo {
+
 	private static final long serialVersionUID = 1L;
 
 	/** $pkColumn.columnComment */
@@ -46,6 +47,7 @@ public class ${ClassName}Vo {
 #end
 	@ApiModelProperty("$column.columnComment")
 	private $column.javaType $column.javaField;
+
 #end
 #end