upd: 编码规范

cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/config/RemoveDruidAdConfig.java

@@ -3,7 +3,6 @@ package cn.odboy.mybatis.config;
 import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
 import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
 import com.alibaba.druid.util.Utils;
-import org.springframework.aop.support.JdkRegexpMethodPointcut;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;

cutejava/cutejava-job/src/main/java/cn/odboy/config/JobRunner.java

@@ -4,18 +4,17 @@ import cn.odboy.mapper.QuartzJobMapper;
 import cn.odboy.model.job.domain.QuartzJob;
 import cn.odboy.util.QuartzManage;
 import lombok.RequiredArgsConstructor;
-import org.slf4j.Logger;
+import lombok.extern.slf4j.Slf4j;
-import org.slf4j.LoggerFactory;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
 
+@Slf4j
 @Component
 @RequiredArgsConstructor
 public class JobRunner implements ApplicationRunner {
-    private static final Logger log = LoggerFactory.getLogger(JobRunner.class);
     private final QuartzJobMapper quartzJobMapper;
     private final QuartzManage quartzManage;
 

cutejava/cutejava-job/src/main/java/cn/odboy/mapper/QuartzJobMapper.java

@@ -13,5 +13,6 @@ import java.util.List;
 @Mapper
 public interface QuartzJobMapper extends BaseMapper<QuartzJob> {
     IPage<QuartzJob> findQuartzJobPage(@Param("criteria") QuartzJobQueryCriteria criteria, Page<Object> page);
+
     List<QuartzJob> findActiveQuartzJob();
 }

cutejava/cutejava-job/src/main/java/cn/odboy/rest/QuartzJobController.java

@@ -1,12 +1,12 @@
 package cn.odboy.rest;
 
 import cn.odboy.base.PageResult;
+import cn.odboy.context.SpringBeanHolder;
 import cn.odboy.exception.BadRequestException;
 import cn.odboy.model.job.domain.QuartzJob;
 import cn.odboy.model.job.domain.QuartzLog;
 import cn.odboy.model.job.dto.QuartzJobQueryCriteria;
 import cn.odboy.service.QuartzJobService;
-import cn.odboy.context.SpringBeanHolder;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

cutejava/cutejava-job/src/main/resources/mapper/QuartzJobMapper.xml

@@ -16,6 +16,8 @@
         ORDER BY id DESC
     </select>
     <select id="findActiveQuartzJob" resultType="cn.odboy.model.job.domain.QuartzJob">
-        SELECT * FROM sys_quartz_job WHERE is_pause = 0
+        SELECT *
+        FROM sys_quartz_job
+        WHERE is_pause = 0
     </select>
 </mapper>

cutejava/cutejava-starter/src/main/java/cn/odboy/AppRun.java

@@ -2,12 +2,10 @@ package cn.odboy;
 
 import cn.odboy.annotation.AnonymousGetMapping;
 import cn.odboy.context.BootApplication;
-import cn.odboy.context.SpringBeanHolder;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.net.UnknownHostException;

cutejava/cutejava-system/src/main/java/cn/odboy/modules/security/rest/AuthController.java

@@ -4,7 +4,6 @@ import cn.hutool.core.util.IdUtil;
 import cn.odboy.annotation.AnonymousDeleteMapping;
 import cn.odboy.annotation.AnonymousGetMapping;
 import cn.odboy.annotation.AnonymousPostMapping;
-import cn.odboy.properties.RsaProperties;
 import cn.odboy.exception.BadRequestException;
 import cn.odboy.model.system.dto.AuthUserDto;
 import cn.odboy.model.system.dto.JwtUserDto;
@@ -13,8 +12,9 @@ import cn.odboy.modules.security.config.LoginProperties;
 import cn.odboy.modules.security.config.SecurityProperties;
 import cn.odboy.modules.security.constant.LoginCodeEnum;
 import cn.odboy.modules.security.context.TokenProvider;
-import cn.odboy.modules.security.service.impl.OnlineUserServiceImpl;
 import cn.odboy.modules.security.context.UserDetailsHelper;
+import cn.odboy.modules.security.service.impl.OnlineUserServiceImpl;
+import cn.odboy.properties.RsaProperties;
 import cn.odboy.util.RedisUtil;
 import cn.odboy.util.RsaUtil;
 import cn.odboy.util.SecurityUtil;

cutejava/cutejava-system/src/main/java/cn/odboy/modules/security/service/UserCacheService.java

@@ -19,6 +19,7 @@ public interface UserCacheService {
      */
     @Async
     void addUserCache(String userName, JwtUserDto user);
+
     /**
      * 清理用户缓存信息
      * 用户信息变更时

cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/DeptMapper.java

@@ -5,15 +5,21 @@ import cn.odboy.model.system.dto.DeptQueryCriteria;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 import java.util.Set;
 
 @Mapper
 public interface DeptMapper extends BaseMapper<Dept> {
     List<Dept> findDept(@Param("criteria") DeptQueryCriteria criteria);
+
     List<Dept> findDeptByPid(@Param("pid") Long pid);
+
     int countDeptByPid(@Param("pid") Long pid);
+
     List<Dept> findDeptByPidIsNull();
+
     Set<Dept> findDeptByRoleId(@Param("roleId") Long roleId);
+
     void updateDeptSubCountById(@Param("count") Integer count, @Param("id") Long id);
 }

cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/JobMapper.java

@@ -7,12 +7,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
 
 @Mapper
 public interface JobMapper extends BaseMapper<Job> {
     Job findJobByName(@Param("name") String name);
+
     IPage<Job> findJobPage(@Param("criteria") JobQueryCriteria criteria, Page<Object> page);
 }

cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/RoleMapper.java

@@ -5,7 +5,6 @@ import cn.odboy.model.system.dto.RoleQueryCriteria;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 import java.util.Set;
@@ -13,11 +12,18 @@ import java.util.Set;
 @Mapper
 public interface RoleMapper extends BaseMapper<Role> {
     List<Role> findAllRoles();
+
     Long countRoles(@Param("criteria") RoleQueryCriteria criteria);
+
     List<Role> findRoles(@Param("criteria") RoleQueryCriteria criteria);
+
     Role findRoleById(@Param("roleId") Long roleId);
+
     Role findRoleByName(@Param("name") String name);
+
     List<Role> findRolesByUserId(@Param("userId") Long userId);
+
     int countRolesByDeptIds(@Param("deptIds") Set<Long> deptIds);
+
     List<Role> findRolesByMenuId(@Param("menuId") Long menuId);
 }

cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/rest/UserController.java

@@ -2,7 +2,6 @@ package cn.odboy.modules.system.rest;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.odboy.base.PageResult;
-import cn.odboy.properties.RsaProperties;
 import cn.odboy.constant.CodeEnum;
 import cn.odboy.exception.BadRequestException;
 import cn.odboy.model.system.domain.Dept;
@@ -11,6 +10,7 @@ import cn.odboy.model.system.domain.User;
 import cn.odboy.model.system.dto.UserPassVo;
 import cn.odboy.model.system.dto.UserQueryCriteria;
 import cn.odboy.modules.system.service.*;
+import cn.odboy.properties.RsaProperties;
 import cn.odboy.util.PageUtil;
 import cn.odboy.util.RsaUtil;
 import cn.odboy.util.SecurityUtil;

cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/UserServiceImpl.java

@@ -1,9 +1,6 @@
 package cn.odboy.modules.system.service.impl;
 
 import cn.odboy.base.PageResult;
-import cn.odboy.modules.security.service.OnlineUserService;
-import cn.odboy.modules.security.service.UserCacheService;
-import cn.odboy.properties.FileProperties;
 import cn.odboy.constant.CacheKey;
 import cn.odboy.exception.BadRequestException;
 import cn.odboy.exception.EntityExistException;
@@ -11,10 +8,13 @@ import cn.odboy.model.system.domain.Job;
 import cn.odboy.model.system.domain.Role;
 import cn.odboy.model.system.domain.User;
 import cn.odboy.model.system.dto.UserQueryCriteria;
+import cn.odboy.modules.security.service.OnlineUserService;
+import cn.odboy.modules.security.service.UserCacheService;
 import cn.odboy.modules.system.mapper.UserJobMapper;
 import cn.odboy.modules.system.mapper.UserMapper;
 import cn.odboy.modules.system.mapper.UserRoleMapper;
 import cn.odboy.modules.system.service.UserService;
+import cn.odboy.properties.FileProperties;
 import cn.odboy.util.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

cutejava/cutejava-system/src/main/resources/mapper/DeptMapper.xml

@@ -14,7 +14,9 @@
         <result column="update_time" property="updateTime"/>
     </resultMap>
     <update id="updateDeptSubCountById">
-        update sys_dept set sub_count = #{count} where dept_id = #{id}
+        update sys_dept
+        set sub_count = #{count}
+        where dept_id = #{id}
     </update>
 
     <select id="findDept" resultMap="BaseResultMap">
@@ -58,22 +60,37 @@
     </select>
 
     <select id="findDeptByPid" resultMap="BaseResultMap">
-        select
+        select dept_id,
-            dept_id, name, pid, sub_count, create_time, update_time, create_by, update_by, enabled, dept_sort
+               name,
+               pid,
+               sub_count,
+               create_time,
+               update_time,
+               create_by,
+               update_by,
+               enabled,
+               dept_sort
         from sys_dept
         where pid = #{pid}
     </select>
 
     <select id="findDeptByPidIsNull" resultMap="BaseResultMap">
-        select
+        select dept_id,
-            dept_id, name, pid, sub_count, create_time, update_time, create_by, update_by, enabled, dept_sort
+               name,
+               pid,
+               sub_count,
+               create_time,
+               update_time,
+               create_by,
+               update_by,
+               enabled,
+               dept_sort
         from sys_dept
         where pid is null
     </select>
 
     <select id="findDeptByRoleId" resultType="cn.odboy.model.system.domain.Dept">
-        SELECT
+        SELECT d.dept_id AS id,
-            d.dept_id AS id,
                d.NAME,
                d.pid,
                d.sub_count,
@@ -83,14 +100,14 @@
                d.update_by,
                d.enabled,
                d.dept_sort
-        FROM
+        FROM sys_dept d,
-            sys_dept d,
              sys_roles_depts rd
-        WHERE
+        WHERE d.dept_id = rd.dept_id
-            d.dept_id = rd.dept_id
           AND rd.role_id = #{roleId}
     </select>
     <select id="countDeptByPid" resultType="java.lang.Integer">
-        select count(*) from sys_dept where pid = #{pid}
+        select count(*)
+        from sys_dept
+        where pid = #{pid}
     </select>
 </mapper>

cutejava/cutejava-system/src/main/resources/mapper/JobMapper.xml

@@ -2,7 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="cn.odboy.modules.system.mapper.JobMapper">
     <select id="findJobByName" resultType="cn.odboy.model.system.domain.Job">
-        select id from sys_job where name = #{name}
+        select id
+        from sys_job
+        where name = #{name}
     </select>
     <select id="findJobPage" resultType="cn.odboy.model.system.domain.Job">
         select

cutejava/cutejava-system/src/main/resources/mapper/MenuMapper.xml

@@ -24,7 +24,8 @@
 
     <select id="findAll" resultMap="BaseResultMap">
         select
-        menu_id, title, name, menu_sort, component, path, type, permission, icon, cache, hidden, pid, sub_count, i_frame, create_by, update_by, create_time, update_time
+        menu_id, title, name, menu_sort, component, path, type, permission, icon, cache, hidden, pid, sub_count,
+        i_frame, create_by, update_by, create_time, update_time
         from sys_menu
         <where>
             <if test="criteria.blurry != null and criteria.blurry != ''">
@@ -58,16 +59,48 @@
     </select>
 
     <select id="findByPidOrderByMenuSort" resultMap="BaseResultMap">
-        SELECT
+        SELECT menu_id,
-            menu_id, title, name, menu_sort, component, path, type, permission, icon, cache, hidden, pid, sub_count, i_frame, create_by, update_by, create_time, update_time
+               title,
+               name,
+               menu_sort,
+               component,
+               path,
+               type,
+               permission,
+               icon,
+               cache,
+               hidden,
+               pid,
+               sub_count,
+               i_frame,
+               create_by,
+               update_by,
+               create_time,
+               update_time
         from sys_menu
         WHERE pid = #{pid}
         ORDER BY menu_sort
     </select>
 
     <select id="findByPidIsNullOrderByMenuSort" resultMap="BaseResultMap">
-        SELECT
+        SELECT menu_id,
-            menu_id, title, name, menu_sort, component, path, type, permission, icon, cache, hidden, pid, sub_count, i_frame, create_by, update_by, create_time, update_time
+               title,
+               name,
+               menu_sort,
+               component,
+               path,
+               type,
+               permission,
+               icon,
+               cache,
+               hidden,
+               pid,
+               sub_count,
+               i_frame,
+               create_by,
+               update_by,
+               create_time,
+               update_time
         from sys_menu
         where pid is null
         order by menu_sort

cutejava/cutejava-system/src/main/resources/mapper/RoleDeptMapper.xml

@@ -10,7 +10,8 @@
     </insert>
 
     <delete id="deleteByRoleId">
-        delete from sys_roles_depts
+        delete
+        from sys_roles_depts
         where role_id = #{roleId}
     </delete>
 

cutejava/cutejava-system/src/main/resources/mapper/RoleMapper.xml

@@ -23,7 +23,8 @@
     </resultMap>
     <select id="findAllRoles" resultType="cn.odboy.model.system.domain.Role">
         select role_id as id, name, level
-        from sys_role order by level
+        from sys_role
+        order by level
     </select>
     <select id="findRoles" resultMap="BaseResultMap">
         select role.*,
@@ -73,16 +74,25 @@
         </where>
     </select>
     <select id="findRoleByName" resultType="cn.odboy.model.system.domain.Role">
-        select role_id as id from sys_role
+        select role_id as id
+        from sys_role
         where name = #{name}
     </select>
     <select id="findRoleById" resultMap="BaseResultMap">
-        select
+        select role.role_id     as role_role_id,
-        role.role_id as role_role_id, role.name as role_name, role.data_scope as role_data_scope,
+               role.name        as role_name,
-        role.level as role_level, role.description as role_description, role.create_by as role_create_by,
+               role.data_scope  as role_data_scope,
-        role.update_by as role_update_by, role.create_time as role_create_time, role.update_time as role_update_time,
+               role.level       as role_level,
-        dept.dept_id as dept_id, dept.name as dept_name,
+               role.description as role_description,
-        menu.menu_id as menu_id, menu.title as menu_title, menu.permission as menu_permission
+               role.create_by   as role_create_by,
+               role.update_by   as role_update_by,
+               role.create_time as role_create_time,
+               role.update_time as role_update_time,
+               dept.dept_id     as dept_id,
+               dept.name        as dept_name,
+               menu.menu_id     as menu_id,
+               menu.title       as menu_title,
+               menu.permission  as menu_permission
         from sys_role role
                  left join sys_roles_menus srm on role.role_id = srm.role_id
                  left join sys_menu menu on menu.menu_id = srm.menu_id
@@ -91,19 +101,28 @@
         where role.role_id = #{roleId}
     </select>
     <select id="findRolesByUserId" resultMap="BaseResultMap">
-        SELECT
+        SELECT role.role_id     as role_role_id,
-        role.role_id as role_role_id, role.name as role_name, role.data_scope as role_data_scope,
+               role.name        as role_name,
-        role.level as role_level, role.description as role_description, role.create_by as role_create_by,
+               role.data_scope  as role_data_scope,
-        role.update_by as role_update_by, role.create_time as role_create_time, role.update_time as role_update_time,
+               role.level       as role_level,
-        dept.dept_id as dept_id, dept.name as dept_name,
+               role.description as role_description,
-        menu.menu_id as menu_id, menu.title as menu_title, menu.permission as menu_permission
+               role.create_by   as role_create_by,
+               role.update_by   as role_update_by,
+               role.create_time as role_create_time,
+               role.update_time as role_update_time,
+               dept.dept_id     as dept_id,
+               dept.name        as dept_name,
+               menu.menu_id     as menu_id,
+               menu.title       as menu_title,
+               menu.permission  as menu_permission
         from sys_role role
                  left join sys_roles_menus srm on role.role_id = srm.role_id
                  left join sys_menu menu on menu.menu_id = srm.menu_id
                  left join sys_roles_depts srd on role.role_id = srd.role_id
                  left join sys_dept dept on dept.dept_id = srd.dept_id
                  left join sys_users_roles ur on role.role_id = ur.role_id
-        WHERE role.role_id = ur.role_id AND ur.user_id = #{userId}
+        WHERE role.role_id = ur.role_id
+          AND ur.user_id = #{userId}
     </select>
     <select id="countRolesByDeptIds" resultType="int">
         select count(*)
@@ -115,6 +134,10 @@
         </foreach>
     </select>
     <select id="findRolesByMenuId" resultType="cn.odboy.model.system.domain.Role">
-        SELECT role.role_id as id FROM sys_role role, sys_roles_menus rm WHERE role.role_id = rm.role_id AND rm.menu_id = #{menuId}
+        SELECT role.role_id as id
+        FROM sys_role role,
+             sys_roles_menus rm
+        WHERE role.role_id = rm.role_id
+          AND rm.menu_id = #{menuId}
     </select>
 </mapper>

cutejava/cutejava-system/src/main/resources/mapper/RoleMenuMapper.xml

@@ -10,7 +10,8 @@
     </insert>
 
     <delete id="deleteByRoleId">
-        delete from sys_roles_menus
+        delete
+        from sys_roles_menus
         where role_id = #{roleId}
     </delete>
 
@@ -23,7 +24,8 @@
     </delete>
 
     <delete id="deleteByMenuId">
-        delete from sys_roles_menus
+        delete
+        from sys_roles_menus
         where menu_id = #{menuId}
     </delete>
 </mapper>

cutejava/cutejava-system/src/main/resources/mapper/UserJobMapper.xml

@@ -10,7 +10,8 @@
     </insert>
 
     <delete id="deleteByUserId">
-        delete from sys_users_jobs
+        delete
+        from sys_users_jobs
         where user_id = #{userId}
     </delete>
 

cutejava/cutejava-system/src/main/resources/mapper/UserMapper.xml

@@ -115,44 +115,70 @@
     </select>
 
     <select id="findByUsername" resultMap="BaseResultMap">
-        select
+        select u.password          user_password,
-        u.password user_password, u.is_admin user_is_admin,
+               u.is_admin          user_is_admin,
-        u.user_id as user_user_id, u.dept_id as user_dept_id, u.username as user_username,
+               u.user_id        as user_user_id,
-        u.nick_name as user_nick_name, u.email as user_email, u.phone as user_phone,
+               u.dept_id        as user_dept_id,
-        u.gender as user_gender, u.avatar_name as user_avatar_name, u.avatar_path as user_avatar_path,
+               u.username       as user_username,
-        u.enabled as user_enabled, u.pwd_reset_time as user_pwd_reset_time, u.create_by as user_create_by,
+               u.nick_name      as user_nick_name,
-        u.update_by as user_update_by, u.create_time as user_create_time, u.update_time as user_update_time,
+               u.email          as user_email,
-        d.dept_id as dept_id, d.name as dept_name
+               u.phone          as user_phone,
+               u.gender         as user_gender,
+               u.avatar_name    as user_avatar_name,
+               u.avatar_path    as user_avatar_path,
+               u.enabled        as user_enabled,
+               u.pwd_reset_time as user_pwd_reset_time,
+               u.create_by      as user_create_by,
+               u.update_by      as user_update_by,
+               u.create_time    as user_create_time,
+               u.update_time    as user_update_time,
+               d.dept_id        as dept_id,
+               d.name           as dept_name
         from sys_user u
                  left join sys_dept d on u.dept_id = d.dept_id
         where u.username = #{username}
     </select>
 
     <select id="findByEmail" resultType="cn.odboy.model.system.domain.User">
-        select user_id as id, username from sys_user
+        select user_id as id, username
+        from sys_user
         where email = #{email}
     </select>
 
     <select id="findByPhone" resultType="cn.odboy.model.system.domain.User">
-        select user_id as id, username from sys_user
+        select user_id as id, username
+        from sys_user
         where phone = #{phone}
     </select>
 
     <select id="findByRoleId" resultType="cn.odboy.model.system.domain.User">
-        SELECT u.user_id as id, u.username FROM sys_user u, sys_users_roles r
+        SELECT u.user_id as id, u.username
-        WHERE u.user_id = r.user_id AND r.role_id = #{roleId}
+        FROM sys_user u,
+             sys_users_roles r
+        WHERE u.user_id = r.user_id
+          AND r.role_id = #{roleId}
         group by u.user_id
     </select>
 
     <select id="findByRoleDeptId" resultType="cn.odboy.model.system.domain.User">
-        SELECT u.* FROM sys_user u, sys_users_roles r, sys_roles_depts d
+        SELECT u.*
-        WHERE u.user_id = r.user_id AND r.role_id = d.role_id AND d.dept_id = #{deptId}
+        FROM sys_user u,
+             sys_users_roles r,
+             sys_roles_depts d
+        WHERE u.user_id = r.user_id
+          AND r.role_id = d.role_id
+          AND d.dept_id = #{deptId}
         group by u.user_id
     </select>
 
     <select id="findByMenuId" resultType="cn.odboy.model.system.domain.User">
-        SELECT u.user_id as id, u.username FROM sys_user u, sys_users_roles ur, sys_roles_menus rm
+        SELECT u.user_id as id, u.username
-        WHERE u.user_id = ur.user_id AND ur.role_id = rm.role_id AND rm.menu_id = #{menuId}
+        FROM sys_user u,
+             sys_users_roles ur,
+             sys_roles_menus rm
+        WHERE u.user_id = ur.user_id
+          AND ur.role_id = rm.role_id
+          AND rm.menu_id = #{menuId}
         group by u.user_id
     </select>
 

cutejava/cutejava-system/src/main/resources/mapper/UserRoleMapper.xml

@@ -10,7 +10,8 @@
     </insert>
 
     <delete id="deleteByUserId">
-        delete from sys_users_roles
+        delete
+        from sys_users_roles
         where user_id = #{userId}
     </delete>
 

cutejava/cutejava-tools/src/main/java/cn/odboy/mapper/LocalStorageMapper.java

@@ -8,8 +8,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 @Mapper
 public interface LocalStorageMapper extends BaseMapper<LocalStorage> {
     IPage<LocalStorage> findLocalStoragePage(@Param("criteria") LocalStorageQueryCriteria criteria, Page<Object> page);

cutejava/cutejava-tools/src/main/java/cn/odboy/mapper/QiniuContentMapper.java

@@ -8,11 +8,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 
 @Mapper
 public interface QiniuContentMapper extends BaseMapper<QiniuContent> {
     QiniuContent findQiniuContentByName(@Param("name") String name);
+
     IPage<QiniuContent> findQiniuContentPage(@Param("criteria") QiniuQueryCriteria criteria, Page<Object> page);
 }

cutejava/cutejava-tools/src/main/java/cn/odboy/service/impl/LocalStorageServiceImpl.java

@@ -2,11 +2,11 @@ package cn.odboy.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.odboy.base.PageResult;
-import cn.odboy.properties.FileProperties;
 import cn.odboy.exception.BadRequestException;
 import cn.odboy.mapper.LocalStorageMapper;
 import cn.odboy.model.tools.domain.LocalStorage;
 import cn.odboy.model.tools.dto.LocalStorageQueryCriteria;
+import cn.odboy.properties.FileProperties;
 import cn.odboy.service.LocalStorageService;
 import cn.odboy.util.FileUtil;
 import cn.odboy.util.PageUtil;

cutejava/cutejava-tools/src/main/java/cn/odboy/service/impl/QiniuContentServiceImpl.java

@@ -52,7 +52,7 @@ public class QiniuContentServiceImpl extends ServiceImpl<QiniuContentMapper, Qin
 
     @Override
     public List<QiniuContent> queryAll(QiniuQueryCriteria criteria) {
-        return qiniuContentMapper.findQiniuContentPage(criteria,PageUtil.getCount(qiniuContentMapper)).getRecords();
+        return qiniuContentMapper.findQiniuContentPage(criteria, PageUtil.getCount(qiniuContentMapper)).getRecords();
     }
 
     @Override