i18nList = list();
- if (type.equals(FileType.JSON)) {
- I18nUtil.writeJson(i18nList, zipOutputStream);
- } else if (type.equals(FileType.EXCEL)) {
+ // 类型是Excel写入Excel
+ if (type.equals(FileType.EXCEL)) {
I18nUtil.writeExcel(i18nList, zipOutputStream);
}
+ // 其他格式写入JSON
+ else {
+ I18nUtil.writeJson(i18nList, zipOutputStream);
+ }
} catch (IOException e) {
throw new RuntimeException(e);
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java
similarity index 90%
rename from auth-admin/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java
rename to service/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java
index 7c4a48f..0c615eb 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java
+++ b/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java
@@ -1,11 +1,11 @@
package cn.bunny.services.service.configuration.impl;
-import cn.bunny.domain.i18n.dto.I18nTypeAddDto;
-import cn.bunny.domain.i18n.dto.I18nTypeDto;
-import cn.bunny.domain.i18n.dto.I18nTypeUpdateDto;
-import cn.bunny.domain.i18n.entity.I18nType;
-import cn.bunny.domain.i18n.vo.I18nTypeVo;
-import cn.bunny.domain.vo.result.ResultCodeEnum;
+import cn.bunny.services.domain.system.i18n.dto.I18nTypeAddDto;
+import cn.bunny.services.domain.system.i18n.dto.I18nTypeDto;
+import cn.bunny.services.domain.system.i18n.dto.I18nTypeUpdateDto;
+import cn.bunny.services.domain.system.i18n.entity.I18nType;
+import cn.bunny.services.domain.system.i18n.vo.I18nTypeVo;
+import cn.bunny.services.domain.common.vo.result.ResultCodeEnum;
import cn.bunny.services.exception.AuthCustomerException;
import cn.bunny.services.mapper.configuration.I18nTypeMapper;
import cn.bunny.services.service.configuration.I18nTypeService;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java
similarity index 88%
rename from auth-admin/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java
rename to service/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java
index 823537f..c4ebf51 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java
+++ b/service/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java
@@ -1,12 +1,12 @@
package cn.bunny.services.service.configuration.impl;
-import cn.bunny.domain.menuIcon.dto.MenuIconAddDto;
-import cn.bunny.domain.menuIcon.dto.MenuIconDto;
-import cn.bunny.domain.menuIcon.dto.MenuIconUpdateDto;
-import cn.bunny.domain.menuIcon.entity.MenuIcon;
-import cn.bunny.domain.menuIcon.vo.MenuIconVo;
-import cn.bunny.domain.vo.result.PageResult;
-import cn.bunny.domain.vo.result.ResultCodeEnum;
+import cn.bunny.services.domain.system.menuIcon.dto.MenuIconAddDto;
+import cn.bunny.services.domain.system.menuIcon.dto.MenuIconDto;
+import cn.bunny.services.domain.system.menuIcon.dto.MenuIconUpdateDto;
+import cn.bunny.services.domain.system.menuIcon.entity.MenuIcon;
+import cn.bunny.services.domain.system.menuIcon.vo.MenuIconVo;
+import cn.bunny.services.domain.common.vo.result.PageResult;
+import cn.bunny.services.domain.common.vo.result.ResultCodeEnum;
import cn.bunny.services.exception.AuthCustomerException;
import cn.bunny.services.mapper.configuration.MenuIconMapper;
import cn.bunny.services.service.configuration.MenuIconService;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java b/service/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java
similarity index 74%
rename from auth-admin/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java
rename to service/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java
index 2a2d128..fc1abca 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java
+++ b/service/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java
@@ -1,9 +1,9 @@
package cn.bunny.services.service.log;
-import cn.bunny.domain.log.dto.ScheduleExecuteLogDto;
-import cn.bunny.domain.log.entity.ScheduleExecuteLog;
-import cn.bunny.domain.log.vo.ScheduleExecuteLogVo;
-import cn.bunny.domain.vo.result.PageResult;
+import cn.bunny.services.domain.system.log.dto.ScheduleExecuteLogDto;
+import cn.bunny.services.domain.system.log.entity.ScheduleExecuteLog;
+import cn.bunny.services.domain.system.log.vo.ScheduleExecuteLogVo;
+import cn.bunny.services.domain.common.vo.result.PageResult;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java b/service/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java
similarity index 75%
rename from auth-admin/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java
rename to service/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java
index 2363eea..4d4aead 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java
+++ b/service/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java
@@ -1,10 +1,10 @@
package cn.bunny.services.service.log;
-import cn.bunny.domain.log.dto.UserLoginLogDto;
-import cn.bunny.domain.log.entity.UserLoginLog;
-import cn.bunny.domain.log.vo.UserLoginLogLocalVo;
-import cn.bunny.domain.log.vo.UserLoginLogVo;
-import cn.bunny.domain.vo.result.PageResult;
+import cn.bunny.services.domain.system.log.dto.UserLoginLogDto;
+import cn.bunny.services.domain.system.log.entity.UserLoginLog;
+import cn.bunny.services.domain.system.log.vo.UserLoginLogLocalVo;
+import cn.bunny.services.domain.system.log.vo.UserLoginLogVo;
+import cn.bunny.services.domain.common.vo.result.PageResult;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java b/service/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java
similarity index 86%
rename from auth-admin/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java
rename to service/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java
index 0efe3df..211adad 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java
+++ b/service/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java
@@ -1,9 +1,9 @@
package cn.bunny.services.service.log.impl;
-import cn.bunny.domain.log.dto.ScheduleExecuteLogDto;
-import cn.bunny.domain.log.entity.ScheduleExecuteLog;
-import cn.bunny.domain.log.vo.ScheduleExecuteLogVo;
-import cn.bunny.domain.vo.result.PageResult;
+import cn.bunny.services.domain.system.log.dto.ScheduleExecuteLogDto;
+import cn.bunny.services.domain.system.log.entity.ScheduleExecuteLog;
+import cn.bunny.services.domain.system.log.vo.ScheduleExecuteLogVo;
+import cn.bunny.services.domain.common.vo.result.PageResult;
import cn.bunny.services.mapper.log.ScheduleExecuteLogMapper;
import cn.bunny.services.service.log.ScheduleExecuteLogService;
import com.baomidou.mybatisplus.core.metadata.IPage;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java b/service/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java
similarity index 90%
rename from auth-admin/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java
rename to service/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java
index 6204f12..9f773f5 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java
+++ b/service/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java
@@ -1,10 +1,10 @@
package cn.bunny.services.service.log.impl;
-import cn.bunny.domain.log.dto.UserLoginLogDto;
-import cn.bunny.domain.log.entity.UserLoginLog;
-import cn.bunny.domain.log.vo.UserLoginLogLocalVo;
-import cn.bunny.domain.log.vo.UserLoginLogVo;
-import cn.bunny.domain.vo.result.PageResult;
+import cn.bunny.services.domain.system.log.dto.UserLoginLogDto;
+import cn.bunny.services.domain.system.log.entity.UserLoginLog;
+import cn.bunny.services.domain.system.log.vo.UserLoginLogLocalVo;
+import cn.bunny.services.domain.system.log.vo.UserLoginLogVo;
+import cn.bunny.services.domain.common.vo.result.PageResult;
import cn.bunny.services.context.BaseContext;
import cn.bunny.services.mapper.log.UserLoginLogMapper;
import cn.bunny.services.service.log.UserLoginLogService;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java b/service/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java
similarity index 72%
rename from auth-admin/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java
rename to service/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java
index 14c4c3a..9139275 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java
+++ b/service/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java
@@ -1,13 +1,13 @@
package cn.bunny.services.service.message;
-import cn.bunny.domain.message.dto.MessageReceivedDto;
-import cn.bunny.domain.message.dto.MessageReceivedUpdateDto;
-import cn.bunny.domain.message.dto.MessageUserDto;
-import cn.bunny.domain.message.entity.Message;
-import cn.bunny.domain.message.entity.MessageReceived;
-import cn.bunny.domain.message.vo.MessageReceivedWithMessageVo;
-import cn.bunny.domain.message.vo.MessageUserVo;
-import cn.bunny.domain.vo.result.PageResult;
+import cn.bunny.services.domain.system.message.dto.MessageReceivedDto;
+import cn.bunny.services.domain.system.message.dto.MessageReceivedUpdateDto;
+import cn.bunny.services.domain.system.message.dto.MessageUserDto;
+import cn.bunny.services.domain.system.message.entity.Message;
+import cn.bunny.services.domain.system.message.entity.MessageReceived;
+import cn.bunny.services.domain.system.message.vo.MessageReceivedWithMessageVo;
+import cn.bunny.services.domain.system.message.vo.MessageUserVo;
+import cn.bunny.services.domain.common.vo.result.PageResult;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import jakarta.validation.Valid;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/message/MessageService.java b/service/src/main/java/cn/bunny/services/service/message/MessageService.java
similarity index 73%
rename from auth-admin/src/main/java/cn/bunny/services/service/message/MessageService.java
rename to service/src/main/java/cn/bunny/services/service/message/MessageService.java
index b3f6e17..e81a87c 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/message/MessageService.java
+++ b/service/src/main/java/cn/bunny/services/service/message/MessageService.java
@@ -1,13 +1,13 @@
package cn.bunny.services.service.message;
-import cn.bunny.domain.message.dto.MessageAddDto;
-import cn.bunny.domain.message.dto.MessageDto;
-import cn.bunny.domain.message.dto.MessageUpdateDto;
-import cn.bunny.domain.message.entity.Message;
-import cn.bunny.domain.message.vo.MessageDetailVo;
-import cn.bunny.domain.message.vo.MessageReceivedWithUserVo;
-import cn.bunny.domain.message.vo.MessageVo;
-import cn.bunny.domain.vo.result.PageResult;
+import cn.bunny.services.domain.system.message.dto.MessageAddDto;
+import cn.bunny.services.domain.system.message.dto.MessageDto;
+import cn.bunny.services.domain.system.message.dto.MessageUpdateDto;
+import cn.bunny.services.domain.system.message.entity.Message;
+import cn.bunny.services.domain.system.message.vo.MessageDetailVo;
+import cn.bunny.services.domain.system.message.vo.MessageReceivedWithUserVo;
+import cn.bunny.services.domain.system.message.vo.MessageVo;
+import cn.bunny.services.domain.common.vo.result.PageResult;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import jakarta.validation.Valid;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/message/MessageTypeService.java b/service/src/main/java/cn/bunny/services/service/message/MessageTypeService.java
similarity index 74%
rename from auth-admin/src/main/java/cn/bunny/services/service/message/MessageTypeService.java
rename to service/src/main/java/cn/bunny/services/service/message/MessageTypeService.java
index ddb05c9..b08aecf 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/message/MessageTypeService.java
+++ b/service/src/main/java/cn/bunny/services/service/message/MessageTypeService.java
@@ -1,11 +1,11 @@
package cn.bunny.services.service.message;
-import cn.bunny.domain.message.dto.MessageTypeAddDto;
-import cn.bunny.domain.message.dto.MessageTypeDto;
-import cn.bunny.domain.message.dto.MessageTypeUpdateDto;
-import cn.bunny.domain.message.entity.MessageType;
-import cn.bunny.domain.message.vo.MessageTypeVo;
-import cn.bunny.domain.vo.result.PageResult;
+import cn.bunny.services.domain.system.message.dto.MessageTypeAddDto;
+import cn.bunny.services.domain.system.message.dto.MessageTypeDto;
+import cn.bunny.services.domain.system.message.dto.MessageTypeUpdateDto;
+import cn.bunny.services.domain.system.message.entity.MessageType;
+import cn.bunny.services.domain.system.message.vo.MessageTypeVo;
+import cn.bunny.services.domain.common.vo.result.PageResult;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import jakarta.validation.Valid;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java b/service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java
similarity index 90%
rename from auth-admin/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java
rename to service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java
index be15da2..ca78f0c 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java
+++ b/service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java
@@ -1,14 +1,14 @@
package cn.bunny.services.service.message.impl;
-import cn.bunny.domain.message.dto.MessageReceivedDto;
-import cn.bunny.domain.message.dto.MessageReceivedUpdateDto;
-import cn.bunny.domain.message.dto.MessageUserDto;
-import cn.bunny.domain.message.entity.Message;
-import cn.bunny.domain.message.entity.MessageReceived;
-import cn.bunny.domain.message.vo.MessageReceivedWithMessageVo;
-import cn.bunny.domain.message.vo.MessageUserVo;
-import cn.bunny.domain.vo.result.PageResult;
-import cn.bunny.domain.vo.result.ResultCodeEnum;
+import cn.bunny.services.domain.system.message.dto.MessageReceivedDto;
+import cn.bunny.services.domain.system.message.dto.MessageReceivedUpdateDto;
+import cn.bunny.services.domain.system.message.dto.MessageUserDto;
+import cn.bunny.services.domain.system.message.entity.Message;
+import cn.bunny.services.domain.system.message.entity.MessageReceived;
+import cn.bunny.services.domain.system.message.vo.MessageReceivedWithMessageVo;
+import cn.bunny.services.domain.system.message.vo.MessageUserVo;
+import cn.bunny.services.domain.common.vo.result.PageResult;
+import cn.bunny.services.domain.common.vo.result.ResultCodeEnum;
import cn.bunny.services.context.BaseContext;
import cn.bunny.services.exception.AuthCustomerException;
import cn.bunny.services.mapper.message.MessageReceivedMapper;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java b/service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java
similarity index 91%
rename from auth-admin/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java
rename to service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java
index c88c623..64c67f0 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java
+++ b/service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java
@@ -1,17 +1,17 @@
package cn.bunny.services.service.message.impl;
-import cn.bunny.domain.entity.BaseEntity;
-import cn.bunny.domain.message.dto.MessageAddDto;
-import cn.bunny.domain.message.dto.MessageDto;
-import cn.bunny.domain.message.dto.MessageUpdateDto;
-import cn.bunny.domain.message.entity.Message;
-import cn.bunny.domain.message.entity.MessageReceived;
-import cn.bunny.domain.message.vo.MessageDetailVo;
-import cn.bunny.domain.message.vo.MessageReceivedWithMessageVo;
-import cn.bunny.domain.message.vo.MessageReceivedWithUserVo;
-import cn.bunny.domain.message.vo.MessageVo;
-import cn.bunny.domain.vo.result.PageResult;
-import cn.bunny.domain.vo.result.ResultCodeEnum;
+import cn.bunny.services.domain.common.entity.BaseEntity;
+import cn.bunny.services.domain.system.message.dto.MessageAddDto;
+import cn.bunny.services.domain.system.message.dto.MessageDto;
+import cn.bunny.services.domain.system.message.dto.MessageUpdateDto;
+import cn.bunny.services.domain.system.message.entity.Message;
+import cn.bunny.services.domain.system.message.entity.MessageReceived;
+import cn.bunny.services.domain.system.message.vo.MessageDetailVo;
+import cn.bunny.services.domain.system.message.vo.MessageReceivedWithMessageVo;
+import cn.bunny.services.domain.system.message.vo.MessageReceivedWithUserVo;
+import cn.bunny.services.domain.system.message.vo.MessageVo;
+import cn.bunny.services.domain.common.vo.result.PageResult;
+import cn.bunny.services.domain.common.vo.result.ResultCodeEnum;
import cn.bunny.services.context.BaseContext;
import cn.bunny.services.exception.AuthCustomerException;
import cn.bunny.services.mapper.message.MessageMapper;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java b/service/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java
similarity index 87%
rename from auth-admin/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java
rename to service/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java
index 10bceba..a5cbede 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java
+++ b/service/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java
@@ -1,11 +1,11 @@
package cn.bunny.services.service.message.impl;
-import cn.bunny.domain.message.dto.MessageTypeAddDto;
-import cn.bunny.domain.message.dto.MessageTypeDto;
-import cn.bunny.domain.message.dto.MessageTypeUpdateDto;
-import cn.bunny.domain.message.entity.MessageType;
-import cn.bunny.domain.message.vo.MessageTypeVo;
-import cn.bunny.domain.vo.result.PageResult;
+import cn.bunny.services.domain.system.message.dto.MessageTypeAddDto;
+import cn.bunny.services.domain.system.message.dto.MessageTypeDto;
+import cn.bunny.services.domain.system.message.dto.MessageTypeUpdateDto;
+import cn.bunny.services.domain.system.message.entity.MessageType;
+import cn.bunny.services.domain.system.message.vo.MessageTypeVo;
+import cn.bunny.services.domain.common.vo.result.PageResult;
import cn.bunny.services.mapper.message.MessageTypeMapper;
import cn.bunny.services.service.message.MessageTypeService;
import com.baomidou.mybatisplus.core.metadata.IPage;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java b/service/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java
similarity index 75%
rename from auth-admin/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java
rename to service/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java
index e7bf7c4..de469ce 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java
+++ b/service/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java
@@ -1,11 +1,11 @@
package cn.bunny.services.service.schedule;
-import cn.bunny.domain.quartz.dto.SchedulersGroupAddDto;
-import cn.bunny.domain.quartz.dto.SchedulersGroupDto;
-import cn.bunny.domain.quartz.dto.SchedulersGroupUpdateDto;
-import cn.bunny.domain.quartz.entity.SchedulersGroup;
-import cn.bunny.domain.quartz.vo.SchedulersGroupVo;
-import cn.bunny.domain.vo.result.PageResult;
+import cn.bunny.services.domain.system.quartz.dto.SchedulersGroupAddDto;
+import cn.bunny.services.domain.system.quartz.dto.SchedulersGroupDto;
+import cn.bunny.services.domain.system.quartz.dto.SchedulersGroupUpdateDto;
+import cn.bunny.services.domain.system.quartz.entity.SchedulersGroup;
+import cn.bunny.services.domain.system.quartz.vo.SchedulersGroupVo;
+import cn.bunny.services.domain.common.vo.result.PageResult;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import jakarta.validation.Valid;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java b/service/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java
similarity index 72%
rename from auth-admin/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java
rename to service/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java
index 511eb83..2c96333 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java
+++ b/service/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java
@@ -1,18 +1,15 @@
package cn.bunny.services.service.schedule;
-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.SchedulersVo;
-import cn.bunny.domain.vo.result.PageResult;
+import cn.bunny.services.domain.common.vo.result.PageResult;
+import cn.bunny.services.domain.system.quartz.dto.SchedulersAddDto;
+import cn.bunny.services.domain.system.quartz.dto.SchedulersDto;
+import cn.bunny.services.domain.system.quartz.dto.SchedulersUpdateDto;
+import cn.bunny.services.domain.system.quartz.entity.Schedulers;
+import cn.bunny.services.domain.system.quartz.vo.SchedulersVo;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import jakarta.validation.Valid;
-import java.util.List;
-import java.util.Map;
-
/**
*
* Schedulers视图 服务类
@@ -58,13 +55,6 @@ public interface SchedulersService extends IService {
*/
void deleteSchedulers(SchedulersUpdateDto dto);
- /**
- * * 获取所有可用调度任务
- *
- * @return 所有调度任务内容
- */
- List> getScheduleJobList();
-
/**
* 更新任务
*
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java b/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java
similarity index 87%
rename from auth-admin/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java
rename to service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java
index 810012a..b0b2c10 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java
+++ b/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java
@@ -1,11 +1,11 @@
package cn.bunny.services.service.schedule.impl;
-import cn.bunny.domain.quartz.dto.SchedulersGroupAddDto;
-import cn.bunny.domain.quartz.dto.SchedulersGroupDto;
-import cn.bunny.domain.quartz.dto.SchedulersGroupUpdateDto;
-import cn.bunny.domain.quartz.entity.SchedulersGroup;
-import cn.bunny.domain.quartz.vo.SchedulersGroupVo;
-import cn.bunny.domain.vo.result.PageResult;
+import cn.bunny.services.domain.system.quartz.dto.SchedulersGroupAddDto;
+import cn.bunny.services.domain.system.quartz.dto.SchedulersGroupDto;
+import cn.bunny.services.domain.system.quartz.dto.SchedulersGroupUpdateDto;
+import cn.bunny.services.domain.system.quartz.entity.SchedulersGroup;
+import cn.bunny.services.domain.system.quartz.vo.SchedulersGroupVo;
+import cn.bunny.services.domain.common.vo.result.PageResult;
import cn.bunny.services.mapper.schedule.SchedulersGroupMapper;
import cn.bunny.services.service.schedule.SchedulersGroupService;
import com.baomidou.mybatisplus.core.metadata.IPage;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java b/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java
similarity index 80%
rename from auth-admin/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java
rename to service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java
index 1a8a998..405d101 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java
+++ b/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java
@@ -1,14 +1,12 @@
package cn.bunny.services.service.schedule.impl;
-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.SchedulersVo;
-import cn.bunny.domain.vo.result.PageResult;
-import cn.bunny.domain.vo.result.ResultCodeEnum;
-import cn.bunny.services.aop.annotation.QuartzSchedulers;
-import cn.bunny.services.aop.scanner.AnnotationScanner;
+import cn.bunny.services.domain.common.vo.result.PageResult;
+import cn.bunny.services.domain.common.vo.result.ResultCodeEnum;
+import cn.bunny.services.domain.system.quartz.dto.SchedulersAddDto;
+import cn.bunny.services.domain.system.quartz.dto.SchedulersDto;
+import cn.bunny.services.domain.system.quartz.dto.SchedulersUpdateDto;
+import cn.bunny.services.domain.system.quartz.entity.Schedulers;
+import cn.bunny.services.domain.system.quartz.vo.SchedulersVo;
import cn.bunny.services.exception.AuthCustomerException;
import cn.bunny.services.mapper.schedule.SchedulersMapper;
import cn.bunny.services.service.schedule.SchedulersService;
@@ -21,7 +19,8 @@ import org.quartz.*;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
/**
*
@@ -63,32 +62,6 @@ public class SchedulersServiceImpl extends ServiceImpl> getScheduleJobList() {
- // 通过扫描注解拿到注解列表，反射拿到类信息和注解上标注的内容信息
- Set> classesWithAnnotation = AnnotationScanner.getClassesWithAnnotation(QuartzSchedulers.class);
- return classesWithAnnotation.stream().map(cls -> {
- Map hashMap = new HashMap<>();
-
- // 调度器引用路径
- String classReference = cls.getName();
- // 调度器详情
- String description = cls.getAnnotation(QuartzSchedulers.class).description();
- // 调度器类型
- String type = cls.getAnnotation(QuartzSchedulers.class).type();
-
- hashMap.put("value", classReference);
- hashMap.put("label", description);
- hashMap.put("type", type);
- return hashMap;
- }).toList();
- }
-
/**
* 更新任务
*
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/system/DeptService.java b/service/src/main/java/cn/bunny/services/service/system/DeptService.java
similarity index 73%
rename from auth-admin/src/main/java/cn/bunny/services/service/system/DeptService.java
rename to service/src/main/java/cn/bunny/services/service/system/DeptService.java
index bd9c28f..2119a42 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/system/DeptService.java
+++ b/service/src/main/java/cn/bunny/services/service/system/DeptService.java
@@ -1,11 +1,11 @@
package cn.bunny.services.service.system;
-import cn.bunny.domain.system.dto.dept.DeptAddDto;
-import cn.bunny.domain.system.dto.dept.DeptDto;
-import cn.bunny.domain.system.dto.dept.DeptUpdateDto;
-import cn.bunny.domain.system.entity.Dept;
-import cn.bunny.domain.system.vo.DeptVo;
-import cn.bunny.domain.vo.result.PageResult;
+import cn.bunny.services.domain.system.system.dto.dept.DeptAddDto;
+import cn.bunny.services.domain.system.system.dto.dept.DeptDto;
+import cn.bunny.services.domain.system.system.dto.dept.DeptUpdateDto;
+import cn.bunny.services.domain.system.system.entity.Dept;
+import cn.bunny.services.domain.system.system.vo.DeptVo;
+import cn.bunny.services.domain.common.vo.result.PageResult;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import jakarta.validation.Valid;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/system/FilesService.java b/service/src/main/java/cn/bunny/services/service/system/FilesService.java
similarity index 75%
rename from auth-admin/src/main/java/cn/bunny/services/service/system/FilesService.java
rename to service/src/main/java/cn/bunny/services/service/system/FilesService.java
index 3ee52a9..84efb0b 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/system/FilesService.java
+++ b/service/src/main/java/cn/bunny/services/service/system/FilesService.java
@@ -1,13 +1,13 @@
package cn.bunny.services.service.system;
-import cn.bunny.domain.files.dto.FileUploadDto;
-import cn.bunny.domain.files.dto.FilesAddDto;
-import cn.bunny.domain.files.dto.FilesDto;
-import cn.bunny.domain.files.dto.FilesUpdateDto;
-import cn.bunny.domain.files.entity.Files;
-import cn.bunny.domain.files.vo.FileInfoVo;
-import cn.bunny.domain.files.vo.FilesVo;
-import cn.bunny.domain.vo.result.PageResult;
+import cn.bunny.services.domain.system.files.dto.FileUploadDto;
+import cn.bunny.services.domain.system.files.dto.FilesAddDto;
+import cn.bunny.services.domain.system.files.dto.FilesDto;
+import cn.bunny.services.domain.system.files.dto.FilesUpdateDto;
+import cn.bunny.services.domain.system.files.entity.Files;
+import cn.bunny.services.domain.system.files.vo.FileInfoVo;
+import cn.bunny.services.domain.system.files.vo.FilesVo;
+import cn.bunny.services.domain.common.vo.result.PageResult;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import jakarta.validation.Valid;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/system/PermissionService.java b/service/src/main/java/cn/bunny/services/service/system/PermissionService.java
similarity index 77%
rename from auth-admin/src/main/java/cn/bunny/services/service/system/PermissionService.java
rename to service/src/main/java/cn/bunny/services/service/system/PermissionService.java
index 83a8f53..006cd41 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/system/PermissionService.java
+++ b/service/src/main/java/cn/bunny/services/service/system/PermissionService.java
@@ -1,12 +1,12 @@
package cn.bunny.services.service.system;
-import cn.bunny.domain.system.dto.power.PermissionAddDto;
-import cn.bunny.domain.system.dto.power.PermissionDto;
-import cn.bunny.domain.system.dto.power.PermissionUpdateBatchByParentIdDto;
-import cn.bunny.domain.system.dto.power.PermissionUpdateDto;
-import cn.bunny.domain.system.entity.Permission;
-import cn.bunny.domain.system.vo.PermissionVo;
-import cn.bunny.domain.vo.result.PageResult;
+import cn.bunny.services.domain.common.vo.result.PageResult;
+import cn.bunny.services.domain.system.system.dto.power.PermissionAddDto;
+import cn.bunny.services.domain.system.system.dto.power.PermissionDto;
+import cn.bunny.services.domain.system.system.dto.power.PermissionUpdateBatchByParentIdDto;
+import cn.bunny.services.domain.system.system.dto.power.PermissionUpdateDto;
+import cn.bunny.services.domain.system.system.entity.Permission;
+import cn.bunny.services.domain.system.system.vo.PermissionVo;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import jakarta.validation.Valid;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/system/RolePermissionService.java b/service/src/main/java/cn/bunny/services/service/system/RolePermissionService.java
similarity index 82%
rename from auth-admin/src/main/java/cn/bunny/services/service/system/RolePermissionService.java
rename to service/src/main/java/cn/bunny/services/service/system/RolePermissionService.java
index fa20024..37ed668 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/system/RolePermissionService.java
+++ b/service/src/main/java/cn/bunny/services/service/system/RolePermissionService.java
@@ -1,7 +1,7 @@
package cn.bunny.services.service.system;
-import cn.bunny.domain.system.dto.AssignPowersToRoleDto;
-import cn.bunny.domain.system.entity.RolePermission;
+import cn.bunny.services.domain.system.system.dto.AssignPowersToRoleDto;
+import cn.bunny.services.domain.system.system.entity.RolePermission;
import com.baomidou.mybatisplus.extension.service.IService;
import jakarta.validation.Valid;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/system/RoleService.java b/service/src/main/java/cn/bunny/services/service/system/RoleService.java
similarity index 78%
rename from auth-admin/src/main/java/cn/bunny/services/service/system/RoleService.java
rename to service/src/main/java/cn/bunny/services/service/system/RoleService.java
index 1005c53..4f4b803 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/system/RoleService.java
+++ b/service/src/main/java/cn/bunny/services/service/system/RoleService.java
@@ -1,11 +1,11 @@
package cn.bunny.services.service.system;
-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.vo.RoleVo;
-import cn.bunny.domain.vo.result.PageResult;
+import cn.bunny.services.domain.system.system.dto.role.RoleAddDto;
+import cn.bunny.services.domain.system.system.dto.role.RoleDto;
+import cn.bunny.services.domain.system.system.dto.role.RoleUpdateDto;
+import cn.bunny.services.domain.system.system.entity.Role;
+import cn.bunny.services.domain.system.system.vo.RoleVo;
+import cn.bunny.services.domain.common.vo.result.PageResult;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import jakarta.validation.Valid;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/system/RouterRoleService.java b/service/src/main/java/cn/bunny/services/service/system/RouterRoleService.java
similarity index 90%
rename from auth-admin/src/main/java/cn/bunny/services/service/system/RouterRoleService.java
rename to service/src/main/java/cn/bunny/services/service/system/RouterRoleService.java
index e453362..6e0d8a4 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/system/RouterRoleService.java
+++ b/service/src/main/java/cn/bunny/services/service/system/RouterRoleService.java
@@ -1,6 +1,6 @@
package cn.bunny.services.service.system;
-import cn.bunny.domain.system.entity.RouterRole;
+import cn.bunny.services.domain.system.system.entity.RouterRole;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/system/RouterService.java b/service/src/main/java/cn/bunny/services/service/system/RouterService.java
similarity index 72%
rename from auth-admin/src/main/java/cn/bunny/services/service/system/RouterService.java
rename to service/src/main/java/cn/bunny/services/service/system/RouterService.java
index 7df925c..a128c2e 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/system/RouterService.java
+++ b/service/src/main/java/cn/bunny/services/service/system/RouterService.java
@@ -1,10 +1,10 @@
package cn.bunny.services.service.system;
-import cn.bunny.domain.system.dto.router.RouterAddDto;
-import cn.bunny.domain.system.dto.router.RouterUpdateDto;
-import cn.bunny.domain.system.entity.router.Router;
-import cn.bunny.domain.system.vo.router.RouterManageVo;
-import cn.bunny.domain.system.vo.router.WebUserRouterVo;
+import cn.bunny.services.domain.system.system.dto.router.RouterAddDto;
+import cn.bunny.services.domain.system.system.dto.router.RouterUpdateDto;
+import cn.bunny.services.domain.system.system.entity.router.Router;
+import cn.bunny.services.domain.system.system.vo.router.RouterManageVo;
+import cn.bunny.services.domain.system.system.vo.router.WebUserRouterVo;
import com.baomidou.mybatisplus.extension.service.IService;
import jakarta.validation.Valid;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/system/UserDeptService.java b/service/src/main/java/cn/bunny/services/service/system/UserDeptService.java
similarity index 80%
rename from auth-admin/src/main/java/cn/bunny/services/service/system/UserDeptService.java
rename to service/src/main/java/cn/bunny/services/service/system/UserDeptService.java
index dc779a5..825972e 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/system/UserDeptService.java
+++ b/service/src/main/java/cn/bunny/services/service/system/UserDeptService.java
@@ -1,6 +1,6 @@
package cn.bunny.services.service.system;
-import cn.bunny.domain.system.entity.UserDept;
+import cn.bunny.services.domain.system.system.entity.UserDept;
import com.baomidou.mybatisplus.extension.service.IService;
/**
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/system/UserRoleService.java b/service/src/main/java/cn/bunny/services/service/system/UserRoleService.java
similarity index 80%
rename from auth-admin/src/main/java/cn/bunny/services/service/system/UserRoleService.java
rename to service/src/main/java/cn/bunny/services/service/system/UserRoleService.java
index 16a7f10..a2274cc 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/system/UserRoleService.java
+++ b/service/src/main/java/cn/bunny/services/service/system/UserRoleService.java
@@ -1,7 +1,7 @@
package cn.bunny.services.service.system;
-import cn.bunny.domain.system.dto.user.AssignRolesToUsersDto;
-import cn.bunny.domain.system.entity.UserRole;
+import cn.bunny.services.domain.system.system.dto.user.AssignRolesToUsersDto;
+import cn.bunny.services.domain.system.system.entity.UserRole;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/system/UserService.java b/service/src/main/java/cn/bunny/services/service/system/UserService.java
similarity index 84%
rename from auth-admin/src/main/java/cn/bunny/services/service/system/UserService.java
rename to service/src/main/java/cn/bunny/services/service/system/UserService.java
index b187c12..20d0d1a 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/system/UserService.java
+++ b/service/src/main/java/cn/bunny/services/service/system/UserService.java
@@ -1,12 +1,12 @@
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.AdminUserVo;
-import cn.bunny.domain.system.vo.user.RefreshTokenVo;
-import cn.bunny.domain.system.vo.user.UserVo;
-import cn.bunny.domain.vo.LoginVo;
-import cn.bunny.domain.vo.result.PageResult;
+import cn.bunny.services.domain.system.system.dto.user.*;
+import cn.bunny.services.domain.system.system.entity.AdminUser;
+import cn.bunny.services.domain.system.system.vo.user.AdminUserVo;
+import cn.bunny.services.domain.system.system.vo.user.RefreshTokenVo;
+import cn.bunny.services.domain.system.system.vo.user.UserVo;
+import cn.bunny.services.domain.common.vo.LoginVo;
+import cn.bunny.services.domain.common.vo.result.PageResult;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import jakarta.validation.Valid;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java
similarity index 89%
rename from auth-admin/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java
rename to service/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java
index fa034ff..ffd608f 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java
+++ b/service/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java
@@ -1,12 +1,12 @@
package cn.bunny.services.service.system.impl;
-import cn.bunny.domain.system.dto.dept.DeptAddDto;
-import cn.bunny.domain.system.dto.dept.DeptDto;
-import cn.bunny.domain.system.dto.dept.DeptUpdateDto;
-import cn.bunny.domain.system.entity.Dept;
-import cn.bunny.domain.system.vo.DeptVo;
-import cn.bunny.domain.vo.result.PageResult;
-import cn.bunny.domain.vo.result.ResultCodeEnum;
+import cn.bunny.services.domain.system.system.dto.dept.DeptAddDto;
+import cn.bunny.services.domain.system.system.dto.dept.DeptDto;
+import cn.bunny.services.domain.system.system.dto.dept.DeptUpdateDto;
+import cn.bunny.services.domain.system.system.entity.Dept;
+import cn.bunny.services.domain.system.system.vo.DeptVo;
+import cn.bunny.services.domain.common.vo.result.PageResult;
+import cn.bunny.services.domain.common.vo.result.ResultCodeEnum;
import cn.bunny.services.exception.AuthCustomerException;
import cn.bunny.services.mapper.system.DeptMapper;
import cn.bunny.services.mapper.system.UserDeptMapper;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java
similarity index 92%
rename from auth-admin/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java
rename to service/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java
index 327a24d..ba3335d 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java
+++ b/service/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java
@@ -1,22 +1,22 @@
package cn.bunny.services.service.system.impl;
-import cn.bunny.domain.files.dto.FileUploadDto;
-import cn.bunny.domain.files.dto.FilesAddDto;
-import cn.bunny.domain.files.dto.FilesDto;
-import cn.bunny.domain.files.dto.FilesUpdateDto;
-import cn.bunny.domain.files.entity.Files;
-import cn.bunny.domain.files.vo.FileInfoVo;
-import cn.bunny.domain.files.vo.FilesVo;
-import cn.bunny.domain.model.file.MinioFilePath;
-import cn.bunny.domain.vo.result.PageResult;
-import cn.bunny.domain.vo.result.ResultCodeEnum;
+import cn.bunny.services.config.minio.MinioProperties;
+import cn.bunny.services.config.minio.MinioUtil;
import cn.bunny.services.context.BaseContext;
+import cn.bunny.services.domain.common.vo.result.PageResult;
+import cn.bunny.services.domain.common.vo.result.ResultCodeEnum;
+import cn.bunny.services.domain.common.model.file.MinioFilePath;
+import cn.bunny.services.domain.system.files.dto.FileUploadDto;
+import cn.bunny.services.domain.system.files.dto.FilesAddDto;
+import cn.bunny.services.domain.system.files.dto.FilesDto;
+import cn.bunny.services.domain.system.files.dto.FilesUpdateDto;
+import cn.bunny.services.domain.system.files.entity.Files;
+import cn.bunny.services.domain.system.files.vo.FileInfoVo;
+import cn.bunny.services.domain.system.files.vo.FilesVo;
import cn.bunny.services.exception.AuthCustomerException;
import cn.bunny.services.mapper.system.FilesMapper;
import cn.bunny.services.service.system.FilesService;
import cn.bunny.services.utils.FileUtil;
-import cn.bunny.services.utils.minio.MinioProperties;
-import cn.bunny.services.utils.minio.MinioUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/system/impl/PermissionServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/PermissionServiceImpl.java
similarity index 92%
rename from auth-admin/src/main/java/cn/bunny/services/service/system/impl/PermissionServiceImpl.java
rename to service/src/main/java/cn/bunny/services/service/system/impl/PermissionServiceImpl.java
index da67105..a28fb9c 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/system/impl/PermissionServiceImpl.java
+++ b/service/src/main/java/cn/bunny/services/service/system/impl/PermissionServiceImpl.java
@@ -1,16 +1,16 @@
package cn.bunny.services.service.system.impl;
-import cn.bunny.domain.constant.FileType;
-import cn.bunny.domain.system.dto.power.PermissionAddDto;
-import cn.bunny.domain.system.dto.power.PermissionDto;
-import cn.bunny.domain.system.dto.power.PermissionUpdateBatchByParentIdDto;
-import cn.bunny.domain.system.dto.power.PermissionUpdateDto;
-import cn.bunny.domain.system.entity.Permission;
-import cn.bunny.domain.system.vo.PermissionVo;
-import cn.bunny.domain.vo.result.PageResult;
-import cn.bunny.domain.vo.result.ResultCodeEnum;
+import cn.bunny.services.domain.common.constant.FileType;
+import cn.bunny.services.domain.common.excel.PermissionExcel;
+import cn.bunny.services.domain.common.vo.result.PageResult;
+import cn.bunny.services.domain.common.vo.result.ResultCodeEnum;
+import cn.bunny.services.domain.system.system.dto.power.PermissionAddDto;
+import cn.bunny.services.domain.system.system.dto.power.PermissionDto;
+import cn.bunny.services.domain.system.system.dto.power.PermissionUpdateBatchByParentIdDto;
+import cn.bunny.services.domain.system.system.dto.power.PermissionUpdateDto;
+import cn.bunny.services.domain.system.system.entity.Permission;
+import cn.bunny.services.domain.system.system.vo.PermissionVo;
import cn.bunny.services.excel.PermissionExcelListener;
-import cn.bunny.services.excel.entity.PermissionExcel;
import cn.bunny.services.exception.AuthCustomerException;
import cn.bunny.services.mapper.system.PermissionMapper;
import cn.bunny.services.mapper.system.RolePermissionMapper;
@@ -178,6 +178,7 @@ public class PermissionServiceImpl extends ServiceImpl permissionExcelList = list().stream().map(permission -> {
PermissionExcel permissionExcel = new PermissionExcel();
BeanUtils.copyProperties(permission, permissionExcel);
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/system/impl/RolePermissionServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/RolePermissionServiceImpl.java
similarity index 91%
rename from auth-admin/src/main/java/cn/bunny/services/service/system/impl/RolePermissionServiceImpl.java
rename to service/src/main/java/cn/bunny/services/service/system/impl/RolePermissionServiceImpl.java
index 93f06f8..bc78233 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/system/impl/RolePermissionServiceImpl.java
+++ b/service/src/main/java/cn/bunny/services/service/system/impl/RolePermissionServiceImpl.java
@@ -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.RolePermission;
-import cn.bunny.domain.system.entity.UserRole;
+import cn.bunny.services.domain.system.system.dto.AssignPowersToRoleDto;
+import cn.bunny.services.domain.system.system.entity.AdminUser;
+import cn.bunny.services.domain.system.system.entity.RolePermission;
+import cn.bunny.services.domain.system.system.entity.UserRole;
import cn.bunny.services.mapper.system.RolePermissionMapper;
import cn.bunny.services.mapper.system.UserMapper;
import cn.bunny.services.mapper.system.UserRoleMapper;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java
similarity index 93%
rename from auth-admin/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java
rename to service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java
index b0ea257..d86f98e 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java
+++ b/service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java
@@ -1,15 +1,15 @@
package cn.bunny.services.service.system.impl;
-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;
+import cn.bunny.services.domain.common.excel.RoleExcel;
+import cn.bunny.services.domain.common.vo.result.PageResult;
+import cn.bunny.services.domain.common.vo.result.ResultCodeEnum;
+import cn.bunny.services.domain.system.system.dto.role.RoleAddDto;
+import cn.bunny.services.domain.system.system.dto.role.RoleDto;
+import cn.bunny.services.domain.system.system.dto.role.RoleUpdateDto;
+import cn.bunny.services.domain.system.system.entity.Role;
+import cn.bunny.services.domain.system.system.entity.UserRole;
+import cn.bunny.services.domain.system.system.vo.RoleVo;
import cn.bunny.services.excel.RoleExcelListener;
-import cn.bunny.services.excel.entity.RoleExcel;
import cn.bunny.services.exception.AuthCustomerException;
import cn.bunny.services.mapper.system.RoleMapper;
import cn.bunny.services.mapper.system.RolePermissionMapper;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java
similarity index 91%
rename from auth-admin/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java
rename to service/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java
index 01db415..bfcf404 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java
+++ b/service/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java
@@ -1,7 +1,7 @@
package cn.bunny.services.service.system.impl;
-import cn.bunny.domain.system.entity.RouterRole;
-import cn.bunny.domain.vo.result.ResultCodeEnum;
+import cn.bunny.services.domain.system.system.entity.RouterRole;
+import cn.bunny.services.domain.common.vo.result.ResultCodeEnum;
import cn.bunny.services.exception.AuthCustomerException;
import cn.bunny.services.mapper.system.RouterRoleMapper;
import cn.bunny.services.service.system.RouterRoleService;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java
similarity index 88%
rename from auth-admin/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java
rename to service/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java
index 65fa5e4..c6b3be8 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java
+++ b/service/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java
@@ -1,16 +1,16 @@
package cn.bunny.services.service.system.impl;
-import cn.bunny.domain.system.dto.router.RouterAddDto;
-import cn.bunny.domain.system.dto.router.RouterUpdateDto;
-import cn.bunny.domain.system.entity.router.Router;
-import cn.bunny.domain.system.entity.router.RouterMeta;
-import cn.bunny.domain.system.entity.router.RouterMetaTransition;
-import cn.bunny.domain.system.views.ViewRolePermission;
-import cn.bunny.domain.system.views.ViewRouterRole;
-import cn.bunny.domain.system.vo.router.RouterManageVo;
-import cn.bunny.domain.system.vo.router.RouterVo;
-import cn.bunny.domain.system.vo.router.WebUserRouterVo;
-import cn.bunny.domain.vo.result.ResultCodeEnum;
+import cn.bunny.services.domain.system.system.dto.router.RouterAddDto;
+import cn.bunny.services.domain.system.system.dto.router.RouterUpdateDto;
+import cn.bunny.services.domain.system.system.entity.router.Router;
+import cn.bunny.services.domain.system.system.entity.router.RouterMeta;
+import cn.bunny.services.domain.system.system.entity.router.RouterMetaTransition;
+import cn.bunny.services.domain.system.system.views.ViewRolePermission;
+import cn.bunny.services.domain.system.system.views.ViewRouterRole;
+import cn.bunny.services.domain.system.system.vo.router.RouterManageVo;
+import cn.bunny.services.domain.system.system.vo.router.RouterVo;
+import cn.bunny.services.domain.system.system.vo.router.WebUserRouterVo;
+import cn.bunny.services.domain.common.vo.result.ResultCodeEnum;
import cn.bunny.services.exception.AuthCustomerException;
import cn.bunny.services.mapper.system.RolePermissionMapper;
import cn.bunny.services.mapper.system.RouterMapper;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java
similarity index 88%
rename from auth-admin/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java
rename to service/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java
index 1513318..839c8d5 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java
+++ b/service/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java
@@ -1,6 +1,6 @@
package cn.bunny.services.service.system.impl;
-import cn.bunny.domain.system.entity.UserDept;
+import cn.bunny.services.domain.system.system.entity.UserDept;
import cn.bunny.services.mapper.system.UserDeptMapper;
import cn.bunny.services.service.system.UserDeptService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java
similarity index 89%
rename from auth-admin/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java
rename to service/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java
index a7650fc..31c9b89 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java
+++ b/service/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java
@@ -1,11 +1,11 @@
package cn.bunny.services.service.system.impl;
-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.vo.LoginVo;
-import cn.bunny.domain.vo.result.ResultCodeEnum;
+import cn.bunny.services.domain.common.constant.RedisUserConstant;
+import cn.bunny.services.domain.system.system.dto.user.AssignRolesToUsersDto;
+import cn.bunny.services.domain.system.system.entity.AdminUser;
+import cn.bunny.services.domain.system.system.entity.UserRole;
+import cn.bunny.services.domain.common.vo.LoginVo;
+import cn.bunny.services.domain.common.vo.result.ResultCodeEnum;
import cn.bunny.services.context.BaseContext;
import cn.bunny.services.exception.AuthCustomerException;
import cn.bunny.services.mapper.system.UserMapper;
diff --git a/auth-admin/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java
similarity index 92%
rename from auth-admin/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java
rename to service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java
index 417c953..cdd011c 100644
--- a/auth-admin/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java
+++ b/service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java
@@ -1,22 +1,22 @@
package cn.bunny.services.service.system.impl;
-import cn.bunny.domain.constant.RedisUserConstant;
-import cn.bunny.domain.email.entity.EmailTemplate;
-import cn.bunny.domain.enums.EmailTemplateEnums;
-import cn.bunny.domain.enums.LoginEnums;
-import cn.bunny.domain.log.entity.UserLoginLog;
-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.views.ViewUserDept;
-import cn.bunny.domain.system.vo.user.AdminUserVo;
-import cn.bunny.domain.system.vo.user.RefreshTokenVo;
-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.ResultCodeEnum;
import cn.bunny.services.context.BaseContext;
+import cn.bunny.services.domain.common.vo.LoginVo;
+import cn.bunny.services.domain.common.vo.result.PageResult;
+import cn.bunny.services.domain.common.vo.result.ResultCodeEnum;
+import cn.bunny.services.domain.common.constant.RedisUserConstant;
+import cn.bunny.services.domain.common.enums.EmailTemplateEnums;
+import cn.bunny.services.domain.common.enums.LoginEnums;
+import cn.bunny.services.domain.system.email.entity.EmailTemplate;
+import cn.bunny.services.domain.system.log.entity.UserLoginLog;
+import cn.bunny.services.domain.system.system.dto.user.*;
+import cn.bunny.services.domain.system.system.entity.AdminUser;
+import cn.bunny.services.domain.system.system.entity.Role;
+import cn.bunny.services.domain.system.system.entity.UserDept;
+import cn.bunny.services.domain.system.system.views.ViewUserDept;
+import cn.bunny.services.domain.system.system.vo.user.AdminUserVo;
+import cn.bunny.services.domain.system.system.vo.user.RefreshTokenVo;
+import cn.bunny.services.domain.system.system.vo.user.UserVo;
import cn.bunny.services.exception.AuthCustomerException;
import cn.bunny.services.mapper.configuration.EmailTemplateMapper;
import cn.bunny.services.mapper.log.UserLoginLogMapper;
@@ -27,7 +27,7 @@ import cn.bunny.services.mapper.system.UserRoleMapper;
import cn.bunny.services.service.system.UserService;
import cn.bunny.services.utils.JwtHelper;
import cn.bunny.services.utils.email.ConcreteSenderEmailTemplate;
-import cn.bunny.services.utils.ip.IpUtil;
+import cn.bunny.services.utils.IpUtil;
import cn.bunny.services.utils.login.DefaultLoginStrategy;
import cn.bunny.services.utils.login.EmailLoginStrategy;
import cn.bunny.services.utils.login.LoginContext;
@@ -102,21 +102,26 @@ public class UserServiceImpl extends ServiceImpl implemen
public LoginVo login(LoginDto loginDto) {
Long readMeDay = loginDto.getReadMeDay();
- // 初始化登录策略，如果有需要添加策略放在这里
+ // 初始化所有策略（可扩展）
HashMap loginStrategyHashMap = new HashMap<>();
- loginStrategyHashMap.put(LoginEnums.EMAIL_STRATEGY.getValue(), new EmailLoginStrategy(redisTemplate, userMapper));
+ // 默认的登录方式
loginStrategyHashMap.put(LoginEnums.default_STRATEGY.getValue(), new DefaultLoginStrategy(userMapper));
+ // 注册邮箱
+ loginStrategyHashMap.put(LoginEnums.EMAIL_STRATEGY.getValue(), new EmailLoginStrategy(redisTemplate, userMapper));
// 使用登录上下文调用登录策略
- LoginContext loginContext = new LoginContext(loginStrategyHashMap);
+ LoginContext loginContext = new LoginContext(loginStrategyHashMap, passwordEncoder);
AdminUser user = loginContext.executeStrategy(loginDto);
+ // 验证登录逻辑
if (user == null) throw new UsernameNotFoundException(ResultCodeEnum.USER_IS_EMPTY.getMessage());
// 数据库密码
String dbPassword = user.getPassword();
+
// 用户登录密码
String password = loginDto.getPassword();
+
if (!passwordEncoder.matches(password, dbPassword)) {
throw new UsernameNotFoundException(ResultCodeEnum.LOGIN_ERROR.getMessage());
}
@@ -125,6 +130,7 @@ public class UserServiceImpl extends ServiceImpl implemen
if (user.getStatus()) {
throw new UsernameNotFoundException(ResultCodeEnum.FAIL_NO_ACCESS_DENIED_USER_LOCKED.getMessage());
}
+
return userUtil.buildLoginUserVo(user, readMeDay);
}
@@ -154,7 +160,7 @@ public class UserServiceImpl extends ServiceImpl implemen
hashMap.put("#companyName#", "BunnyAdmin");
// 发送邮件
- concreteSenderEmailTemplate.sendEmail(email, emailTemplate, hashMap);
+ concreteSenderEmailTemplate.sendEmailTemplate(email, emailTemplate, hashMap);
// 在Redis中存储验证码
redisTemplate.opsForValue().set(RedisUserConstant.getAdminUserEmailCodePrefix(email), emailCode, RedisUserConstant.REDIS_EXPIRATION_TIME, TimeUnit.MINUTES);
diff --git a/auth-admin/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java b/service/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java
similarity index 85%
rename from auth-admin/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java
rename to service/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java
index 3a3a1ed..3b3765f 100644
--- a/auth-admin/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java
+++ b/service/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java
@@ -1,13 +1,13 @@
package cn.bunny.services.utils.email;
-import cn.bunny.domain.email.entity.EmailTemplate;
-import cn.bunny.domain.email.entity.EmailUsers;
-import cn.bunny.domain.model.email.EmailSend;
-import cn.bunny.domain.model.email.EmailSendInit;
-import cn.bunny.domain.vo.result.ResultCodeEnum;
+import cn.bunny.services.config.mail.MailSenderConfiguration;
+import cn.bunny.services.domain.common.vo.result.ResultCodeEnum;
+import cn.bunny.services.domain.common.model.email.EmailSend;
+import cn.bunny.services.domain.common.model.email.EmailSendInit;
+import cn.bunny.services.domain.system.email.entity.EmailTemplate;
+import cn.bunny.services.domain.system.email.entity.EmailUsers;
import cn.bunny.services.exception.AuthCustomerException;
import cn.bunny.services.mapper.configuration.EmailUsersMapper;
-import cn.bunny.services.utils.mail.MailSenderUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import jakarta.mail.MessagingException;
import org.springframework.beans.BeanUtils;
@@ -17,6 +17,7 @@ import java.util.HashMap;
import java.util.List;
public abstract class AbstractSenderEmailTemplate {
+
@Autowired
private EmailUsersMapper emailUsersMapper;
@@ -63,7 +64,7 @@ public abstract class AbstractSenderEmailTemplate {
// 发送邮件
try {
emailSend.setText(modifiedTemplate[0]);
- MailSenderUtil.sendEmail(emailSendInit, emailSend);
+ MailSenderConfiguration.sendEmail(emailSendInit, emailSend);
} catch (MessagingException e) {
throw new AuthCustomerException(ResultCodeEnum.SEND_MAIL_CODE_ERROR);
}
diff --git a/auth-admin/src/main/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplate.java b/service/src/main/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplate.java
similarity index 50%
rename from auth-admin/src/main/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplate.java
rename to service/src/main/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplate.java
index 97b73bb..60b501e 100644
--- a/auth-admin/src/main/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplate.java
+++ b/service/src/main/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplate.java
@@ -1,7 +1,8 @@
package cn.bunny.services.utils.email;
-import cn.bunny.domain.email.entity.EmailTemplate;
+import cn.bunny.services.domain.system.email.entity.EmailTemplate;
import cn.bunny.services.mapper.configuration.EmailTemplateMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Component;
@@ -10,6 +11,7 @@ import java.util.HashMap;
@Component
public class ConcreteSenderEmailTemplate extends AbstractSenderEmailTemplate {
+
@Resource
private EmailTemplateMapper emailTemplateMapper;
@@ -25,4 +27,27 @@ public class ConcreteSenderEmailTemplate extends AbstractSenderEmailTemplate {
EmailTemplate emailTemplate = emailTemplateMapper.selectOne(Wrappers.lambdaQuery().eq(EmailTemplate::getId, emailTemplateId));
sendEmail(email, emailTemplate, params);
}
+
+ /**
+ * 根据模板发送邮件
+ *
+ * @param email 邮件
+ * @param emailTemplate 模板
+ * @param params 替换参数
+ */
+ public void sendEmailTemplate(String email, EmailTemplate emailTemplate, HashMap params) {
+ sendEmail(email, emailTemplate, params);
+ }
+
+ /**
+ * 查询条件发送邮件
+ *
+ * @param email 邮件
+ * @param lambdaQueryWrapper 查询条件
+ * @param params 替换参数
+ */
+ public void sendEmailTemplate(String email, LambdaQueryWrapper lambdaQueryWrapper, HashMap params) {
+ EmailTemplate emailTemplate = emailTemplateMapper.selectOne(lambdaQueryWrapper);
+ sendEmail(email, emailTemplate, params);
+ }
}
diff --git a/auth-admin/src/main/java/cn/bunny/services/utils/i8n/I18nUtil.java b/service/src/main/java/cn/bunny/services/utils/i8n/I18nUtil.java
similarity index 96%
rename from auth-admin/src/main/java/cn/bunny/services/utils/i8n/I18nUtil.java
rename to service/src/main/java/cn/bunny/services/utils/i8n/I18nUtil.java
index bfcd39a..c2b3e15 100644
--- a/auth-admin/src/main/java/cn/bunny/services/utils/i8n/I18nUtil.java
+++ b/service/src/main/java/cn/bunny/services/utils/i8n/I18nUtil.java
@@ -1,7 +1,7 @@
package cn.bunny.services.utils.i8n;
-import cn.bunny.domain.i18n.entity.I18n;
-import cn.bunny.services.excel.entity.I18nExcel;
+import cn.bunny.services.domain.common.excel.I18nExcel;
+import cn.bunny.services.domain.system.i18n.entity.I18n;
import com.alibaba.excel.EasyExcel;
import com.alibaba.fastjson2.JSON;
import org.jetbrains.annotations.NotNull;
diff --git a/auth-admin/src/main/java/cn/bunny/services/utils/login/DefaultLoginStrategy.java b/service/src/main/java/cn/bunny/services/utils/login/DefaultLoginStrategy.java
similarity index 87%
rename from auth-admin/src/main/java/cn/bunny/services/utils/login/DefaultLoginStrategy.java
rename to service/src/main/java/cn/bunny/services/utils/login/DefaultLoginStrategy.java
index 50db583..5f7aa9d 100644
--- a/auth-admin/src/main/java/cn/bunny/services/utils/login/DefaultLoginStrategy.java
+++ b/service/src/main/java/cn/bunny/services/utils/login/DefaultLoginStrategy.java
@@ -1,7 +1,7 @@
package cn.bunny.services.utils.login;
-import cn.bunny.domain.system.dto.user.LoginDto;
-import cn.bunny.domain.system.entity.AdminUser;
+import cn.bunny.services.domain.system.system.dto.user.LoginDto;
+import cn.bunny.services.domain.system.system.entity.AdminUser;
import cn.bunny.services.mapper.system.UserMapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
diff --git a/auth-admin/src/main/java/cn/bunny/services/utils/login/EmailLoginStrategy.java b/service/src/main/java/cn/bunny/services/utils/login/EmailLoginStrategy.java
similarity index 88%
rename from auth-admin/src/main/java/cn/bunny/services/utils/login/EmailLoginStrategy.java
rename to service/src/main/java/cn/bunny/services/utils/login/EmailLoginStrategy.java
index 1a93ad7..9fd5884 100644
--- a/auth-admin/src/main/java/cn/bunny/services/utils/login/EmailLoginStrategy.java
+++ b/service/src/main/java/cn/bunny/services/utils/login/EmailLoginStrategy.java
@@ -1,9 +1,9 @@
package cn.bunny.services.utils.login;
-import cn.bunny.domain.constant.RedisUserConstant;
-import cn.bunny.domain.system.dto.user.LoginDto;
-import cn.bunny.domain.system.entity.AdminUser;
-import cn.bunny.domain.vo.result.ResultCodeEnum;
+import cn.bunny.services.domain.common.constant.RedisUserConstant;
+import cn.bunny.services.domain.system.system.dto.user.LoginDto;
+import cn.bunny.services.domain.system.system.entity.AdminUser;
+import cn.bunny.services.domain.common.vo.result.ResultCodeEnum;
import cn.bunny.services.mapper.system.UserMapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.springframework.data.redis.core.RedisTemplate;
diff --git a/auth-admin/src/main/java/cn/bunny/services/utils/login/LoginContext.java b/service/src/main/java/cn/bunny/services/utils/login/LoginContext.java
similarity index 66%
rename from auth-admin/src/main/java/cn/bunny/services/utils/login/LoginContext.java
rename to service/src/main/java/cn/bunny/services/utils/login/LoginContext.java
index 3299faa..3b4aafa 100644
--- a/auth-admin/src/main/java/cn/bunny/services/utils/login/LoginContext.java
+++ b/service/src/main/java/cn/bunny/services/utils/login/LoginContext.java
@@ -1,8 +1,9 @@
package cn.bunny.services.utils.login;
-import cn.bunny.domain.system.dto.user.LoginDto;
-import cn.bunny.domain.system.entity.AdminUser;
+import cn.bunny.services.domain.system.system.dto.user.LoginDto;
+import cn.bunny.services.domain.system.system.entity.AdminUser;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.security.crypto.password.PasswordEncoder;
import java.util.Map;
@@ -10,10 +11,13 @@ import java.util.Map;
* 登录策略上下文
*/
public class LoginContext {
- private final Map strategies;
- public LoginContext(Map strategies) {
+ private final Map strategies;
+ private final PasswordEncoder passwordEncoder;
+
+ public LoginContext(Map strategies, PasswordEncoder passwordEncoder) {
this.strategies = strategies;
+ this.passwordEncoder = passwordEncoder;
}
/**
@@ -26,9 +30,11 @@ public class LoginContext {
public AdminUser executeStrategy(LoginDto loginDto) {
String type = loginDto.getType();
LoginStrategy strategy = strategies.get(type);
+
if (strategy == null) {
throw new UsernameNotFoundException("不支持登录类型: " + type);
}
+
return strategy.authenticate(loginDto);
}
}
\ No newline at end of file
diff --git a/auth-admin/src/main/java/cn/bunny/services/utils/login/LoginStrategy.java b/service/src/main/java/cn/bunny/services/utils/login/LoginStrategy.java
similarity index 67%
rename from auth-admin/src/main/java/cn/bunny/services/utils/login/LoginStrategy.java
rename to service/src/main/java/cn/bunny/services/utils/login/LoginStrategy.java
index 09d4ae8..84a4b12 100644
--- a/auth-admin/src/main/java/cn/bunny/services/utils/login/LoginStrategy.java
+++ b/service/src/main/java/cn/bunny/services/utils/login/LoginStrategy.java
@@ -1,8 +1,8 @@
package cn.bunny.services.utils.login;
-import cn.bunny.domain.system.dto.user.LoginDto;
-import cn.bunny.domain.system.entity.AdminUser;
+import cn.bunny.services.domain.system.system.dto.user.LoginDto;
+import cn.bunny.services.domain.system.system.entity.AdminUser;
/**
* 登录策略
diff --git a/service/src/main/java/cn/bunny/services/utils/login/ReadMe.md b/service/src/main/java/cn/bunny/services/utils/login/ReadMe.md
new file mode 100644
index 0000000..bfceff8
--- /dev/null
+++ b/service/src/main/java/cn/bunny/services/utils/login/ReadMe.md
@@ -0,0 +1,85 @@
+# 登录模块策略模式实现
+
+通过 `LoginStrategy` 接口实现多登录方式动态切换，支持邮箱登录、默认账号密码登录、邮箱登录等扩展。
+
+## 核心组件
+
+| 组件 | 说明 |
+|------------------------|----------------------|
+| `LoginStrategy` | 策略接口，定义 `login` 方法规范 |
+| `LoginContext` | 策略上下文，根据输入动态选择具体策略 |
+| `EmailLoginStrategy` | 邮箱登录策略（需验证邮箱相关逻辑） |
+| `DefaultLoginStrategy` | 默认账号密码登录策略（仅作基础用户查询） |
+
+## 快速开始
+
+### 1. 策略注册
+
+```java
+// 初始化所有策略（可扩展）
+// 策略注册（初始化登录策略，如果有需要添加策略放在这里）
+HashMap loginStrategyHashMap = new HashMap<>();
+// 默认的登录方式
+loginStrategyHashMap.put(LoginEnums.default_STRATEGY.getValue(), new DefaultLoginStrategy(userMapper));
+// 注册邮箱
+loginStrategyHashMap.put(LoginEnums.EMAIL_STRATEGY.getValue(), new EmailLoginStrategy(redisTemplate, userMapper));
+```
+
+### 2. 执行登录流程
+
+```java
+public LoginVo login(LoginDto loginDto) {
+ // 1. 策略路由
+ LoginContext context = new LoginContext(strategies);
+
+ // 2. 执行具体策略 统一安全验证
+ AdminUser user = context.executeStrategy(loginDto);
+
+ // 验证登录逻辑
+ if (user == null) throw new UsernameNotFoundException(ResultCodeEnum.USER_IS_EMPTY.getMessage());
+
+ // 数据库密码
+ String dbPassword = user.getPassword();
+
+ // 用户登录密码
+ String password = loginDto.getPassword();
+
+ if (!passwordEncoder.matches(password, dbPassword)) {
+ throw new UsernameNotFoundException(ResultCodeEnum.LOGIN_ERROR.getMessage());
+ }
+
+ // 判断用户是否禁用
+ if (user.getStatus()) {
+ throw new UsernameNotFoundException(ResultCodeEnum.FAIL_NO_ACCESS_DENIED_USER_LOCKED.getMessage());
+ }
+
+ // 3. 返回Token等业务逻辑
+ return userUtil.buildLoginUserVo(user, loginDto.getReadMeDay());
+}
+```
+
+## 设计规范
+
+### 策略实现要求
+
+- 各策略 **只需关注自身特有逻辑**（如邮箱验证码校验）
+- **禁止** 在策略中处理账号密码验证（由业务层统一处理）
+- 返回的 `AdminUser` 对象应为完整实体
+
+### 上下文流程
+
+```mermaid
+graph TD
+ A[LoginContext] --> B{策略选择}
+ B -->|email| C[EmailLoginStrategy]
+ B -->|default| D[DefaultLoginStrategy]
+ C --> E[返回用户实体]
+ D --> E
+ E --> F[统一密码验证]
+```
+
+## 扩展新策略
+
+1. 实现 `LoginStrategy` 接口
+2. 在策略映射中注册新策略
+3. 通过 `LoginEnums` 添加类型常量
diff --git a/service/src/main/java/cn/bunny/services/utils/system/PermissionUtil.java b/service/src/main/java/cn/bunny/services/utils/system/PermissionUtil.java
new file mode 100644
index 0000000..bdb551c
--- /dev/null
+++ b/service/src/main/java/cn/bunny/services/utils/system/PermissionUtil.java
@@ -0,0 +1,112 @@
+package cn.bunny.services.utils.system;
+
+import cn.bunny.services.domain.common.excel.PermissionExcel;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.fastjson2.JSON;
+
+import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+public class PermissionUtil {
+ /**
+ * 将属性结构扁平化
+ *
+ * @param list 属性结构
+ * @return 扁平化数组
+ */
+ public static List flattenTree(List list) {
+ List result = new ArrayList<>();
+
+ for (PermissionExcel node : list) {
+ result.add(node);
+ if (node.getChildren() != null && !node.getChildren().isEmpty()) {
+ result.addAll(flattenTree(node.getChildren()));
+ }
+ }
+
+ return result;
+ }
+
+ /**
+ * 设置子集
+ *
+ * @param parent 父级节点
+ * @param list 要构建的列表
+ */
+ private static void setChildren(PermissionExcel parent, List list) {
+ List children = list.stream()
+ .filter(p -> parent.getId().equals(p.getParentId()))
+ .toList();
+
+ if (!children.isEmpty()) {
+ parent.setChildren(children);
+
+ for (PermissionExcel child : children) {
+ setChildren(child, list);
+ }
+ }
+ }
+
+
+ /**
+ * 构建属性结构
+ *
+ * @param list 要构建的列表
+ * @return 构建完成的列表
+ */
+ public static List buildTree(List list) {
+ List permissionExcels = list.stream()
+ .filter(permissionExcel -> permissionExcel.getParentId() == null || permissionExcel.getParentId() == 0)
+ .toList();
+
+ for (PermissionExcel permission : permissionExcels) {
+ setChildren(permission, list);
+ }
+ return permissionExcels;
+ }
+
+ /**
+ * 写入JSON
+ *
+ * @param list 写入的列表
+ * @param zipOutputStream zip输出流
+ * @param zipName zip文件名
+ */
+ public static void writeJson(List list, ZipOutputStream zipOutputStream, String zipName) {
+ try {
+ ZipEntry zipEntry = new ZipEntry(zipName);
+ zipOutputStream.putNextEntry(zipEntry);
+ zipOutputStream.write(JSON.toJSONString(list).getBytes(StandardCharsets.UTF_8));
+ zipOutputStream.closeEntry();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ /**
+ * 写入JSON
+ *
+ * @param list 写入的列表
+ * @param zipOutputStream zip输出流
+ * @param zipName zip文件名
+ */
+ public static void writExcel(List list, ZipOutputStream zipOutputStream, String zipName) {
+ try {
+ ByteArrayOutputStream excelOutputStream = new ByteArrayOutputStream();
+
+ EasyExcel.write(excelOutputStream, PermissionExcel.class).sheet("permission").doWrite(list);
+
+ // 将Excel写入到Zip中
+ ZipEntry zipEntry = new ZipEntry(zipName);
+ zipOutputStream.putNextEntry(zipEntry);
+ zipOutputStream.write(excelOutputStream.toByteArray());
+ zipOutputStream.closeEntry();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+}
diff --git a/auth-admin/src/main/java/cn/bunny/services/utils/system/RoleUtil.java b/service/src/main/java/cn/bunny/services/utils/system/RoleUtil.java
similarity index 93%
rename from auth-admin/src/main/java/cn/bunny/services/utils/system/RoleUtil.java
rename to service/src/main/java/cn/bunny/services/utils/system/RoleUtil.java
index 01ba285..e918b7e 100644
--- a/auth-admin/src/main/java/cn/bunny/services/utils/system/RoleUtil.java
+++ b/service/src/main/java/cn/bunny/services/utils/system/RoleUtil.java
@@ -1,9 +1,9 @@
package cn.bunny.services.utils.system;
-import cn.bunny.domain.constant.RedisUserConstant;
-import cn.bunny.domain.constant.SecurityConfigConstant;
-import cn.bunny.domain.system.entity.AdminUser;
import cn.bunny.services.context.BaseContext;
+import cn.bunny.services.domain.common.constant.RedisUserConstant;
+import cn.bunny.services.domain.common.constant.SecurityConfigConstant;
+import cn.bunny.services.domain.system.system.entity.AdminUser;
import cn.bunny.services.mapper.system.UserMapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import jakarta.annotation.Resource;
diff --git a/auth-admin/src/main/java/cn/bunny/services/utils/system/RouterUtil.java b/service/src/main/java/cn/bunny/services/utils/system/RouterUtil.java
similarity index 93%
rename from auth-admin/src/main/java/cn/bunny/services/utils/system/RouterUtil.java
rename to service/src/main/java/cn/bunny/services/utils/system/RouterUtil.java
index 3c1753a..799e414 100644
--- a/auth-admin/src/main/java/cn/bunny/services/utils/system/RouterUtil.java
+++ b/service/src/main/java/cn/bunny/services/utils/system/RouterUtil.java
@@ -1,11 +1,11 @@
package cn.bunny.services.utils.system;
-import cn.bunny.domain.system.entity.RouterRole;
-import cn.bunny.domain.system.entity.router.Router;
-import cn.bunny.domain.system.entity.router.RouterMeta;
-import cn.bunny.domain.system.views.ViewRolePermission;
-import cn.bunny.domain.system.views.ViewRouterRole;
-import cn.bunny.domain.system.vo.router.WebUserRouterVo;
+import cn.bunny.services.domain.system.system.entity.RouterRole;
+import cn.bunny.services.domain.system.system.entity.router.Router;
+import cn.bunny.services.domain.system.system.entity.router.RouterMeta;
+import cn.bunny.services.domain.system.system.views.ViewRolePermission;
+import cn.bunny.services.domain.system.system.views.ViewRouterRole;
+import cn.bunny.services.domain.system.system.vo.router.WebUserRouterVo;
import cn.bunny.services.context.BaseContext;
import cn.bunny.services.service.system.RouterRoleService;
import com.alibaba.fastjson2.JSON;
diff --git a/auth-admin/src/main/java/cn/bunny/services/utils/system/UserUtil.java b/service/src/main/java/cn/bunny/services/utils/system/UserUtil.java
similarity index 92%
rename from auth-admin/src/main/java/cn/bunny/services/utils/system/UserUtil.java
rename to service/src/main/java/cn/bunny/services/utils/system/UserUtil.java
index 129912e..200bb24 100644
--- a/auth-admin/src/main/java/cn/bunny/services/utils/system/UserUtil.java
+++ b/service/src/main/java/cn/bunny/services/utils/system/UserUtil.java
@@ -1,18 +1,19 @@
package cn.bunny.services.utils.system;
-import cn.bunny.domain.constant.LocalDateTimeConstant;
-import cn.bunny.domain.constant.MinioConstant;
-import cn.bunny.domain.constant.RedisUserConstant;
-import cn.bunny.domain.constant.UserConstant;
-import cn.bunny.domain.files.dto.FileUploadDto;
-import cn.bunny.domain.files.vo.FileInfoVo;
-import cn.bunny.domain.log.entity.UserLoginLog;
-import cn.bunny.domain.system.dto.user.AdminUserUpdateDto;
-import cn.bunny.domain.system.entity.AdminUser;
-import cn.bunny.domain.system.entity.Permission;
-import cn.bunny.domain.system.entity.Role;
-import cn.bunny.domain.vo.LoginVo;
-import cn.bunny.domain.vo.result.ResultCodeEnum;
+import cn.bunny.services.config.minio.MinioUtil;
+import cn.bunny.services.domain.common.vo.LoginVo;
+import cn.bunny.services.domain.common.vo.result.ResultCodeEnum;
+import cn.bunny.services.domain.common.constant.LocalDateTimeConstant;
+import cn.bunny.services.domain.common.constant.MinioConstant;
+import cn.bunny.services.domain.common.constant.RedisUserConstant;
+import cn.bunny.services.domain.common.constant.UserConstant;
+import cn.bunny.services.domain.system.files.dto.FileUploadDto;
+import cn.bunny.services.domain.system.files.vo.FileInfoVo;
+import cn.bunny.services.domain.system.log.entity.UserLoginLog;
+import cn.bunny.services.domain.system.system.dto.user.AdminUserUpdateDto;
+import cn.bunny.services.domain.system.system.entity.AdminUser;
+import cn.bunny.services.domain.system.system.entity.Permission;
+import cn.bunny.services.domain.system.system.entity.Role;
import cn.bunny.services.exception.AuthCustomerException;
import cn.bunny.services.mapper.log.UserLoginLogMapper;
import cn.bunny.services.mapper.system.PermissionMapper;
@@ -20,8 +21,7 @@ import cn.bunny.services.mapper.system.RoleMapper;
import cn.bunny.services.mapper.system.UserMapper;
import cn.bunny.services.service.system.FilesService;
import cn.bunny.services.utils.JwtHelper;
-import cn.bunny.services.utils.ip.IpUtil;
-import cn.bunny.services.utils.minio.MinioUtil;
+import cn.bunny.services.utils.IpUtil;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.beans.BeanUtils;