diff --git a/README.md b/README.md index ba6dd599..f62e9bb3 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,6 @@ |skyeye-ehr |8100 |EHR模块 |ehr-web.jar | |skyeye-wages |8101 |薪资模块 |wages-web.jar | |skyeye-deploy |8010 |部署模块 |deploy-web.war | -|skyeye-mail |8091 |通讯录模块 |mail-web.jar | |skyeye-email |8093 |邮件模块 |email-web.jar | |skyeye-schedule |8095 |日程模块 |schedule-web.jar | |skyeye-adm |8103 |行政模块 |adm-web.jar | diff --git a/skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/classenum/MailCategory.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/classenum/MailCategory.java similarity index 96% rename from skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/classenum/MailCategory.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/classenum/MailCategory.java index 4cc787e7..393d5561 100644 --- a/skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/classenum/MailCategory.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/classenum/MailCategory.java @@ -2,7 +2,7 @@ * Copyright 卫志强 QQ:598748873@qq.com Inc. All rights reserved. 开源地址:https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.classenum; +package com.skyeye.eve.mail.classenum; import com.skyeye.common.base.classenum.SkyeyeEnumClass; import lombok.AllArgsConstructor; diff --git a/skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/controller/MailController.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/controller/MailController.java similarity index 95% rename from skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/controller/MailController.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/controller/MailController.java index 4d75e131..a8c6265a 100644 --- a/skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/controller/MailController.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/controller/MailController.java @@ -2,7 +2,7 @@ * Copyright 卫志强 QQ:598748873@qq.com Inc. All rights reserved. 开源地址:https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.controller; +package com.skyeye.eve.mail.controller; import com.skyeye.annotation.api.Api; import com.skyeye.annotation.api.ApiImplicitParam; @@ -11,8 +11,8 @@ import com.skyeye.annotation.api.ApiOperation; import com.skyeye.common.entity.search.CommonPageInfo; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; -import com.skyeye.eve.entity.Mail; -import com.skyeye.eve.service.MailService; +import com.skyeye.eve.mail.entity.Mail; +import com.skyeye.eve.mail.service.MailService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/controller/MailTypeController.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/controller/MailTypeController.java similarity index 96% rename from skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/controller/MailTypeController.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/controller/MailTypeController.java index f607e7e2..4c9512df 100644 --- a/skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/controller/MailTypeController.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/controller/MailTypeController.java @@ -2,7 +2,7 @@ * Copyright 卫志强 QQ:598748873@qq.com Inc. All rights reserved. 开源地址:https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.controller; +package com.skyeye.eve.mail.controller; import com.skyeye.annotation.api.Api; import com.skyeye.annotation.api.ApiImplicitParam; @@ -11,8 +11,8 @@ import com.skyeye.annotation.api.ApiOperation; import com.skyeye.common.entity.search.CommonPageInfo; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; -import com.skyeye.eve.entity.MailType; -import com.skyeye.eve.service.MailTypeService; +import com.skyeye.eve.mail.entity.MailType; +import com.skyeye.eve.mail.service.MailTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/dao/MailDao.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/dao/MailDao.java similarity index 84% rename from skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/dao/MailDao.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/dao/MailDao.java index 03236531..4b4cc1d9 100644 --- a/skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/dao/MailDao.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/dao/MailDao.java @@ -2,9 +2,10 @@ * Copyright 卫志强 QQ:598748873@qq.com Inc. All rights reserved. 开源地址:https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.dao; +package com.skyeye.eve.mail.dao; -import com.skyeye.eve.entity.Mail; +import com.skyeye.eve.dao.SkyeyeBaseMapper; +import com.skyeye.eve.mail.entity.Mail; /** * @ClassName: MailDao diff --git a/skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/dao/MailTypeDao.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/dao/MailTypeDao.java similarity index 87% rename from skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/dao/MailTypeDao.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/dao/MailTypeDao.java index 9bec5e33..e7a3a9c8 100644 --- a/skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/dao/MailTypeDao.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/dao/MailTypeDao.java @@ -2,10 +2,11 @@ * Copyright 卫志强 QQ:598748873@qq.com Inc. All rights reserved. 开源地址:https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.dao; +package com.skyeye.eve.mail.dao; import com.skyeye.common.entity.search.CommonPageInfo; -import com.skyeye.eve.entity.MailType; +import com.skyeye.eve.dao.SkyeyeBaseMapper; +import com.skyeye.eve.mail.entity.MailType; import java.util.List; import java.util.Map; diff --git a/skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/entity/Mail.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/entity/Mail.java similarity index 98% rename from skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/entity/Mail.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/entity/Mail.java index 3b8a02bd..a0d6044e 100644 --- a/skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/entity/Mail.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/entity/Mail.java @@ -2,7 +2,7 @@ * Copyright 卫志强 QQ:598748873@qq.com Inc. All rights reserved. 开源地址:https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.entity; +package com.skyeye.eve.mail.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/entity/MailType.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/entity/MailType.java similarity index 96% rename from skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/entity/MailType.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/entity/MailType.java index 6294f374..be9f7bed 100644 --- a/skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/entity/MailType.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/entity/MailType.java @@ -2,7 +2,7 @@ * Copyright 卫志强 QQ:598748873@qq.com Inc. All rights reserved. 开源地址:https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.entity; +package com.skyeye.eve.mail.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.skyeye.annotation.api.ApiModel; diff --git a/skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/service/MailService.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/service/MailService.java similarity index 90% rename from skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/service/MailService.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/service/MailService.java index 177819b8..e8f1d599 100644 --- a/skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/service/MailService.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/service/MailService.java @@ -2,10 +2,10 @@ * Copyright 卫志强 QQ:598748873@qq.com Inc. All rights reserved. 开源地址:https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.service; +package com.skyeye.eve.mail.service; import com.skyeye.base.business.service.SkyeyeBusinessService; -import com.skyeye.eve.entity.Mail; +import com.skyeye.eve.mail.entity.Mail; /** * @ClassName: MailService diff --git a/skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/service/MailTypeService.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/service/MailTypeService.java similarity index 92% rename from skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/service/MailTypeService.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/service/MailTypeService.java index 3bc9ecc0..c91d7891 100644 --- a/skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/service/MailTypeService.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/service/MailTypeService.java @@ -2,12 +2,12 @@ * Copyright 卫志强 QQ:598748873@qq.com Inc. All rights reserved. 开源地址:https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.service; +package com.skyeye.eve.mail.service; import com.skyeye.base.business.service.SkyeyeBusinessService; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; -import com.skyeye.eve.entity.MailType; +import com.skyeye.eve.mail.entity.MailType; /** * @ClassName: MailTypeService diff --git a/skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/service/impl/MailServiceImpl.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/service/impl/MailServiceImpl.java similarity index 90% rename from skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/service/impl/MailServiceImpl.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/service/impl/MailServiceImpl.java index 01907050..2157787a 100644 --- a/skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/service/impl/MailServiceImpl.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/service/impl/MailServiceImpl.java @@ -2,7 +2,7 @@ * Copyright 卫志强 QQ:598748873@qq.com Inc. All rights reserved. 开源地址:https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.service.impl; +package com.skyeye.eve.mail.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -11,10 +11,10 @@ import com.skyeye.base.business.service.impl.SkyeyeBusinessServiceImpl; import com.skyeye.common.entity.search.CommonPageInfo; import com.skyeye.common.object.InputObject; import com.skyeye.common.util.mybatisplus.MybatisPlusUtil; -import com.skyeye.eve.dao.MailDao; -import com.skyeye.eve.entity.Mail; -import com.skyeye.eve.service.MailService; -import com.skyeye.eve.service.MailTypeService; +import com.skyeye.eve.mail.dao.MailDao; +import com.skyeye.eve.mail.entity.Mail; +import com.skyeye.eve.mail.service.MailService; +import com.skyeye.eve.mail.service.MailTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/service/impl/MailTypeServiceImpl.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/service/impl/MailTypeServiceImpl.java similarity index 94% rename from skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/service/impl/MailTypeServiceImpl.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/service/impl/MailTypeServiceImpl.java index b5445fb0..3444b1be 100644 --- a/skyeye-mail/mail-pro/src/main/java/com/skyeye/eve/service/impl/MailTypeServiceImpl.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/mail/service/impl/MailTypeServiceImpl.java @@ -2,7 +2,7 @@ * Copyright 卫志强 QQ:598748873@qq.com Inc. All rights reserved. 开源地址:https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.service.impl; +package com.skyeye.eve.mail.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -13,9 +13,9 @@ import com.skyeye.common.entity.search.CommonPageInfo; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; import com.skyeye.common.util.mybatisplus.MybatisPlusUtil; -import com.skyeye.eve.dao.MailTypeDao; -import com.skyeye.eve.entity.MailType; -import com.skyeye.eve.service.MailTypeService; +import com.skyeye.eve.mail.dao.MailTypeDao; +import com.skyeye.eve.mail.entity.MailType; +import com.skyeye.eve.mail.service.MailTypeService; import com.skyeye.exception.CustomException; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/skyeye-mail/mail-pro/src/main/resources/mapper/mail/MailTypeMapper.xml b/skyeye-adm/adm-pro/src/main/resources/mapper/mail/MailTypeMapper.xml similarity index 93% rename from skyeye-mail/mail-pro/src/main/resources/mapper/mail/MailTypeMapper.xml rename to skyeye-adm/adm-pro/src/main/resources/mapper/mail/MailTypeMapper.xml index c3787ced..b2f822ff 100644 --- a/skyeye-mail/mail-pro/src/main/resources/mapper/mail/MailTypeMapper.xml +++ b/skyeye-adm/adm-pro/src/main/resources/mapper/mail/MailTypeMapper.xml @@ -1,6 +1,6 @@ - +