feat: 重命名包名称

This commit is contained in:
bunny 2025-04-23 17:06:14 +08:00
parent efdbe0ef9d
commit 85d0189c96
47 changed files with 85 additions and 67 deletions

View File

@ -3,7 +3,7 @@ package cn.bunny.services.security.custom;
import cn.bunny.domain.constant.RedisUserConstant;
import cn.bunny.domain.system.entity.Power;
import cn.bunny.domain.system.entity.Role;
import cn.bunny.domain.system.vo.user.LoginVo;
import cn.bunny.domain.vo.LoginVo;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import cn.bunny.services.context.BaseContext;
import cn.bunny.services.mapper.system.PowerMapper;

View File

@ -1,7 +1,7 @@
package cn.bunny.services.utils;
import cn.bunny.domain.system.entity.AdminUser;
import cn.bunny.domain.system.vo.user.LoginVo;
import cn.bunny.domain.vo.LoginVo;
import cn.bunny.services.mapper.system.UserMapper;
import cn.bunny.services.utils.system.UserUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;

View File

@ -2,7 +2,11 @@ package cn.bunny.services.controller.system;
import cn.bunny.domain.system.dto.user.*;
import cn.bunny.domain.system.entity.AdminUser;
import cn.bunny.domain.system.vo.user.*;
import cn.bunny.domain.system.vo.user.AdminUserVo;
import cn.bunny.domain.system.vo.user.RefreshTokenVo;
import cn.bunny.domain.system.vo.user.SearchUserinfoVo;
import cn.bunny.domain.system.vo.user.UserVo;
import cn.bunny.domain.vo.LoginVo;
import cn.bunny.domain.vo.result.PageResult;
import cn.bunny.domain.vo.result.Result;
import cn.bunny.domain.vo.result.ResultCodeEnum;

View File

@ -10,7 +10,7 @@
<artifactId>domain</artifactId>
<packaging>jar</packaging>
<name>domain</name>
<name>domain-system</name>
<url>https://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -19,7 +19,7 @@
<dependencies>
<dependency>
<groupId>cn.bunny</groupId>
<artifactId>common-domain</artifactId>
<artifactId>domain-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
</dependencies>

View File

@ -7,8 +7,8 @@ import cn.bunny.domain.vo.result.ResultCodeEnum;
import cn.bunny.services.exception.AuthCustomerException;
import cn.bunny.services.service.configuration.ConfigurationService;
import com.alibaba.fastjson2.JSON;
import jakarta.annotation.Resource;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -20,7 +20,7 @@ import java.io.InputStream;
@Transactional
public class ConfigurationServiceImpl implements ConfigurationService {
@Autowired
@Resource
private RedisTemplate<String, Object> redisTemplate;
/**

View File

@ -15,9 +15,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -37,7 +37,7 @@ import java.util.Map;
@Transactional
public class EmailUsersServiceImpl extends ServiceImpl<EmailUsersMapper, EmailUsers> implements EmailUsersService {
@Autowired
@Resource
private EmailUsersMapper emailUsersMapper;
/**

View File

@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.beans.BeanUtils;
import org.springframework.cache.annotation.CacheEvict;
@ -56,11 +57,8 @@ import java.util.zip.ZipOutputStream;
@Transactional
public class I18nServiceImpl extends ServiceImpl<I18nMapper, I18n> implements I18nService {
private final I18nTypeMapper i18nTypeMapper;
public I18nServiceImpl(I18nTypeMapper i18nTypeMapper) {
this.i18nTypeMapper = i18nTypeMapper;
}
@Resource
private I18nTypeMapper i18nTypeMapper;
/**
* * 获取多语言内容

View File

@ -18,9 +18,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -38,7 +38,7 @@ import java.util.List;
@Transactional
public class MessageReceivedServiceImpl extends ServiceImpl<MessageReceivedMapper, MessageReceived> implements MessageReceivedService {
@Autowired
@Resource
private UserUtil userUtil;
/**

View File

@ -1,10 +1,10 @@
package cn.bunny.services.service.schedule.impl;
import cn.bunny.domain.quartz.vo.SchedulersOperationDto;
import cn.bunny.domain.quartz.dto.SchedulersAddDto;
import cn.bunny.domain.quartz.dto.SchedulersDto;
import cn.bunny.domain.quartz.dto.SchedulersUpdateDto;
import cn.bunny.domain.quartz.entity.Schedulers;
import cn.bunny.domain.quartz.vo.SchedulersOperationDto;
import cn.bunny.domain.quartz.vo.SchedulersVo;
import cn.bunny.domain.vo.result.PageResult;
import cn.bunny.domain.vo.result.ResultCodeEnum;
@ -16,10 +16,10 @@ import cn.bunny.services.service.schedule.SchedulersService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.quartz.*;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
@ -35,10 +35,10 @@ import java.util.*;
@Service
public class SchedulersServiceImpl extends ServiceImpl<SchedulersMapper, Schedulers> implements SchedulersService {
@Autowired
@Resource
private Scheduler scheduler;
@Autowired
@Resource
private AnnotationScanner annotationScanner;
/**

View File

@ -2,7 +2,11 @@ package cn.bunny.services.service.system;
import cn.bunny.domain.system.dto.user.*;
import cn.bunny.domain.system.entity.AdminUser;
import cn.bunny.domain.system.vo.user.*;
import cn.bunny.domain.system.vo.user.AdminUserVo;
import cn.bunny.domain.system.vo.user.RefreshTokenVo;
import cn.bunny.domain.system.vo.user.SearchUserinfoVo;
import cn.bunny.domain.system.vo.user.UserVo;
import cn.bunny.domain.vo.LoginVo;
import cn.bunny.domain.vo.result.PageResult;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;

View File

@ -14,8 +14,8 @@ import cn.bunny.services.service.system.DeptService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
@ -36,7 +36,7 @@ import java.util.stream.Collectors;
@Transactional
public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements DeptService {
@Autowired
@Resource
private UserDeptMapper userDeptMapper;
/**

View File

@ -21,10 +21,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import lombok.SneakyThrows;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
@ -55,13 +55,13 @@ public class FilesServiceImpl extends ServiceImpl<FilesMapper, Files> implements
@Value("${spring.servlet.multipart.max-file-size}")
private String maxFileSize;
@Autowired
@Resource
private MinioProperties properties;
@Autowired
@Resource
private MinioUtil minioUtil;
@Autowired
@Resource
private FilesMapper filesMapper;
/**

View File

@ -1,10 +1,10 @@
package cn.bunny.services.service.system.impl;
import cn.bunny.domain.system.entity.Power;
import cn.bunny.domain.system.dto.power.PowerAddDto;
import cn.bunny.domain.system.dto.power.PowerDto;
import cn.bunny.domain.system.dto.power.PowerUpdateBatchByParentIdDto;
import cn.bunny.domain.system.dto.power.PowerUpdateDto;
import cn.bunny.domain.system.entity.Power;
import cn.bunny.domain.system.vo.PowerVo;
import cn.bunny.domain.vo.result.PageResult;
import cn.bunny.domain.vo.result.ResultCodeEnum;
@ -17,9 +17,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
@ -39,7 +39,7 @@ import java.util.List;
@Transactional
public class PowerServiceImpl extends ServiceImpl<PowerMapper, Power> implements PowerService {
@Autowired
@Resource
private RolePowerMapper rolePowerMapper;
/**

View File

@ -1,9 +1,9 @@
package cn.bunny.services.service.system.impl;
import cn.bunny.domain.system.dto.AssignPowersToRoleDto;
import cn.bunny.domain.system.entity.AdminUser;
import cn.bunny.domain.system.entity.RolePower;
import cn.bunny.domain.system.entity.UserRole;
import cn.bunny.domain.system.dto.AssignPowersToRoleDto;
import cn.bunny.services.mapper.system.RolePowerMapper;
import cn.bunny.services.mapper.system.UserMapper;
import cn.bunny.services.mapper.system.UserRoleMapper;
@ -11,7 +11,7 @@ import cn.bunny.services.service.system.RolePowerService;
import cn.bunny.services.utils.system.RoleUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -29,13 +29,13 @@ import java.util.List;
@Transactional
public class RolePowerServiceImpl extends ServiceImpl<RolePowerMapper, RolePower> implements RolePowerService {
@Autowired
@Resource
private UserMapper userMapper;
@Autowired
@Resource
private RoleUtil roleUtil;
@Autowired
@Resource
private UserRoleMapper userRoleMapper;
/**

View File

@ -1,10 +1,10 @@
package cn.bunny.services.service.system.impl;
import cn.bunny.domain.system.entity.Role;
import cn.bunny.domain.system.entity.UserRole;
import cn.bunny.domain.system.dto.role.RoleAddDto;
import cn.bunny.domain.system.dto.role.RoleDto;
import cn.bunny.domain.system.dto.role.RoleUpdateDto;
import cn.bunny.domain.system.entity.Role;
import cn.bunny.domain.system.entity.UserRole;
import cn.bunny.domain.system.vo.RoleVo;
import cn.bunny.domain.vo.result.PageResult;
import cn.bunny.domain.vo.result.ResultCodeEnum;
@ -19,9 +19,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
@ -39,16 +39,16 @@ import java.util.List;
@Service
public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements RoleService {
@Autowired
@Resource
private UserRoleMapper userRoleMapper;
@Autowired
@Resource
private RolePowerMapper rolePowerMapper;
@Autowired
@Resource
private RouterRoleMapper routerRoleMapper;
@Autowired
@Resource
private RoleUtil roleUtil;
/**

View File

@ -1,11 +1,11 @@
package cn.bunny.services.service.system.impl;
import cn.bunny.domain.system.entity.Role;
import cn.bunny.domain.system.entity.Router;
import cn.bunny.domain.system.dto.router.RouterAddDto;
import cn.bunny.domain.system.dto.router.RouterManageDto;
import cn.bunny.domain.system.dto.router.RouterUpdateByIdWithRankDto;
import cn.bunny.domain.system.dto.router.RouterUpdateDto;
import cn.bunny.domain.system.entity.Role;
import cn.bunny.domain.system.entity.Router;
import cn.bunny.domain.system.vo.router.RouterManageVo;
import cn.bunny.domain.system.vo.router.RouterMeta;
import cn.bunny.domain.system.vo.router.UserRouterVo;
@ -26,8 +26,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -45,16 +45,16 @@ import java.util.stream.Collectors;
@Service
@Transactional
public class RouterServiceImpl extends ServiceImpl<RouterMapper, Router> implements RouterService {
@Autowired
@Resource
private RouterServiceUtil routerServiceUtil;
@Autowired
@Resource
private RoleMapper roleMapper;
@Autowired
@Resource
private RouterRoleMapper routerRoleMapper;
@Autowired
@Resource
private RolePowerMapper rolePowerMapper;
/**

View File

@ -4,7 +4,7 @@ import cn.bunny.domain.constant.RedisUserConstant;
import cn.bunny.domain.system.dto.user.AssignRolesToUsersDto;
import cn.bunny.domain.system.entity.AdminUser;
import cn.bunny.domain.system.entity.UserRole;
import cn.bunny.domain.system.vo.user.LoginVo;
import cn.bunny.domain.vo.LoginVo;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import cn.bunny.services.context.BaseContext;
import cn.bunny.services.exception.AuthCustomerException;
@ -14,7 +14,7 @@ import cn.bunny.services.service.system.UserRoleService;
import cn.bunny.services.utils.system.UserUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import jakarta.annotation.Resource;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -34,16 +34,16 @@ import java.util.concurrent.TimeUnit;
@Transactional
public class UserRoleServiceImpl extends ServiceImpl<UserRoleMapper, UserRole> implements UserRoleService {
@Autowired
@Resource
private UserRoleMapper userRoleMapper;
@Autowired
@Resource
private UserUtil userUtil;
@Autowired
@Resource
private UserMapper userMapper;
@Autowired
@Resource
private RedisTemplate<String, Object> redisTemplate;
/**

View File

@ -12,8 +12,12 @@ import cn.bunny.domain.system.dto.user.*;
import cn.bunny.domain.system.entity.AdminUser;
import cn.bunny.domain.system.entity.Role;
import cn.bunny.domain.system.entity.UserDept;
import cn.bunny.domain.system.vo.user.*;
import cn.bunny.domain.system.vo.user.AdminUserVo;
import cn.bunny.domain.system.vo.user.RefreshTokenVo;
import cn.bunny.domain.system.vo.user.SearchUserinfoVo;
import cn.bunny.domain.system.vo.user.UserVo;
import cn.bunny.domain.views.ViewUserDept;
import cn.bunny.domain.vo.LoginVo;
import cn.bunny.domain.vo.result.PageResult;
import cn.bunny.domain.vo.result.ResultCodeEnum;
import cn.bunny.services.context.BaseContext;
@ -71,24 +75,34 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, AdminUser> implemen
@Resource
private UserUtil userUtil;
@Resource
private ConcreteSenderEmailTemplate concreteSenderEmailTemplate;
@Resource
private RedisTemplate<String, Object> redisTemplate;
@Resource
private FilesService filesService;
@Resource
private UserDeptMapper userDeptMapper;
@Resource
private UserRoleMapper userRoleMapper;
@Resource
private UserLoginLogMapper userLoginLogMapper;
@Resource
private EmailTemplateMapper emailTemplateMapper;
@Resource
private RoleMapper roleMapper;
@Resource
private UserMapper userMapper;
@Resource
private PasswordEncoder passwordEncoder;

View File

@ -7,7 +7,7 @@ import cn.bunny.domain.log.entity.UserLoginLog;
import cn.bunny.domain.system.entity.AdminUser;
import cn.bunny.domain.system.entity.Power;
import cn.bunny.domain.system.entity.Role;
import cn.bunny.domain.system.vo.user.LoginVo;
import cn.bunny.domain.vo.LoginVo;
import cn.bunny.services.exception.AuthCustomerException;
import cn.bunny.services.mapper.log.UserLoginLogMapper;
import cn.bunny.services.mapper.system.PowerMapper;

View File

@ -20,7 +20,7 @@
<dependencies>
<dependency>
<groupId>cn.bunny</groupId>
<artifactId>domain</artifactId>
<artifactId>domain-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>

View File

@ -1,7 +1,7 @@
package cn.bunny.services.context;
import cn.bunny.domain.system.vo.user.LoginVo;
import cn.bunny.domain.vo.LoginVo;
public class BaseContext {
private static final ThreadLocal<Long> userId = new ThreadLocal<>();

View File

@ -7,7 +7,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>common-domain</artifactId>
<artifactId>domain-common</artifactId>
<packaging>jar</packaging>
<name>common-domain</name>

View File

@ -1,6 +1,5 @@
package cn.bunny.domain.system.vo.user;
package cn.bunny.domain.vo;
import cn.bunny.domain.vo.BaseVo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;

View File

@ -2,10 +2,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>generator-code-server</artifactId>
<version>3.4.3</version>
<relativePath>../pom.xml</relativePath>
<groupId>cn.bunny</groupId>
<artifactId>common</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>generator-code</artifactId>

View File

@ -14,7 +14,7 @@
<url>https://maven.apache.org</url>
<modules>
<module>common-domain</module>
<module>domain-common</module>
<module>common-config</module>
<module>generator-code</module>
</modules>