修复idea 正则冗余和sql标签问题

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java

@@ -25,7 +25,7 @@ public class FileUtils {
      */
     public static final char BACKSLASH = '\\';
 
-    public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+";
+    public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-|.\\u4e00-\\u9fa5]+";
 
     /**
      * 输出指定文件的byte数组

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java

@@ -17,7 +17,7 @@ public class SqlUtil {
     /**
      * 仅支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序）
      */
-    public static String SQL_PATTERN = "[a-zA-Z0-9_\\ \\,\\.]+";
+    public static String SQL_PATTERN = "[a-zA-Z0-9_ ,.]+";
 
     /**
      * 检查字符，防止注入绕过

ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java

@@ -47,7 +47,6 @@ public class SwaggerAutoConfiguration {
         if (swaggerProperties.getBasePath().isEmpty()) {
             swaggerProperties.getBasePath().add(BASE_PATH);
         }
-        // noinspection unchecked
         List<Predicate<String>> basePath = new ArrayList<Predicate<String>>();
         swaggerProperties.getBasePath().forEach(path -> basePath.add(PathSelectors.ant(path)));
 

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java

@@ -78,7 +78,7 @@ public class GenController extends BaseController {
      * 查询数据表字段列表
      */
     @GetMapping(value = "/column/{tableId}")
-    public TableDataInfo columnList(Long tableId) {
+    public TableDataInfo columnList(@PathVariable Long tableId) {
         TableDataInfo dataInfo = new TableDataInfo();
         List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(tableId);
         dataInfo.setRows(list);

ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml

@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
-		select column_name, (case when (is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') then '1' else null end) as is_required, (case when column_key = 'PRI' then '1' else '0' end) as is_pk, ordinal_position as sort, column_comment, (case when extra = 'auto_increment' then '1' else '0' end) as is_increment, column_type
+		select column_name, (if((is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') ,'1',null)) as is_required, if(column_key = 'PRI' , '1' , '0' ) as is_pk, ordinal_position as sort, column_comment, if(extra = 'auto_increment' , '1' , '0') as is_increment, column_type
 		from information_schema.columns where table_schema = (select database()) and table_name = (#{tableName})
 		order by ordinal_position
 	</select>

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java

@@ -54,8 +54,8 @@ public class SysJobLogController extends BaseController {
      */
     @RequiresPermissions("monitor:job:query")
     @GetMapping(value = "/{configId}")
-    public AjaxResult getInfo(@PathVariable Long jobLogId) {
+    public AjaxResult getInfo(@PathVariable Long configId) {
-        return AjaxResult.success(jobLogService.selectJobLogById(jobLogId));
+        return AjaxResult.success(jobLogService.selectJobLogById(configId));
     }
 
     /**

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

@@ -23,7 +23,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDeptVo">
-        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time 
+        select d.dept_id,
+               d.parent_id,
+               d.ancestors,
+               d.dept_name,
+               d.order_num,
+               d.leader,
+               d.phone,
+               d.email,
+               d.status,
+               d.del_flag,
+               d.create_by,
+               d.create_time
         from sys_dept d
     </sql>
 
@@ -53,7 +64,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sys_role_dept rd on d.dept_id = rd.dept_id
         where rd.role_id = #{roleId}
         <if test="deptCheckStrictly">
-              and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})
+            and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id =
+            rd.dept_id and rd.role_id = #{roleId})
         </if>
         order by d.parent_id, d.order_num
     </select>
@@ -64,20 +76,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="checkDeptExistUser" parameterType="Long" resultType="int">
-		select count(1) from sys_user where dept_id = #{deptId} and del_flag = '0'
+        select count(1)
+        from sys_user
+        where dept_id = #{deptId}
+          and del_flag = '0'
     </select>
 
     <select id="hasChildByDeptId" parameterType="Long" resultType="int">
-		select count(1) from sys_dept
+        select count(1)
-		where del_flag = '0' and parent_id = #{deptId} limit 1
+        from sys_dept
+        where del_flag = '0'
+          and parent_id = #{deptId}
+        limit 1
     </select>
 
     <select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
-		select * from sys_dept where find_in_set(#{deptId}, ancestors)
+        select *
+        from sys_dept
+        where find_in_set(#{deptId}, ancestors)
     </select>
 
     <select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
-		select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors)
+        select count(*)
+        from sys_dept
+        where status = 0
+          and del_flag = '0'
+          and find_in_set(#{deptId}, ancestors)
     </select>
 
     <select id="checkDeptNameUnique" resultMap="SysDeptResult">
@@ -131,11 +155,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <update id="updateDeptChildren" parameterType="java.util.List">
-	    update sys_dept set ancestors =
+        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>
+        </set>
         where dept_id in
         <foreach collection="depts" item="item" index="index"
                  separator="," open="(" close=")">
@@ -151,7 +178,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteDeptById" parameterType="Long">
-		update sys_dept set del_flag = '2' where dept_id = #{deptId}
+        update sys_dept
+        set del_flag = '2'
+        where dept_id = #{deptId}
     </delete>
 
 </mapper>