diff --git a/README.md b/README.md index 9610eb9..e7d7575 100644 --- a/README.md +++ b/README.md @@ -1,46 +1,42 @@ ## 项目说明 -- FastBoot是采用SpringBoot、SpringSecurity、Mybatis-Plus等框架，开发的一套SpringBoot快速开发系统，使用门槛极低，且采用MIT开源协议，完全免费开源，可免费用于**商业项目**等场景。 +- MakuBoot是采用SpringBoot、SpringSecurity、Mybatis-Plus等框架，开发的一套SpringBoot快速开发系统，使用门槛极低，且采用MIT开源协议，完全免费开源，可免费用于**商业项目**等场景。 - 采用组件模式，扩展不同的业务功能，可以很方便的实现各种业务需求，且不会导致系统臃肿，若想使用某个组件，按需引入即可，反之亦然。 -- 开发文档：[https://maku.net/docs/fast-boot](https://maku.net/docs/fast-boot) -- 演示环境：https://demo.maku.net/fast-boot +- 开发文档：[https://maku.net/docs/maku-boot](https://maku.net/docs/maku-boot) +- 演示环境：https://demo.maku.net/maku-boot ## 前端工程 -- Github仓库：https://github.com/makunet/fast-admin -- Gitee仓库：https://gitee.com/makunet/fast-admin +- Github仓库：https://github.com/makunet/maku-admin +- Gitee仓库：https://gitee.com/makunet/maku-admin ## 代码生成器 -- Github仓库：https://github.com/makunet/fast-generator -- Gitee仓库：https://gitee.com/makunet/fast-generator +- Github仓库：https://github.com/makunet/maku-generator +- Gitee仓库：https://gitee.com/makunet/maku-generator ## 交流和反馈 - 官方社区：https://maku.net -- Github仓库：https://github.com/makunet/fast-boot -- Gitee仓库：https://gitee.com/makunet/fast-boot +- Github仓库：https://github.com/makunet/maku-boot +- Gitee仓库：https://gitee.com/makunet/maku-boot - 技术解答、交流、反馈、建议等，请移步到官方社区，我们会及时回复，也方便今后的小伙伴寻找答案，感谢理解！ ## 微信交流群 为了更好的交流，我们新提供了微信交流群，需扫描下面的二维码，关注公众号，回复【加群】，根据提示信息，作者会拉你进群的，感谢配合！ -![输入图片说明](fast-server/src/main/resources/public/qrcode.png) +![输入图片说明](maku-server/src/main/resources/public/qrcode.png) ## 支持 -如果觉得框架还不错，或者已经在使用了，希望你可以去 [Github](https://github.com/makunet/fast-boot) 或 [Gitee](https://gitee.com/makunet/fast-boot) 帮作者点个 ⭐ Star，这将是对作者极大的鼓励与支持。 +如果觉得框架还不错，或者已经在使用了，希望你可以去 [Github](https://github.com/makunet/maku-boot) 或 [Gitee](https://gitee.com/makunet/maku-boot) 帮作者点个 ⭐ Star，这将是对作者极大的鼓励与支持。 ## 效果图 -![输入图片说明](fast-server/src/main/resources/public/1.png) +![输入图片说明](maku-server/src/main/resources/public/1.jpg) -![输入图片说明](fast-server/src/main/resources/public/2.png) +![输入图片说明](maku-server/src/main/resources/public/2.jpg) -![输入图片说明](fast-server/src/main/resources/public/3.png) +![输入图片说明](maku-server/src/main/resources/public/3.jpg) -![输入图片说明](fast-server/src/main/resources/public/4.png) - -![输入图片说明](fast-server/src/main/resources/public/5.png) - -![输入图片说明](fast-server/src/main/resources/public/6.png) \ No newline at end of file +![输入图片说明](maku-server/src/main/resources/public/4.jpg) diff --git a/db/dm8/fast-boot.sql b/db/dm8/maku-boot.sql similarity index 100% rename from db/dm8/fast-boot.sql rename to db/dm8/maku-boot.sql diff --git a/db/mysql/fast-boot.sql b/db/mysql/maku-boot.sql similarity index 100% rename from db/mysql/fast-boot.sql rename to db/mysql/maku-boot.sql diff --git a/db/mysql/module/fast-boot-message.sql b/db/mysql/module/maku-boot-message.sql similarity index 100% rename from db/mysql/module/fast-boot-message.sql rename to db/mysql/module/maku-boot-message.sql diff --git a/db/mysql/module/fast-boot-quartz.sql b/db/mysql/module/maku-boot-quartz.sql similarity index 100% rename from db/mysql/module/fast-boot-quartz.sql rename to db/mysql/module/maku-boot-quartz.sql diff --git a/fast-server/src/main/resources/public/1.png b/fast-server/src/main/resources/public/1.png deleted file mode 100644 index a848645..0000000 Binary files a/fast-server/src/main/resources/public/1.png and /dev/null differ diff --git a/fast-server/src/main/resources/public/2.png b/fast-server/src/main/resources/public/2.png deleted file mode 100644 index 942f7c9..0000000 Binary files a/fast-server/src/main/resources/public/2.png and /dev/null differ diff --git a/fast-server/src/main/resources/public/3.png b/fast-server/src/main/resources/public/3.png deleted file mode 100644 index f1c5c94..0000000 Binary files a/fast-server/src/main/resources/public/3.png and /dev/null differ diff --git a/fast-server/src/main/resources/public/4.png b/fast-server/src/main/resources/public/4.png deleted file mode 100644 index 8f8f9a5..0000000 Binary files a/fast-server/src/main/resources/public/4.png and /dev/null differ diff --git a/fast-server/src/main/resources/public/5.png b/fast-server/src/main/resources/public/5.png deleted file mode 100644 index 42490e1..0000000 Binary files a/fast-server/src/main/resources/public/5.png and /dev/null differ diff --git a/fast-server/src/main/resources/public/6.png b/fast-server/src/main/resources/public/6.png deleted file mode 100644 index 1c197f0..0000000 Binary files a/fast-server/src/main/resources/public/6.png and /dev/null differ diff --git a/fast-server/src/test/java/net/maku/FastTest.java b/fast-server/src/test/java/net/maku/FastTest.java deleted file mode 100644 index dc7c0cf..0000000 --- a/fast-server/src/test/java/net/maku/FastTest.java +++ /dev/null @@ -1,14 +0,0 @@ -package net.maku; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -public class FastTest { - - @Test - public void test(){ - System.out.println("测试用例！"); - } - -} diff --git a/fast-boot-api/pom.xml b/maku-boot-api/pom.xml similarity index 85% rename from fast-boot-api/pom.xml rename to maku-boot-api/pom.xml index 23224b2..e87e162 100644 --- a/fast-boot-api/pom.xml +++ b/maku-boot-api/pom.xml @@ -1,11 +1,11 @@ net.maku - fast-boot + maku-boot ${revision} 4.0.0 - fast-boot-api + maku-boot-api jar diff --git a/fast-boot-api/src/main/java/net/maku/api/module/message/SmsApi.java b/maku-boot-api/src/main/java/net/maku/api/module/message/SmsApi.java similarity index 100% rename from fast-boot-api/src/main/java/net/maku/api/module/message/SmsApi.java rename to maku-boot-api/src/main/java/net/maku/api/module/message/SmsApi.java diff --git a/fast-boot-api/src/main/java/net/maku/api/module/system/StorageApi.java b/maku-boot-api/src/main/java/net/maku/api/module/system/StorageApi.java similarity index 100% rename from fast-boot-api/src/main/java/net/maku/api/module/system/StorageApi.java rename to maku-boot-api/src/main/java/net/maku/api/module/system/StorageApi.java diff --git a/fast-boot-module/README.md b/maku-boot-module/README.md similarity index 61% rename from fast-boot-module/README.md rename to maku-boot-module/README.md index 3d18fb1..2738424 100644 --- a/fast-boot-module/README.md +++ b/maku-boot-module/README.md @@ -1,13 +1,13 @@ ## 说明 -fast-boot 是采用组件模式，扩展不同的业务功能，可以很方便的实现各种业务需求，且不会导致系统臃肿，若想使用某个组件，按需引入即可，反之亦然。 +maku-boot 是采用组件模式，扩展不同的业务功能，可以很方便的实现各种业务需求，且不会导致系统臃肿，若想使用某个组件，按需引入即可，反之亦然。 ## 引入 -如果需要使用对应的组件，如：`fast-boot-quartz`，则需要在`fast-boot/fast-server/pom.xml`里面引入，如下所示： +如果需要使用对应的组件，如：`maku-boot-quartz`，则需要在`maku-boot/maku-server/pom.xml`里面引入，如下所示： ```xml net.maku - fast-boot-quartz + maku-boot-quartz ${revision} ``` @@ -17,5 +17,5 @@ fast-boot 是采用组件模式，扩展不同的业务功能，可以很方便 如果使用的是MySQL数据库，则需要执行以下SQL文件： ``` -fast-boot/db/mysql/module/fast-boot-quartz.sql +maku-boot/db/mysql/module/maku-boot-quartz.sql ``` \ No newline at end of file diff --git a/fast-boot-module/fast-boot-message/pom.xml b/maku-boot-module/maku-boot-message/pom.xml similarity index 85% rename from fast-boot-module/fast-boot-message/pom.xml rename to maku-boot-module/maku-boot-message/pom.xml index 0cbc3a1..0115a13 100644 --- a/fast-boot-module/fast-boot-message/pom.xml +++ b/maku-boot-module/maku-boot-message/pom.xml @@ -2,22 +2,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> net.maku - fast-boot-module + maku-boot-module ${revision} 4.0.0 - fast-boot-message + maku-boot-message jar net.maku - fast-framework + maku-framework ${revision} net.maku - fast-boot-api + maku-boot-api ${revision} diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/api/SmsApiImpl.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/api/SmsApiImpl.java similarity index 100% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/api/SmsApiImpl.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/api/SmsApiImpl.java diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/cache/SmsPlatformCache.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/cache/SmsPlatformCache.java similarity index 100% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/cache/SmsPlatformCache.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/cache/SmsPlatformCache.java diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/cache/SmsSendCache.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/cache/SmsSendCache.java similarity index 100% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/cache/SmsSendCache.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/cache/SmsSendCache.java diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/controller/SmsLogController.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/controller/SmsLogController.java similarity index 100% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/controller/SmsLogController.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/controller/SmsLogController.java diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/controller/SmsPlatformController.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/controller/SmsPlatformController.java similarity index 100% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/controller/SmsPlatformController.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/controller/SmsPlatformController.java diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/convert/SmsLogConvert.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/convert/SmsLogConvert.java similarity index 100% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/convert/SmsLogConvert.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/convert/SmsLogConvert.java diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/convert/SmsPlatformConvert.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/convert/SmsPlatformConvert.java similarity index 100% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/convert/SmsPlatformConvert.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/convert/SmsPlatformConvert.java diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/dao/SmsLogDao.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/dao/SmsLogDao.java similarity index 100% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/dao/SmsLogDao.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/dao/SmsLogDao.java diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/dao/SmsPlatformDao.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/dao/SmsPlatformDao.java similarity index 100% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/dao/SmsPlatformDao.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/dao/SmsPlatformDao.java diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/entity/SmsLogEntity.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/entity/SmsLogEntity.java similarity index 100% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/entity/SmsLogEntity.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/entity/SmsLogEntity.java diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/entity/SmsPlatformEntity.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/entity/SmsPlatformEntity.java similarity index 100% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/entity/SmsPlatformEntity.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/entity/SmsPlatformEntity.java diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/enums/SmsPlatformEnum.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/enums/SmsPlatformEnum.java similarity index 100% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/enums/SmsPlatformEnum.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/enums/SmsPlatformEnum.java diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/query/SmsLogQuery.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/query/SmsLogQuery.java similarity index 100% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/query/SmsLogQuery.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/query/SmsLogQuery.java diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/query/SmsPlatformQuery.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/query/SmsPlatformQuery.java similarity index 100% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/query/SmsPlatformQuery.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/query/SmsPlatformQuery.java diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/service/SmsLogService.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/service/SmsLogService.java similarity index 100% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/service/SmsLogService.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/service/SmsLogService.java diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/service/SmsPlatformService.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/service/SmsPlatformService.java similarity index 100% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/service/SmsPlatformService.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/service/SmsPlatformService.java diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/service/impl/SmsLogServiceImpl.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/service/impl/SmsLogServiceImpl.java similarity index 100% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/service/impl/SmsLogServiceImpl.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/service/impl/SmsLogServiceImpl.java diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/service/impl/SmsPlatformServiceImpl.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/service/impl/SmsPlatformServiceImpl.java similarity index 100% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/service/impl/SmsPlatformServiceImpl.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/service/impl/SmsPlatformServiceImpl.java diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/sms/AliyunSmsStrategy.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/sms/AliyunSmsStrategy.java similarity index 90% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/sms/AliyunSmsStrategy.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/sms/AliyunSmsStrategy.java index e3b95bd..a1095f9 100644 --- a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/sms/AliyunSmsStrategy.java +++ b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/sms/AliyunSmsStrategy.java @@ -7,7 +7,7 @@ import com.aliyun.dysmsapi20170525.models.SendSmsResponse; import com.aliyun.teaopenapi.models.Config; import lombok.extern.slf4j.Slf4j; import net.maku.framework.common.constant.Constant; -import net.maku.framework.common.exception.FastException; +import net.maku.framework.common.exception.ServerException; import net.maku.framework.common.utils.JsonUtils; import net.maku.message.sms.config.SmsConfig; @@ -55,10 +55,10 @@ public class AliyunSmsStrategy implements SmsStrategy { // 发送失败 if (!Constant.OK.equalsIgnoreCase(response.getBody().getCode())) { - throw new FastException(response.getBody().getMessage()); + throw new ServerException(response.getBody().getMessage()); } } catch (Exception e) { - throw new FastException(e.getMessage()); + throw new ServerException(e.getMessage()); } } } diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/sms/HuaweiSmsStrategy.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/sms/HuaweiSmsStrategy.java similarity index 91% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/sms/HuaweiSmsStrategy.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/sms/HuaweiSmsStrategy.java index 2f22ae4..c3fed27 100644 --- a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/sms/HuaweiSmsStrategy.java +++ b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/sms/HuaweiSmsStrategy.java @@ -4,7 +4,7 @@ import cn.hutool.core.io.IoUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.CharsetUtil; import lombok.Data; -import net.maku.framework.common.exception.FastException; +import net.maku.framework.common.exception.ServerException; import net.maku.framework.common.utils.JsonUtils; import net.maku.message.sms.config.SmsConfig; import org.apache.commons.lang3.StringUtils; @@ -47,13 +47,13 @@ public class HuaweiSmsStrategy implements SmsStrategy { // 请求Body,不携带签名名称时,signature请填null String body = buildRequestBody(smsConfig.getSenderId(), "+86" + mobile, smsConfig.getTemplateId(), templateParas, null, smsConfig.getSignName()); if (StringUtils.isBlank(body)) { - throw new FastException("body is null."); + throw new ServerException("body is null."); } // 请求Headers中的X-WSSE参数值 String wsseHeader = buildWsseHeader(smsConfig.getAccessKey(), smsConfig.getSecretKey()); if (StringUtils.isBlank(wsseHeader)) { - throw new FastException("wsse header is null."); + throw new ServerException("wsse header is null."); } try { @@ -83,13 +83,13 @@ public class HuaweiSmsStrategy implements SmsStrategy { // 短信是否发送成功 assert result != null; if (!"000000".equals(result.code)) { - throw new FastException(result.description); + throw new ServerException(result.description); } } else { //400 401 - throw new FastException(IoUtil.read(connection.getErrorStream(), CharsetUtil.CHARSET_UTF_8)); + throw new ServerException(IoUtil.read(connection.getErrorStream(), CharsetUtil.CHARSET_UTF_8)); } } catch (Exception e) { - throw new FastException(e.getMessage()); + throw new ServerException(e.getMessage()); } } @@ -102,7 +102,7 @@ public class HuaweiSmsStrategy implements SmsStrategy { String statusCallBack, String signature) { if (null == sender || null == receiver || null == templateId || sender.isEmpty() || receiver.isEmpty() || templateId.isEmpty()) { - throw new FastException("buildRequestBody(): sender, receiver or templateId is null."); + throw new ServerException("buildRequestBody(): sender, receiver or templateId is null."); } Map map = new HashMap<>(); @@ -139,7 +139,7 @@ public class HuaweiSmsStrategy implements SmsStrategy { */ static String buildWsseHeader(String appKey, String appSecret) { if (null == appKey || null == appSecret || appKey.isEmpty() || appSecret.isEmpty()) { - throw new FastException("buildWsseHeader(): appKey or appSecret is null."); + throw new ServerException("buildWsseHeader(): appKey or appSecret is null."); } SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"); String time = sdf.format(new Date()); diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/sms/QiniuSmsStrategy.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/sms/QiniuSmsStrategy.java similarity index 84% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/sms/QiniuSmsStrategy.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/sms/QiniuSmsStrategy.java index a71a0a2..29891fd 100644 --- a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/sms/QiniuSmsStrategy.java +++ b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/sms/QiniuSmsStrategy.java @@ -3,7 +3,7 @@ package net.maku.message.sms; import com.qiniu.http.Response; import com.qiniu.sms.SmsManager; import com.qiniu.util.Auth; -import net.maku.framework.common.exception.FastException; +import net.maku.framework.common.exception.ServerException; import net.maku.message.sms.config.SmsConfig; import java.util.Map; @@ -31,10 +31,10 @@ public class QiniuSmsStrategy implements SmsStrategy { // 是否发送成功 if (!response.isOK()) { - throw new FastException(response.error); + throw new ServerException(response.error); } } catch (Exception e) { - throw new FastException(e.getMessage()); + throw new ServerException(e.getMessage()); } } } diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/sms/SmsContext.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/sms/SmsContext.java similarity index 89% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/sms/SmsContext.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/sms/SmsContext.java index ba2479f..ccbb688 100644 --- a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/sms/SmsContext.java +++ b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/sms/SmsContext.java @@ -1,6 +1,6 @@ package net.maku.message.sms; -import net.maku.framework.common.exception.FastException; +import net.maku.framework.common.exception.ServerException; import net.maku.message.enums.SmsPlatformEnum; import net.maku.message.sms.config.SmsConfig; @@ -24,7 +24,7 @@ public class SmsContext { } else if (config.getPlatform() == SmsPlatformEnum.HUAWEI.getValue()) { this.smsStrategy = new HuaweiSmsStrategy(config); } else { - throw new FastException("未知的短信平台"); + throw new ServerException("未知的短信平台"); } } diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/sms/SmsStrategy.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/sms/SmsStrategy.java similarity index 100% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/sms/SmsStrategy.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/sms/SmsStrategy.java diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/sms/TencentSmsStrategy.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/sms/TencentSmsStrategy.java similarity index 93% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/sms/TencentSmsStrategy.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/sms/TencentSmsStrategy.java index 9434693..49582e4 100644 --- a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/sms/TencentSmsStrategy.java +++ b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/sms/TencentSmsStrategy.java @@ -9,7 +9,7 @@ import com.tencentcloudapi.sms.v20210111.models.SendSmsRequest; import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse; import com.tencentcloudapi.sms.v20210111.models.SendStatus; import net.maku.framework.common.constant.Constant; -import net.maku.framework.common.exception.FastException; +import net.maku.framework.common.exception.ServerException; import net.maku.message.sms.config.SmsConfig; import java.util.Map; @@ -67,10 +67,10 @@ public class TencentSmsStrategy implements SmsStrategy { // 发送失败 if (!Constant.OK.equalsIgnoreCase(sendStatus.getCode())) { - throw new FastException(sendStatus.getMessage()); + throw new ServerException(sendStatus.getMessage()); } } catch (Exception e) { - throw new FastException(e.getMessage()); + throw new ServerException(e.getMessage()); } } } diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/sms/config/SmsConfig.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/sms/config/SmsConfig.java similarity index 100% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/sms/config/SmsConfig.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/sms/config/SmsConfig.java diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/sms/service/SmsService.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/sms/service/SmsService.java similarity index 95% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/sms/service/SmsService.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/sms/service/SmsService.java index 280470a..6544e28 100644 --- a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/sms/service/SmsService.java +++ b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/sms/service/SmsService.java @@ -4,7 +4,7 @@ import cn.hutool.core.map.MapUtil; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import net.maku.framework.common.constant.Constant; -import net.maku.framework.common.exception.FastException; +import net.maku.framework.common.exception.ServerException; import net.maku.framework.common.utils.ExceptionUtils; import net.maku.framework.common.utils.JsonUtils; import net.maku.message.entity.SmsLogEntity; @@ -95,7 +95,7 @@ public class SmsService { // 是否有可用的短信平台 int count = platformList.size(); if(count == 0) { - throw new FastException("没有可用的短信平台，请先添加"); + throw new ServerException("没有可用的短信平台，请先添加"); } // 采用轮询算法，发送短信 diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/vo/SmsLogVO.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/vo/SmsLogVO.java similarity index 100% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/vo/SmsLogVO.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/vo/SmsLogVO.java diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/vo/SmsPlatformVO.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/vo/SmsPlatformVO.java similarity index 100% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/vo/SmsPlatformVO.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/vo/SmsPlatformVO.java diff --git a/fast-boot-module/fast-boot-message/src/main/java/net/maku/message/vo/SmsSendVO.java b/maku-boot-module/maku-boot-message/src/main/java/net/maku/message/vo/SmsSendVO.java similarity index 100% rename from fast-boot-module/fast-boot-message/src/main/java/net/maku/message/vo/SmsSendVO.java rename to maku-boot-module/maku-boot-message/src/main/java/net/maku/message/vo/SmsSendVO.java diff --git a/fast-boot-module/fast-boot-message/src/main/resources/mapper/SmsLogDao.xml b/maku-boot-module/maku-boot-message/src/main/resources/mapper/SmsLogDao.xml similarity index 100% rename from fast-boot-module/fast-boot-message/src/main/resources/mapper/SmsLogDao.xml rename to maku-boot-module/maku-boot-message/src/main/resources/mapper/SmsLogDao.xml diff --git a/fast-boot-module/fast-boot-message/src/main/resources/mapper/SmsPlatformDao.xml b/maku-boot-module/maku-boot-message/src/main/resources/mapper/SmsPlatformDao.xml similarity index 100% rename from fast-boot-module/fast-boot-message/src/main/resources/mapper/SmsPlatformDao.xml rename to maku-boot-module/maku-boot-message/src/main/resources/mapper/SmsPlatformDao.xml diff --git a/fast-boot-module/fast-boot-quartz/pom.xml b/maku-boot-module/maku-boot-quartz/pom.xml similarity index 80% rename from fast-boot-module/fast-boot-quartz/pom.xml rename to maku-boot-module/maku-boot-quartz/pom.xml index eb51d90..e80dce7 100644 --- a/fast-boot-module/fast-boot-quartz/pom.xml +++ b/maku-boot-module/maku-boot-quartz/pom.xml @@ -1,17 +1,17 @@ net.maku - fast-boot-module + maku-boot-module ${revision} 4.0.0 - fast-boot-quartz + maku-boot-quartz jar net.maku - fast-framework + maku-framework ${revision} diff --git a/fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobController.java b/maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobController.java similarity index 100% rename from fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobController.java rename to maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobController.java diff --git a/fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobLogController.java b/maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobLogController.java similarity index 100% rename from fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobLogController.java rename to maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/controller/ScheduleJobLogController.java diff --git a/fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/convert/ScheduleJobConvert.java b/maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/convert/ScheduleJobConvert.java similarity index 100% rename from fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/convert/ScheduleJobConvert.java rename to maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/convert/ScheduleJobConvert.java diff --git a/fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/convert/ScheduleJobLogConvert.java b/maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/convert/ScheduleJobLogConvert.java similarity index 100% rename from fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/convert/ScheduleJobLogConvert.java rename to maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/convert/ScheduleJobLogConvert.java diff --git a/fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/dao/ScheduleJobDao.java b/maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/dao/ScheduleJobDao.java similarity index 100% rename from fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/dao/ScheduleJobDao.java rename to maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/dao/ScheduleJobDao.java diff --git a/fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/dao/ScheduleJobLogDao.java b/maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/dao/ScheduleJobLogDao.java similarity index 100% rename from fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/dao/ScheduleJobLogDao.java rename to maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/dao/ScheduleJobLogDao.java diff --git a/fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/entity/ScheduleJobEntity.java b/maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/entity/ScheduleJobEntity.java similarity index 100% rename from fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/entity/ScheduleJobEntity.java rename to maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/entity/ScheduleJobEntity.java diff --git a/fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/entity/ScheduleJobLogEntity.java b/maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/entity/ScheduleJobLogEntity.java similarity index 100% rename from fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/entity/ScheduleJobLogEntity.java rename to maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/entity/ScheduleJobLogEntity.java diff --git a/fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/enums/ScheduleConcurrentEnum.java b/maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/enums/ScheduleConcurrentEnum.java similarity index 100% rename from fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/enums/ScheduleConcurrentEnum.java rename to maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/enums/ScheduleConcurrentEnum.java diff --git a/fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/enums/ScheduleStatusEnum.java b/maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/enums/ScheduleStatusEnum.java similarity index 100% rename from fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/enums/ScheduleStatusEnum.java rename to maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/enums/ScheduleStatusEnum.java diff --git a/fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/query/ScheduleJobLogQuery.java b/maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/query/ScheduleJobLogQuery.java similarity index 100% rename from fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/query/ScheduleJobLogQuery.java rename to maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/query/ScheduleJobLogQuery.java diff --git a/fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/query/ScheduleJobQuery.java b/maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/query/ScheduleJobQuery.java similarity index 100% rename from fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/query/ScheduleJobQuery.java rename to maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/query/ScheduleJobQuery.java diff --git a/fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/service/ScheduleJobLogService.java b/maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/service/ScheduleJobLogService.java similarity index 100% rename from fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/service/ScheduleJobLogService.java rename to maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/service/ScheduleJobLogService.java diff --git a/fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/service/ScheduleJobService.java b/maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/service/ScheduleJobService.java similarity index 100% rename from fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/service/ScheduleJobService.java rename to maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/service/ScheduleJobService.java diff --git a/fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/service/impl/ScheduleJobLogServiceImpl.java b/maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/service/impl/ScheduleJobLogServiceImpl.java similarity index 100% rename from fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/service/impl/ScheduleJobLogServiceImpl.java rename to maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/service/impl/ScheduleJobLogServiceImpl.java diff --git a/fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/service/impl/ScheduleJobServiceImpl.java b/maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/service/impl/ScheduleJobServiceImpl.java similarity index 100% rename from fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/service/impl/ScheduleJobServiceImpl.java rename to maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/service/impl/ScheduleJobServiceImpl.java diff --git a/fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/task/TestTask.java b/maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/task/TestTask.java similarity index 100% rename from fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/task/TestTask.java rename to maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/task/TestTask.java diff --git a/fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/utils/AbstractScheduleJob.java b/maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/utils/AbstractScheduleJob.java similarity index 100% rename from fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/utils/AbstractScheduleJob.java rename to maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/utils/AbstractScheduleJob.java diff --git a/fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/utils/CronUtils.java b/maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/utils/CronUtils.java similarity index 100% rename from fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/utils/CronUtils.java rename to maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/utils/CronUtils.java diff --git a/fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/utils/ScheduleConcurrentExecution.java b/maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/utils/ScheduleConcurrentExecution.java similarity index 100% rename from fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/utils/ScheduleConcurrentExecution.java rename to maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/utils/ScheduleConcurrentExecution.java diff --git a/fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/utils/ScheduleDisallowConcurrentExecution.java b/maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/utils/ScheduleDisallowConcurrentExecution.java similarity index 100% rename from fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/utils/ScheduleDisallowConcurrentExecution.java rename to maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/utils/ScheduleDisallowConcurrentExecution.java diff --git a/fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/utils/ScheduleUtils.java b/maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/utils/ScheduleUtils.java similarity index 90% rename from fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/utils/ScheduleUtils.java rename to maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/utils/ScheduleUtils.java index fd4f373..31dea46 100644 --- a/fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/utils/ScheduleUtils.java +++ b/maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/utils/ScheduleUtils.java @@ -1,6 +1,6 @@ package net.maku.quartz.utils; -import net.maku.framework.common.exception.FastException; +import net.maku.framework.common.exception.ServerException; import net.maku.quartz.entity.ScheduleJobEntity; import net.maku.quartz.enums.ScheduleConcurrentEnum; import net.maku.quartz.enums.ScheduleStatusEnum; @@ -83,7 +83,7 @@ public class ScheduleUtils { scheduler.pauseJob(jobKey); } } catch (SchedulerException e) { - throw new FastException("创建定时任务失败", e); + throw new ServerException("创建定时任务失败", e); } } @@ -103,7 +103,7 @@ public class ScheduleUtils { scheduler.triggerJob(jobKey, dataMap); } } catch (SchedulerException e) { - throw new FastException("执行定时任务失败", e); + throw new ServerException("执行定时任务失败", e); } } @@ -114,7 +114,7 @@ public class ScheduleUtils { try { scheduler.pauseJob(getJobKey(scheduleJob)); } catch (SchedulerException e) { - throw new FastException("暂停定时任务失败", e); + throw new ServerException("暂停定时任务失败", e); } } @@ -125,7 +125,7 @@ public class ScheduleUtils { try { scheduler.resumeJob(getJobKey(scheduleJob)); } catch (SchedulerException e) { - throw new FastException("恢复定时任务失败", e); + throw new ServerException("恢复定时任务失败", e); } } @@ -142,7 +142,7 @@ public class ScheduleUtils { scheduler.deleteJob(jobKey); } }catch (SchedulerException e){ - throw new FastException("更新定时任务失败", e); + throw new ServerException("更新定时任务失败", e); } ScheduleUtils.createScheduleJob(scheduler, scheduleJob); @@ -155,7 +155,7 @@ public class ScheduleUtils { try { scheduler.deleteJob(getJobKey(scheduleJob)); } catch (SchedulerException e) { - throw new FastException("删除定时任务失败", e); + throw new ServerException("删除定时任务失败", e); } } } \ No newline at end of file diff --git a/fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/vo/ScheduleJobLogVO.java b/maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/vo/ScheduleJobLogVO.java similarity index 100% rename from fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/vo/ScheduleJobLogVO.java rename to maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/vo/ScheduleJobLogVO.java diff --git a/fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/vo/ScheduleJobVO.java b/maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/vo/ScheduleJobVO.java similarity index 100% rename from fast-boot-module/fast-boot-quartz/src/main/java/net/maku/quartz/vo/ScheduleJobVO.java rename to maku-boot-module/maku-boot-quartz/src/main/java/net/maku/quartz/vo/ScheduleJobVO.java diff --git a/fast-boot-module/pom.xml b/maku-boot-module/pom.xml similarity index 70% rename from fast-boot-module/pom.xml rename to maku-boot-module/pom.xml index 1d5ca4f..e24155f 100644 --- a/fast-boot-module/pom.xml +++ b/maku-boot-module/pom.xml @@ -1,16 +1,16 @@ net.maku - fast-boot + maku-boot ${revision} 4.0.0 - fast-boot-module + maku-boot-module pom - fast-boot-quartz - fast-boot-message + maku-boot-quartz + maku-boot-message \ No newline at end of file diff --git a/fast-boot-new/pom.xml b/maku-boot-new/pom.xml similarity index 78% rename from fast-boot-new/pom.xml rename to maku-boot-new/pom.xml index 6ae4d00..35bda5c 100644 --- a/fast-boot-new/pom.xml +++ b/maku-boot-new/pom.xml @@ -1,17 +1,17 @@ net.maku - fast-boot + maku-boot ${revision} 4.0.0 - fast-boot-new + maku-boot-new jar net.maku - fast-framework + maku-framework ${revision} diff --git a/fast-boot-new/src/main/java/net/maku/module/controller/TestController.java b/maku-boot-new/src/main/java/net/maku/module/controller/TestController.java similarity index 100% rename from fast-boot-new/src/main/java/net/maku/module/controller/TestController.java rename to maku-boot-new/src/main/java/net/maku/module/controller/TestController.java diff --git a/fast-boot-new/src/main/resources/auth.yml b/maku-boot-new/src/main/resources/auth.yml similarity index 100% rename from fast-boot-new/src/main/resources/auth.yml rename to maku-boot-new/src/main/resources/auth.yml diff --git a/fast-boot-system/pom.xml b/maku-boot-system/pom.xml similarity index 89% rename from fast-boot-system/pom.xml rename to maku-boot-system/pom.xml index d98b6c6..dd4d2d3 100644 --- a/fast-boot-system/pom.xml +++ b/maku-boot-system/pom.xml @@ -2,22 +2,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> net.maku - fast-boot + maku-boot ${revision} 4.0.0 - fast-boot-system + maku-boot-system jar net.maku - fast-framework + maku-framework ${revision} net.maku - fast-boot-api + maku-boot-api ${revision} diff --git a/fast-boot-system/src/main/java/net/maku/security/event/AuthenticationEvents.java b/maku-boot-system/src/main/java/net/maku/security/event/AuthenticationEvents.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/security/event/AuthenticationEvents.java rename to maku-boot-system/src/main/java/net/maku/security/event/AuthenticationEvents.java diff --git a/fast-boot-system/src/main/java/net/maku/security/service/MobileUserDetailsServiceImpl.java b/maku-boot-system/src/main/java/net/maku/security/service/MobileUserDetailsServiceImpl.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/security/service/MobileUserDetailsServiceImpl.java rename to maku-boot-system/src/main/java/net/maku/security/service/MobileUserDetailsServiceImpl.java diff --git a/fast-boot-system/src/main/java/net/maku/security/service/MobileVerifyCodeServiceImpl.java b/maku-boot-system/src/main/java/net/maku/security/service/MobileVerifyCodeServiceImpl.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/security/service/MobileVerifyCodeServiceImpl.java rename to maku-boot-system/src/main/java/net/maku/security/service/MobileVerifyCodeServiceImpl.java diff --git a/fast-boot-system/src/main/java/net/maku/security/service/UserDetailsServiceImpl.java b/maku-boot-system/src/main/java/net/maku/security/service/UserDetailsServiceImpl.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/security/service/UserDetailsServiceImpl.java rename to maku-boot-system/src/main/java/net/maku/security/service/UserDetailsServiceImpl.java diff --git a/fast-boot-system/src/main/java/net/maku/storage/config/LocalResourceConfiguration.java b/maku-boot-system/src/main/java/net/maku/storage/config/LocalResourceConfiguration.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/storage/config/LocalResourceConfiguration.java rename to maku-boot-system/src/main/java/net/maku/storage/config/LocalResourceConfiguration.java diff --git a/fast-boot-system/src/main/java/net/maku/storage/config/StorageConfiguration.java b/maku-boot-system/src/main/java/net/maku/storage/config/StorageConfiguration.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/storage/config/StorageConfiguration.java rename to maku-boot-system/src/main/java/net/maku/storage/config/StorageConfiguration.java diff --git a/fast-boot-system/src/main/java/net/maku/storage/enums/StorageTypeEnum.java b/maku-boot-system/src/main/java/net/maku/storage/enums/StorageTypeEnum.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/storage/enums/StorageTypeEnum.java rename to maku-boot-system/src/main/java/net/maku/storage/enums/StorageTypeEnum.java diff --git a/fast-boot-system/src/main/java/net/maku/storage/properties/AliyunStorageProperties.java b/maku-boot-system/src/main/java/net/maku/storage/properties/AliyunStorageProperties.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/storage/properties/AliyunStorageProperties.java rename to maku-boot-system/src/main/java/net/maku/storage/properties/AliyunStorageProperties.java diff --git a/fast-boot-system/src/main/java/net/maku/storage/properties/HuaweiStorageProperties.java b/maku-boot-system/src/main/java/net/maku/storage/properties/HuaweiStorageProperties.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/storage/properties/HuaweiStorageProperties.java rename to maku-boot-system/src/main/java/net/maku/storage/properties/HuaweiStorageProperties.java diff --git a/fast-boot-system/src/main/java/net/maku/storage/properties/LocalStorageProperties.java b/maku-boot-system/src/main/java/net/maku/storage/properties/LocalStorageProperties.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/storage/properties/LocalStorageProperties.java rename to maku-boot-system/src/main/java/net/maku/storage/properties/LocalStorageProperties.java diff --git a/fast-boot-system/src/main/java/net/maku/storage/properties/MinioStorageProperties.java b/maku-boot-system/src/main/java/net/maku/storage/properties/MinioStorageProperties.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/storage/properties/MinioStorageProperties.java rename to maku-boot-system/src/main/java/net/maku/storage/properties/MinioStorageProperties.java diff --git a/fast-boot-system/src/main/java/net/maku/storage/properties/QiniuStorageProperties.java b/maku-boot-system/src/main/java/net/maku/storage/properties/QiniuStorageProperties.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/storage/properties/QiniuStorageProperties.java rename to maku-boot-system/src/main/java/net/maku/storage/properties/QiniuStorageProperties.java diff --git a/fast-boot-system/src/main/java/net/maku/storage/properties/StorageProperties.java b/maku-boot-system/src/main/java/net/maku/storage/properties/StorageProperties.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/storage/properties/StorageProperties.java rename to maku-boot-system/src/main/java/net/maku/storage/properties/StorageProperties.java diff --git a/fast-boot-system/src/main/java/net/maku/storage/properties/TencentStorageProperties.java b/maku-boot-system/src/main/java/net/maku/storage/properties/TencentStorageProperties.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/storage/properties/TencentStorageProperties.java rename to maku-boot-system/src/main/java/net/maku/storage/properties/TencentStorageProperties.java diff --git a/fast-boot-system/src/main/java/net/maku/storage/service/AliyunStorageService.java b/maku-boot-system/src/main/java/net/maku/storage/service/AliyunStorageService.java similarity index 90% rename from fast-boot-system/src/main/java/net/maku/storage/service/AliyunStorageService.java rename to maku-boot-system/src/main/java/net/maku/storage/service/AliyunStorageService.java index 4051adb..913eddb 100644 --- a/fast-boot-system/src/main/java/net/maku/storage/service/AliyunStorageService.java +++ b/maku-boot-system/src/main/java/net/maku/storage/service/AliyunStorageService.java @@ -2,7 +2,7 @@ package net.maku.storage.service; import com.aliyun.oss.OSS; import com.aliyun.oss.OSSClientBuilder; -import net.maku.framework.common.exception.FastException; +import net.maku.framework.common.exception.ServerException; import net.maku.storage.properties.StorageProperties; import java.io.ByteArrayInputStream; @@ -31,7 +31,7 @@ public class AliyunStorageService extends StorageService { try { client.putObject(properties.getAliyun().getBucketName(), path, inputStream); } catch (Exception e) { - throw new FastException("上传文件失败：", e); + throw new ServerException("上传文件失败：", e); } finally { if (client != null) { client.shutdown(); diff --git a/fast-boot-system/src/main/java/net/maku/storage/service/HuaweiStorageService.java b/maku-boot-system/src/main/java/net/maku/storage/service/HuaweiStorageService.java similarity index 89% rename from fast-boot-system/src/main/java/net/maku/storage/service/HuaweiStorageService.java rename to maku-boot-system/src/main/java/net/maku/storage/service/HuaweiStorageService.java index b1e9b11..bea475c 100644 --- a/fast-boot-system/src/main/java/net/maku/storage/service/HuaweiStorageService.java +++ b/maku-boot-system/src/main/java/net/maku/storage/service/HuaweiStorageService.java @@ -1,7 +1,7 @@ package net.maku.storage.service; import com.obs.services.ObsClient; -import net.maku.framework.common.exception.FastException; +import net.maku.framework.common.exception.ServerException; import net.maku.storage.properties.StorageProperties; import java.io.ByteArrayInputStream; @@ -31,7 +31,7 @@ public class HuaweiStorageService extends StorageService { client.putObject(properties.getHuawei().getBucketName(), path, inputStream); client.close(); } catch (Exception e) { - throw new FastException("上传文件失败：", e); + throw new ServerException("上传文件失败：", e); } return properties.getConfig().getDomain() + "/" + path; diff --git a/fast-boot-system/src/main/java/net/maku/storage/service/LocalStorageService.java b/maku-boot-system/src/main/java/net/maku/storage/service/LocalStorageService.java similarity index 91% rename from fast-boot-system/src/main/java/net/maku/storage/service/LocalStorageService.java rename to maku-boot-system/src/main/java/net/maku/storage/service/LocalStorageService.java index 4ff6eff..59d1e84 100644 --- a/fast-boot-system/src/main/java/net/maku/storage/service/LocalStorageService.java +++ b/maku-boot-system/src/main/java/net/maku/storage/service/LocalStorageService.java @@ -1,6 +1,6 @@ package net.maku.storage.service; -import net.maku.framework.common.exception.FastException; +import net.maku.framework.common.exception.ServerException; import net.maku.storage.properties.StorageProperties; import org.springframework.util.FileCopyUtils; @@ -41,7 +41,7 @@ public class LocalStorageService extends StorageService { FileCopyUtils.copy(inputStream, Files.newOutputStream(file.toPath())); } catch (Exception e) { - throw new FastException("上传文件失败：", e); + throw new ServerException("上传文件失败：", e); } return properties.getConfig().getDomain() + "/" + properties.getLocal().getUrl() + "/" + path; diff --git a/fast-boot-system/src/main/java/net/maku/storage/service/MinioStorageService.java b/maku-boot-system/src/main/java/net/maku/storage/service/MinioStorageService.java similarity index 93% rename from fast-boot-system/src/main/java/net/maku/storage/service/MinioStorageService.java rename to maku-boot-system/src/main/java/net/maku/storage/service/MinioStorageService.java index 2f5aacb..e3f0b36 100644 --- a/fast-boot-system/src/main/java/net/maku/storage/service/MinioStorageService.java +++ b/maku-boot-system/src/main/java/net/maku/storage/service/MinioStorageService.java @@ -4,7 +4,7 @@ import io.minio.BucketExistsArgs; import io.minio.MakeBucketArgs; import io.minio.MinioClient; import io.minio.PutObjectArgs; -import net.maku.framework.common.exception.FastException; +import net.maku.framework.common.exception.ServerException; import net.maku.storage.properties.StorageProperties; import java.io.ByteArrayInputStream; @@ -48,7 +48,7 @@ public class MinioStorageService extends StorageService { ); } catch (Exception e) { - throw new FastException("上传文件失败：", e); + throw new ServerException("上传文件失败：", e); } return properties.getMinio().getEndPoint() + "/" + properties.getMinio().getBucketName() + "/" + path; diff --git a/fast-boot-system/src/main/java/net/maku/storage/service/QiniuStorageService.java b/maku-boot-system/src/main/java/net/maku/storage/service/QiniuStorageService.java similarity index 85% rename from fast-boot-system/src/main/java/net/maku/storage/service/QiniuStorageService.java rename to maku-boot-system/src/main/java/net/maku/storage/service/QiniuStorageService.java index a684c24..8d4a96f 100644 --- a/fast-boot-system/src/main/java/net/maku/storage/service/QiniuStorageService.java +++ b/maku-boot-system/src/main/java/net/maku/storage/service/QiniuStorageService.java @@ -6,7 +6,7 @@ import com.qiniu.storage.Region; import com.qiniu.storage.UploadManager; import com.qiniu.util.Auth; import com.qiniu.util.IOUtils; -import net.maku.framework.common.exception.FastException; +import net.maku.framework.common.exception.ServerException; import net.maku.storage.properties.StorageProperties; import java.io.IOException; @@ -34,12 +34,12 @@ public class QiniuStorageService extends StorageService { try { Response res = uploadManager.put(data, path, token); if (!res.isOK()) { - throw new FastException(res.toString()); + throw new ServerException(res.toString()); } return properties.getConfig().getDomain() + "/" + path; } catch (Exception e) { - throw new FastException("上传文件失败：", e); + throw new ServerException("上传文件失败：", e); } } @@ -49,7 +49,7 @@ public class QiniuStorageService extends StorageService { byte[] data = IOUtils.toByteArray(inputStream); return this.upload(data, path); } catch (IOException e) { - throw new FastException("上传文件失败：", e); + throw new ServerException("上传文件失败：", e); } } diff --git a/fast-boot-system/src/main/java/net/maku/storage/service/StorageService.java b/maku-boot-system/src/main/java/net/maku/storage/service/StorageService.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/storage/service/StorageService.java rename to maku-boot-system/src/main/java/net/maku/storage/service/StorageService.java diff --git a/fast-boot-system/src/main/java/net/maku/storage/service/TencentStorageService.java b/maku-boot-system/src/main/java/net/maku/storage/service/TencentStorageService.java similarity index 90% rename from fast-boot-system/src/main/java/net/maku/storage/service/TencentStorageService.java rename to maku-boot-system/src/main/java/net/maku/storage/service/TencentStorageService.java index 049a078..2c8cc0e 100644 --- a/fast-boot-system/src/main/java/net/maku/storage/service/TencentStorageService.java +++ b/maku-boot-system/src/main/java/net/maku/storage/service/TencentStorageService.java @@ -9,7 +9,7 @@ import com.qcloud.cos.model.ObjectMetadata; import com.qcloud.cos.model.PutObjectRequest; import com.qcloud.cos.model.PutObjectResult; import com.qcloud.cos.region.Region; -import net.maku.framework.common.exception.FastException; +import net.maku.framework.common.exception.ServerException; import net.maku.storage.properties.StorageProperties; import java.io.ByteArrayInputStream; @@ -54,10 +54,10 @@ public class TencentStorageService extends StorageService { cosClient.shutdown(); if (result.getETag() == null) { - throw new FastException("上传文件失败，请检查配置信息"); + throw new ServerException("上传文件失败，请检查配置信息"); } } catch (Exception e) { - throw new FastException("上传文件失败：", e); + throw new ServerException("上传文件失败：", e); } return properties.getConfig().getDomain() + "/" + path; diff --git a/fast-boot-system/src/main/java/net/maku/system/api/StorageApiImpl.java b/maku-boot-system/src/main/java/net/maku/system/api/StorageApiImpl.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/api/StorageApiImpl.java rename to maku-boot-system/src/main/java/net/maku/system/api/StorageApiImpl.java diff --git a/fast-boot-system/src/main/java/net/maku/system/controller/SysAttachmentController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysAttachmentController.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/controller/SysAttachmentController.java rename to maku-boot-system/src/main/java/net/maku/system/controller/SysAttachmentController.java diff --git a/fast-boot-system/src/main/java/net/maku/system/controller/SysAuthController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysAuthController.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/controller/SysAuthController.java rename to maku-boot-system/src/main/java/net/maku/system/controller/SysAuthController.java diff --git a/fast-boot-system/src/main/java/net/maku/system/controller/SysDictDataController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysDictDataController.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/controller/SysDictDataController.java rename to maku-boot-system/src/main/java/net/maku/system/controller/SysDictDataController.java diff --git a/fast-boot-system/src/main/java/net/maku/system/controller/SysDictTypeController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysDictTypeController.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/controller/SysDictTypeController.java rename to maku-boot-system/src/main/java/net/maku/system/controller/SysDictTypeController.java diff --git a/fast-boot-system/src/main/java/net/maku/system/controller/SysFileUploadController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysFileUploadController.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/controller/SysFileUploadController.java rename to maku-boot-system/src/main/java/net/maku/system/controller/SysFileUploadController.java diff --git a/fast-boot-system/src/main/java/net/maku/system/controller/SysLogLoginController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysLogLoginController.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/controller/SysLogLoginController.java rename to maku-boot-system/src/main/java/net/maku/system/controller/SysLogLoginController.java diff --git a/fast-boot-system/src/main/java/net/maku/system/controller/SysMenuController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysMenuController.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/controller/SysMenuController.java rename to maku-boot-system/src/main/java/net/maku/system/controller/SysMenuController.java diff --git a/fast-boot-system/src/main/java/net/maku/system/controller/SysOrgController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysOrgController.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/controller/SysOrgController.java rename to maku-boot-system/src/main/java/net/maku/system/controller/SysOrgController.java diff --git a/fast-boot-system/src/main/java/net/maku/system/controller/SysPostController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysPostController.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/controller/SysPostController.java rename to maku-boot-system/src/main/java/net/maku/system/controller/SysPostController.java diff --git a/fast-boot-system/src/main/java/net/maku/system/controller/SysRoleController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysRoleController.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/controller/SysRoleController.java rename to maku-boot-system/src/main/java/net/maku/system/controller/SysRoleController.java diff --git a/fast-boot-system/src/main/java/net/maku/system/controller/SysUserController.java b/maku-boot-system/src/main/java/net/maku/system/controller/SysUserController.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/controller/SysUserController.java rename to maku-boot-system/src/main/java/net/maku/system/controller/SysUserController.java diff --git a/fast-boot-system/src/main/java/net/maku/system/convert/SysAttachmentConvert.java b/maku-boot-system/src/main/java/net/maku/system/convert/SysAttachmentConvert.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/convert/SysAttachmentConvert.java rename to maku-boot-system/src/main/java/net/maku/system/convert/SysAttachmentConvert.java diff --git a/fast-boot-system/src/main/java/net/maku/system/convert/SysDictDataConvert.java b/maku-boot-system/src/main/java/net/maku/system/convert/SysDictDataConvert.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/convert/SysDictDataConvert.java rename to maku-boot-system/src/main/java/net/maku/system/convert/SysDictDataConvert.java diff --git a/fast-boot-system/src/main/java/net/maku/system/convert/SysDictTypeConvert.java b/maku-boot-system/src/main/java/net/maku/system/convert/SysDictTypeConvert.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/convert/SysDictTypeConvert.java rename to maku-boot-system/src/main/java/net/maku/system/convert/SysDictTypeConvert.java diff --git a/fast-boot-system/src/main/java/net/maku/system/convert/SysLogLoginConvert.java b/maku-boot-system/src/main/java/net/maku/system/convert/SysLogLoginConvert.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/convert/SysLogLoginConvert.java rename to maku-boot-system/src/main/java/net/maku/system/convert/SysLogLoginConvert.java diff --git a/fast-boot-system/src/main/java/net/maku/system/convert/SysMenuConvert.java b/maku-boot-system/src/main/java/net/maku/system/convert/SysMenuConvert.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/convert/SysMenuConvert.java rename to maku-boot-system/src/main/java/net/maku/system/convert/SysMenuConvert.java diff --git a/fast-boot-system/src/main/java/net/maku/system/convert/SysOrgConvert.java b/maku-boot-system/src/main/java/net/maku/system/convert/SysOrgConvert.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/convert/SysOrgConvert.java rename to maku-boot-system/src/main/java/net/maku/system/convert/SysOrgConvert.java diff --git a/fast-boot-system/src/main/java/net/maku/system/convert/SysPostConvert.java b/maku-boot-system/src/main/java/net/maku/system/convert/SysPostConvert.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/convert/SysPostConvert.java rename to maku-boot-system/src/main/java/net/maku/system/convert/SysPostConvert.java diff --git a/fast-boot-system/src/main/java/net/maku/system/convert/SysRoleConvert.java b/maku-boot-system/src/main/java/net/maku/system/convert/SysRoleConvert.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/convert/SysRoleConvert.java rename to maku-boot-system/src/main/java/net/maku/system/convert/SysRoleConvert.java diff --git a/fast-boot-system/src/main/java/net/maku/system/convert/SysUserConvert.java b/maku-boot-system/src/main/java/net/maku/system/convert/SysUserConvert.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/convert/SysUserConvert.java rename to maku-boot-system/src/main/java/net/maku/system/convert/SysUserConvert.java diff --git a/fast-boot-system/src/main/java/net/maku/system/dao/SysAttachmentDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysAttachmentDao.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/dao/SysAttachmentDao.java rename to maku-boot-system/src/main/java/net/maku/system/dao/SysAttachmentDao.java diff --git a/fast-boot-system/src/main/java/net/maku/system/dao/SysDictDataDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysDictDataDao.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/dao/SysDictDataDao.java rename to maku-boot-system/src/main/java/net/maku/system/dao/SysDictDataDao.java diff --git a/fast-boot-system/src/main/java/net/maku/system/dao/SysDictTypeDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysDictTypeDao.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/dao/SysDictTypeDao.java rename to maku-boot-system/src/main/java/net/maku/system/dao/SysDictTypeDao.java diff --git a/fast-boot-system/src/main/java/net/maku/system/dao/SysLogLoginDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysLogLoginDao.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/dao/SysLogLoginDao.java rename to maku-boot-system/src/main/java/net/maku/system/dao/SysLogLoginDao.java diff --git a/fast-boot-system/src/main/java/net/maku/system/dao/SysMenuDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysMenuDao.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/dao/SysMenuDao.java rename to maku-boot-system/src/main/java/net/maku/system/dao/SysMenuDao.java diff --git a/fast-boot-system/src/main/java/net/maku/system/dao/SysOrgDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysOrgDao.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/dao/SysOrgDao.java rename to maku-boot-system/src/main/java/net/maku/system/dao/SysOrgDao.java diff --git a/fast-boot-system/src/main/java/net/maku/system/dao/SysPostDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysPostDao.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/dao/SysPostDao.java rename to maku-boot-system/src/main/java/net/maku/system/dao/SysPostDao.java diff --git a/fast-boot-system/src/main/java/net/maku/system/dao/SysRoleDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysRoleDao.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/dao/SysRoleDao.java rename to maku-boot-system/src/main/java/net/maku/system/dao/SysRoleDao.java diff --git a/fast-boot-system/src/main/java/net/maku/system/dao/SysRoleDataScopeDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysRoleDataScopeDao.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/dao/SysRoleDataScopeDao.java rename to maku-boot-system/src/main/java/net/maku/system/dao/SysRoleDataScopeDao.java diff --git a/fast-boot-system/src/main/java/net/maku/system/dao/SysRoleMenuDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysRoleMenuDao.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/dao/SysRoleMenuDao.java rename to maku-boot-system/src/main/java/net/maku/system/dao/SysRoleMenuDao.java diff --git a/fast-boot-system/src/main/java/net/maku/system/dao/SysUserDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysUserDao.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/dao/SysUserDao.java rename to maku-boot-system/src/main/java/net/maku/system/dao/SysUserDao.java diff --git a/fast-boot-system/src/main/java/net/maku/system/dao/SysUserPostDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysUserPostDao.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/dao/SysUserPostDao.java rename to maku-boot-system/src/main/java/net/maku/system/dao/SysUserPostDao.java diff --git a/fast-boot-system/src/main/java/net/maku/system/dao/SysUserRoleDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysUserRoleDao.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/dao/SysUserRoleDao.java rename to maku-boot-system/src/main/java/net/maku/system/dao/SysUserRoleDao.java diff --git a/fast-boot-system/src/main/java/net/maku/system/entity/SysAttachmentEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysAttachmentEntity.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/entity/SysAttachmentEntity.java rename to maku-boot-system/src/main/java/net/maku/system/entity/SysAttachmentEntity.java diff --git a/fast-boot-system/src/main/java/net/maku/system/entity/SysDictDataEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysDictDataEntity.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/entity/SysDictDataEntity.java rename to maku-boot-system/src/main/java/net/maku/system/entity/SysDictDataEntity.java diff --git a/fast-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java rename to maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java diff --git a/fast-boot-system/src/main/java/net/maku/system/entity/SysLogLoginEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysLogLoginEntity.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/entity/SysLogLoginEntity.java rename to maku-boot-system/src/main/java/net/maku/system/entity/SysLogLoginEntity.java diff --git a/fast-boot-system/src/main/java/net/maku/system/entity/SysMenuEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysMenuEntity.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/entity/SysMenuEntity.java rename to maku-boot-system/src/main/java/net/maku/system/entity/SysMenuEntity.java diff --git a/fast-boot-system/src/main/java/net/maku/system/entity/SysOrgEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysOrgEntity.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/entity/SysOrgEntity.java rename to maku-boot-system/src/main/java/net/maku/system/entity/SysOrgEntity.java diff --git a/fast-boot-system/src/main/java/net/maku/system/entity/SysPostEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysPostEntity.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/entity/SysPostEntity.java rename to maku-boot-system/src/main/java/net/maku/system/entity/SysPostEntity.java diff --git a/fast-boot-system/src/main/java/net/maku/system/entity/SysRoleDataScopeEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysRoleDataScopeEntity.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/entity/SysRoleDataScopeEntity.java rename to maku-boot-system/src/main/java/net/maku/system/entity/SysRoleDataScopeEntity.java diff --git a/fast-boot-system/src/main/java/net/maku/system/entity/SysRoleEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysRoleEntity.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/entity/SysRoleEntity.java rename to maku-boot-system/src/main/java/net/maku/system/entity/SysRoleEntity.java diff --git a/fast-boot-system/src/main/java/net/maku/system/entity/SysRoleMenuEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysRoleMenuEntity.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/entity/SysRoleMenuEntity.java rename to maku-boot-system/src/main/java/net/maku/system/entity/SysRoleMenuEntity.java diff --git a/fast-boot-system/src/main/java/net/maku/system/entity/SysUserEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysUserEntity.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/entity/SysUserEntity.java rename to maku-boot-system/src/main/java/net/maku/system/entity/SysUserEntity.java diff --git a/fast-boot-system/src/main/java/net/maku/system/entity/SysUserPostEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysUserPostEntity.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/entity/SysUserPostEntity.java rename to maku-boot-system/src/main/java/net/maku/system/entity/SysUserPostEntity.java diff --git a/fast-boot-system/src/main/java/net/maku/system/entity/SysUserRoleEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysUserRoleEntity.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/entity/SysUserRoleEntity.java rename to maku-boot-system/src/main/java/net/maku/system/entity/SysUserRoleEntity.java diff --git a/fast-boot-system/src/main/java/net/maku/system/enums/DataScopeEnum.java b/maku-boot-system/src/main/java/net/maku/system/enums/DataScopeEnum.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/enums/DataScopeEnum.java rename to maku-boot-system/src/main/java/net/maku/system/enums/DataScopeEnum.java diff --git a/fast-boot-system/src/main/java/net/maku/system/enums/LoginOperationEnum.java b/maku-boot-system/src/main/java/net/maku/system/enums/LoginOperationEnum.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/enums/LoginOperationEnum.java rename to maku-boot-system/src/main/java/net/maku/system/enums/LoginOperationEnum.java diff --git a/fast-boot-system/src/main/java/net/maku/system/enums/MenuTypeEnum.java b/maku-boot-system/src/main/java/net/maku/system/enums/MenuTypeEnum.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/enums/MenuTypeEnum.java rename to maku-boot-system/src/main/java/net/maku/system/enums/MenuTypeEnum.java diff --git a/fast-boot-system/src/main/java/net/maku/system/enums/SuperAdminEnum.java b/maku-boot-system/src/main/java/net/maku/system/enums/SuperAdminEnum.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/enums/SuperAdminEnum.java rename to maku-boot-system/src/main/java/net/maku/system/enums/SuperAdminEnum.java diff --git a/fast-boot-system/src/main/java/net/maku/system/enums/UserStatusEnum.java b/maku-boot-system/src/main/java/net/maku/system/enums/UserStatusEnum.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/enums/UserStatusEnum.java rename to maku-boot-system/src/main/java/net/maku/system/enums/UserStatusEnum.java diff --git a/fast-boot-system/src/main/java/net/maku/system/query/SysAttachmentQuery.java b/maku-boot-system/src/main/java/net/maku/system/query/SysAttachmentQuery.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/query/SysAttachmentQuery.java rename to maku-boot-system/src/main/java/net/maku/system/query/SysAttachmentQuery.java diff --git a/fast-boot-system/src/main/java/net/maku/system/query/SysDictDataQuery.java b/maku-boot-system/src/main/java/net/maku/system/query/SysDictDataQuery.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/query/SysDictDataQuery.java rename to maku-boot-system/src/main/java/net/maku/system/query/SysDictDataQuery.java diff --git a/fast-boot-system/src/main/java/net/maku/system/query/SysDictTypeQuery.java b/maku-boot-system/src/main/java/net/maku/system/query/SysDictTypeQuery.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/query/SysDictTypeQuery.java rename to maku-boot-system/src/main/java/net/maku/system/query/SysDictTypeQuery.java diff --git a/fast-boot-system/src/main/java/net/maku/system/query/SysLogLoginQuery.java b/maku-boot-system/src/main/java/net/maku/system/query/SysLogLoginQuery.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/query/SysLogLoginQuery.java rename to maku-boot-system/src/main/java/net/maku/system/query/SysLogLoginQuery.java diff --git a/fast-boot-system/src/main/java/net/maku/system/query/SysPostQuery.java b/maku-boot-system/src/main/java/net/maku/system/query/SysPostQuery.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/query/SysPostQuery.java rename to maku-boot-system/src/main/java/net/maku/system/query/SysPostQuery.java diff --git a/fast-boot-system/src/main/java/net/maku/system/query/SysRoleQuery.java b/maku-boot-system/src/main/java/net/maku/system/query/SysRoleQuery.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/query/SysRoleQuery.java rename to maku-boot-system/src/main/java/net/maku/system/query/SysRoleQuery.java diff --git a/fast-boot-system/src/main/java/net/maku/system/query/SysRoleUserQuery.java b/maku-boot-system/src/main/java/net/maku/system/query/SysRoleUserQuery.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/query/SysRoleUserQuery.java rename to maku-boot-system/src/main/java/net/maku/system/query/SysRoleUserQuery.java diff --git a/fast-boot-system/src/main/java/net/maku/system/query/SysUserQuery.java b/maku-boot-system/src/main/java/net/maku/system/query/SysUserQuery.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/query/SysUserQuery.java rename to maku-boot-system/src/main/java/net/maku/system/query/SysUserQuery.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/SysAttachmentService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysAttachmentService.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/SysAttachmentService.java rename to maku-boot-system/src/main/java/net/maku/system/service/SysAttachmentService.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/SysAuthService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysAuthService.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/SysAuthService.java rename to maku-boot-system/src/main/java/net/maku/system/service/SysAuthService.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/SysCaptchaService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysCaptchaService.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/SysCaptchaService.java rename to maku-boot-system/src/main/java/net/maku/system/service/SysCaptchaService.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/SysDictDataService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysDictDataService.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/SysDictDataService.java rename to maku-boot-system/src/main/java/net/maku/system/service/SysDictDataService.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/SysDictTypeService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysDictTypeService.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/SysDictTypeService.java rename to maku-boot-system/src/main/java/net/maku/system/service/SysDictTypeService.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/SysLogLoginService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysLogLoginService.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/SysLogLoginService.java rename to maku-boot-system/src/main/java/net/maku/system/service/SysLogLoginService.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/SysMenuService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysMenuService.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/SysMenuService.java rename to maku-boot-system/src/main/java/net/maku/system/service/SysMenuService.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/SysOrgService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysOrgService.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/SysOrgService.java rename to maku-boot-system/src/main/java/net/maku/system/service/SysOrgService.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/SysPostService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysPostService.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/SysPostService.java rename to maku-boot-system/src/main/java/net/maku/system/service/SysPostService.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/SysRoleDataScopeService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysRoleDataScopeService.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/SysRoleDataScopeService.java rename to maku-boot-system/src/main/java/net/maku/system/service/SysRoleDataScopeService.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/SysRoleMenuService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysRoleMenuService.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/SysRoleMenuService.java rename to maku-boot-system/src/main/java/net/maku/system/service/SysRoleMenuService.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/SysRoleService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysRoleService.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/SysRoleService.java rename to maku-boot-system/src/main/java/net/maku/system/service/SysRoleService.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/SysUserDetailsService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysUserDetailsService.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/SysUserDetailsService.java rename to maku-boot-system/src/main/java/net/maku/system/service/SysUserDetailsService.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/SysUserPostService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysUserPostService.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/SysUserPostService.java rename to maku-boot-system/src/main/java/net/maku/system/service/SysUserPostService.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/SysUserRoleService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysUserRoleService.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/SysUserRoleService.java rename to maku-boot-system/src/main/java/net/maku/system/service/SysUserRoleService.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/SysUserService.java b/maku-boot-system/src/main/java/net/maku/system/service/SysUserService.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/SysUserService.java rename to maku-boot-system/src/main/java/net/maku/system/service/SysUserService.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysAttachmentServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysAttachmentServiceImpl.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/impl/SysAttachmentServiceImpl.java rename to maku-boot-system/src/main/java/net/maku/system/service/impl/SysAttachmentServiceImpl.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysAuthServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysAuthServiceImpl.java similarity index 92% rename from fast-boot-system/src/main/java/net/maku/system/service/impl/SysAuthServiceImpl.java rename to maku-boot-system/src/main/java/net/maku/system/service/impl/SysAuthServiceImpl.java index 41769c9..4586eab 100644 --- a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysAuthServiceImpl.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysAuthServiceImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.util.RandomUtil; import lombok.AllArgsConstructor; import net.maku.api.module.message.SmsApi; import net.maku.framework.common.constant.Constant; -import net.maku.framework.common.exception.FastException; +import net.maku.framework.common.exception.ServerException; import net.maku.framework.security.cache.TokenStoreCache; import net.maku.framework.security.mobile.MobileAuthenticationToken; import net.maku.framework.security.user.UserDetail; @@ -47,7 +47,7 @@ public class SysAuthServiceImpl implements SysAuthService { // 保存登录日志 sysLogLoginService.save(login.getUsername(), Constant.FAIL, LoginOperationEnum.CAPTCHA_FAIL.getValue()); - throw new FastException("验证码错误"); + throw new ServerException("验证码错误"); } Authentication authentication; @@ -56,7 +56,7 @@ public class SysAuthServiceImpl implements SysAuthService { authentication = authenticationManager.authenticate( new UsernamePasswordAuthenticationToken(login.getUsername(), login.getPassword())); } catch (BadCredentialsException e) { - throw new FastException("用户名或密码错误"); + throw new ServerException("用户名或密码错误"); } // 用户信息 @@ -79,7 +79,7 @@ public class SysAuthServiceImpl implements SysAuthService { authentication = authenticationManager.authenticate( new MobileAuthenticationToken(login.getMobile(), login.getCode())); } catch (BadCredentialsException e) { - throw new FastException("手机号或验证码错误"); + throw new ServerException("手机号或验证码错误"); } // 用户信息 @@ -101,7 +101,7 @@ public class SysAuthServiceImpl implements SysAuthService { SysUserVO user = sysUserService.getByMobile(mobile); if (user == null) { - throw new FastException("手机号未注册"); + throw new ServerException("手机号未注册"); } // 发送短信 diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysCaptchaServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysCaptchaServiceImpl.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/impl/SysCaptchaServiceImpl.java rename to maku-boot-system/src/main/java/net/maku/system/service/impl/SysCaptchaServiceImpl.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysDictDataServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictDataServiceImpl.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/impl/SysDictDataServiceImpl.java rename to maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictDataServiceImpl.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java rename to maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysLogLoginServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysLogLoginServiceImpl.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/impl/SysLogLoginServiceImpl.java rename to maku-boot-system/src/main/java/net/maku/system/service/impl/SysLogLoginServiceImpl.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysMenuServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysMenuServiceImpl.java similarity index 96% rename from fast-boot-system/src/main/java/net/maku/system/service/impl/SysMenuServiceImpl.java rename to maku-boot-system/src/main/java/net/maku/system/service/impl/SysMenuServiceImpl.java index e7c347e..69b0f93 100644 --- a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysMenuServiceImpl.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysMenuServiceImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.AllArgsConstructor; import net.maku.framework.common.constant.Constant; -import net.maku.framework.common.exception.FastException; +import net.maku.framework.common.exception.ServerException; import net.maku.framework.common.service.impl.BaseServiceImpl; import net.maku.framework.common.utils.TreeUtils; import net.maku.framework.security.user.UserDetail; @@ -49,7 +49,7 @@ public class SysMenuServiceImpl extends BaseServiceImpl // 上级机构不能为自身 if(entity.getId().equals(entity.getPid())){ - throw new FastException("上级机构不能为自身"); + throw new ServerException("上级机构不能为自身"); } // 上级机构不能为下级 List subOrgList = getSubOrgIdList(entity.getId()); if(subOrgList.contains(entity.getPid())){ - throw new FastException("上级机构不能为下级"); + throw new ServerException("上级机构不能为下级"); } updateById(entity); @@ -77,13 +77,13 @@ public class SysOrgServiceImpl extends BaseServiceImpl // 判断是否有子机构 long orgCount = count(new QueryWrapper().eq("pid", id)); if(orgCount > 0){ - throw new FastException("请先删除子机构"); + throw new ServerException("请先删除子机构"); } // 判断机构下面是否有用户 long userCount = sysUserDao.selectCount(new QueryWrapper().eq("org_id", id)); if(userCount > 0){ - throw new FastException("机构下面有用户，不能删除"); + throw new ServerException("机构下面有用户，不能删除"); } // 删除 diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysPostServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysPostServiceImpl.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/impl/SysPostServiceImpl.java rename to maku-boot-system/src/main/java/net/maku/system/service/impl/SysPostServiceImpl.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleDataScopeServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysRoleDataScopeServiceImpl.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleDataScopeServiceImpl.java rename to maku-boot-system/src/main/java/net/maku/system/service/impl/SysRoleDataScopeServiceImpl.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleMenuServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysRoleMenuServiceImpl.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleMenuServiceImpl.java rename to maku-boot-system/src/main/java/net/maku/system/service/impl/SysRoleMenuServiceImpl.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysRoleServiceImpl.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/impl/SysRoleServiceImpl.java rename to maku-boot-system/src/main/java/net/maku/system/service/impl/SysRoleServiceImpl.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysUserDetailsServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserDetailsServiceImpl.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/impl/SysUserDetailsServiceImpl.java rename to maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserDetailsServiceImpl.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysUserPostServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserPostServiceImpl.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/impl/SysUserPostServiceImpl.java rename to maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserPostServiceImpl.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysUserRoleServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserRoleServiceImpl.java similarity index 100% rename from fast-boot-system/src/main/java/net/maku/system/service/impl/SysUserRoleServiceImpl.java rename to maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserRoleServiceImpl.java diff --git a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysUserServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserServiceImpl.java similarity index 93% rename from fast-boot-system/src/main/java/net/maku/system/service/impl/SysUserServiceImpl.java rename to maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserServiceImpl.java index c724774..09e4383 100644 --- a/fast-boot-system/src/main/java/net/maku/system/service/impl/SysUserServiceImpl.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserServiceImpl.java @@ -3,7 +3,7 @@ package net.maku.system.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; import net.maku.framework.common.constant.Constant; -import net.maku.framework.common.exception.FastException; +import net.maku.framework.common.exception.ServerException; import net.maku.framework.common.page.PageResult; import net.maku.framework.common.service.impl.BaseServiceImpl; import net.maku.system.convert.SysUserConvert; @@ -71,13 +71,13 @@ public class SysUserServiceImpl extends BaseServiceImpl net.maku - fast-boot + maku-boot ${revision} 4.0.0 - fast-framework + maku-framework jar diff --git a/fast-framework/src/main/java/net/maku/framework/common/cache/RedisCache.java b/maku-framework/src/main/java/net/maku/framework/common/cache/RedisCache.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/common/cache/RedisCache.java rename to maku-framework/src/main/java/net/maku/framework/common/cache/RedisCache.java diff --git a/fast-framework/src/main/java/net/maku/framework/common/cache/RedisKeys.java b/maku-framework/src/main/java/net/maku/framework/common/cache/RedisKeys.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/common/cache/RedisKeys.java rename to maku-framework/src/main/java/net/maku/framework/common/cache/RedisKeys.java diff --git a/fast-framework/src/main/java/net/maku/framework/common/constant/Constant.java b/maku-framework/src/main/java/net/maku/framework/common/constant/Constant.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/common/constant/Constant.java rename to maku-framework/src/main/java/net/maku/framework/common/constant/Constant.java diff --git a/fast-framework/src/main/java/net/maku/framework/common/dao/BaseDao.java b/maku-framework/src/main/java/net/maku/framework/common/dao/BaseDao.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/common/dao/BaseDao.java rename to maku-framework/src/main/java/net/maku/framework/common/dao/BaseDao.java diff --git a/fast-framework/src/main/java/net/maku/framework/common/entity/BaseEntity.java b/maku-framework/src/main/java/net/maku/framework/common/entity/BaseEntity.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/common/entity/BaseEntity.java rename to maku-framework/src/main/java/net/maku/framework/common/entity/BaseEntity.java diff --git a/fast-framework/src/main/java/net/maku/framework/common/exception/ErrorCode.java b/maku-framework/src/main/java/net/maku/framework/common/exception/ErrorCode.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/common/exception/ErrorCode.java rename to maku-framework/src/main/java/net/maku/framework/common/exception/ErrorCode.java diff --git a/fast-framework/src/main/java/net/maku/framework/common/exception/FastException.java b/maku-framework/src/main/java/net/maku/framework/common/exception/ServerException.java similarity index 75% rename from fast-framework/src/main/java/net/maku/framework/common/exception/FastException.java rename to maku-framework/src/main/java/net/maku/framework/common/exception/ServerException.java index 57f0aad..f6c92e3 100644 --- a/fast-framework/src/main/java/net/maku/framework/common/exception/FastException.java +++ b/maku-framework/src/main/java/net/maku/framework/common/exception/ServerException.java @@ -10,25 +10,25 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper = true) -public class FastException extends RuntimeException { +public class ServerException extends RuntimeException { private static final long serialVersionUID = 1L; private int code; private String msg; - public FastException(String msg) { + public ServerException(String msg) { super(msg); this.code = ErrorCode.INTERNAL_SERVER_ERROR.getCode(); this.msg = msg; } - public FastException(ErrorCode errorCode) { + public ServerException(ErrorCode errorCode) { super(errorCode.getMsg()); this.code = errorCode.getCode(); this.msg = errorCode.getMsg(); } - public FastException(String msg, Throwable e) { + public ServerException(String msg, Throwable e) { super(msg, e); this.code = ErrorCode.INTERNAL_SERVER_ERROR.getCode(); this.msg = msg; diff --git a/fast-framework/src/main/java/net/maku/framework/common/exception/FastExceptionHandler.java b/maku-framework/src/main/java/net/maku/framework/common/exception/ServerExceptionHandler.java similarity index 89% rename from fast-framework/src/main/java/net/maku/framework/common/exception/FastExceptionHandler.java rename to maku-framework/src/main/java/net/maku/framework/common/exception/ServerExceptionHandler.java index 336b9f6..fbcf5e5 100644 --- a/fast-framework/src/main/java/net/maku/framework/common/exception/FastExceptionHandler.java +++ b/maku-framework/src/main/java/net/maku/framework/common/exception/ServerExceptionHandler.java @@ -16,12 +16,12 @@ import org.springframework.web.bind.annotation.RestControllerAdvice; */ @Slf4j @RestControllerAdvice -public class FastExceptionHandler { +public class ServerExceptionHandler { /** * 处理自定义异常 */ - @ExceptionHandler(FastException.class) - public Result handleException(FastException ex){ + @ExceptionHandler(ServerException.class) + public Result handleException(ServerException ex){ return Result.error(ex.getCode(), ex.getMsg()); } diff --git a/fast-framework/src/main/java/net/maku/framework/common/handler/FieldMetaObjectHandler.java b/maku-framework/src/main/java/net/maku/framework/common/handler/FieldMetaObjectHandler.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/common/handler/FieldMetaObjectHandler.java rename to maku-framework/src/main/java/net/maku/framework/common/handler/FieldMetaObjectHandler.java diff --git a/fast-framework/src/main/java/net/maku/framework/common/interceptor/DataScope.java b/maku-framework/src/main/java/net/maku/framework/common/interceptor/DataScope.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/common/interceptor/DataScope.java rename to maku-framework/src/main/java/net/maku/framework/common/interceptor/DataScope.java diff --git a/fast-framework/src/main/java/net/maku/framework/common/interceptor/DataScopeInnerInterceptor.java b/maku-framework/src/main/java/net/maku/framework/common/interceptor/DataScopeInnerInterceptor.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/common/interceptor/DataScopeInnerInterceptor.java rename to maku-framework/src/main/java/net/maku/framework/common/interceptor/DataScopeInnerInterceptor.java diff --git a/fast-framework/src/main/java/net/maku/framework/common/page/PageResult.java b/maku-framework/src/main/java/net/maku/framework/common/page/PageResult.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/common/page/PageResult.java rename to maku-framework/src/main/java/net/maku/framework/common/page/PageResult.java diff --git a/fast-framework/src/main/java/net/maku/framework/common/query/Query.java b/maku-framework/src/main/java/net/maku/framework/common/query/Query.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/common/query/Query.java rename to maku-framework/src/main/java/net/maku/framework/common/query/Query.java diff --git a/fast-framework/src/main/java/net/maku/framework/common/service/BaseService.java b/maku-framework/src/main/java/net/maku/framework/common/service/BaseService.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/common/service/BaseService.java rename to maku-framework/src/main/java/net/maku/framework/common/service/BaseService.java diff --git a/fast-framework/src/main/java/net/maku/framework/common/service/impl/BaseServiceImpl.java b/maku-framework/src/main/java/net/maku/framework/common/service/impl/BaseServiceImpl.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/common/service/impl/BaseServiceImpl.java rename to maku-framework/src/main/java/net/maku/framework/common/service/impl/BaseServiceImpl.java diff --git a/fast-framework/src/main/java/net/maku/framework/common/utils/AddressUtils.java b/maku-framework/src/main/java/net/maku/framework/common/utils/AddressUtils.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/common/utils/AddressUtils.java rename to maku-framework/src/main/java/net/maku/framework/common/utils/AddressUtils.java diff --git a/fast-framework/src/main/java/net/maku/framework/common/utils/AssertUtils.java b/maku-framework/src/main/java/net/maku/framework/common/utils/AssertUtils.java similarity index 68% rename from fast-framework/src/main/java/net/maku/framework/common/utils/AssertUtils.java rename to maku-framework/src/main/java/net/maku/framework/common/utils/AssertUtils.java index 094d60a..bcd9c1a 100644 --- a/fast-framework/src/main/java/net/maku/framework/common/utils/AssertUtils.java +++ b/maku-framework/src/main/java/net/maku/framework/common/utils/AssertUtils.java @@ -2,7 +2,7 @@ package net.maku.framework.common.utils; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; -import net.maku.framework.common.exception.FastException; +import net.maku.framework.common.exception.ServerException; /** * 校验工具类 @@ -13,19 +13,19 @@ public class AssertUtils { public static void isBlank(String str, String variable) { if (StrUtil.isBlank(str)) { - throw new FastException(variable + "不能为空"); + throw new ServerException(variable + "不能为空"); } } public static void isNull(Object object, String variable) { if (object == null) { - throw new FastException(variable + "不能为空"); + throw new ServerException(variable + "不能为空"); } } public static void isArrayEmpty(Object[] array, String variable) { if(ArrayUtil.isEmpty(array)){ - throw new FastException(variable + "不能为空"); + throw new ServerException(variable + "不能为空"); } } diff --git a/fast-framework/src/main/java/net/maku/framework/common/utils/DateUtils.java b/maku-framework/src/main/java/net/maku/framework/common/utils/DateUtils.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/common/utils/DateUtils.java rename to maku-framework/src/main/java/net/maku/framework/common/utils/DateUtils.java diff --git a/fast-framework/src/main/java/net/maku/framework/common/utils/ExceptionUtils.java b/maku-framework/src/main/java/net/maku/framework/common/utils/ExceptionUtils.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/common/utils/ExceptionUtils.java rename to maku-framework/src/main/java/net/maku/framework/common/utils/ExceptionUtils.java diff --git a/fast-framework/src/main/java/net/maku/framework/common/utils/HttpContextUtils.java b/maku-framework/src/main/java/net/maku/framework/common/utils/HttpContextUtils.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/common/utils/HttpContextUtils.java rename to maku-framework/src/main/java/net/maku/framework/common/utils/HttpContextUtils.java diff --git a/fast-framework/src/main/java/net/maku/framework/common/utils/IpUtils.java b/maku-framework/src/main/java/net/maku/framework/common/utils/IpUtils.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/common/utils/IpUtils.java rename to maku-framework/src/main/java/net/maku/framework/common/utils/IpUtils.java diff --git a/fast-framework/src/main/java/net/maku/framework/common/utils/JsonUtils.java b/maku-framework/src/main/java/net/maku/framework/common/utils/JsonUtils.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/common/utils/JsonUtils.java rename to maku-framework/src/main/java/net/maku/framework/common/utils/JsonUtils.java diff --git a/fast-framework/src/main/java/net/maku/framework/common/utils/Result.java b/maku-framework/src/main/java/net/maku/framework/common/utils/Result.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/common/utils/Result.java rename to maku-framework/src/main/java/net/maku/framework/common/utils/Result.java diff --git a/fast-framework/src/main/java/net/maku/framework/common/utils/TreeNode.java b/maku-framework/src/main/java/net/maku/framework/common/utils/TreeNode.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/common/utils/TreeNode.java rename to maku-framework/src/main/java/net/maku/framework/common/utils/TreeNode.java diff --git a/fast-framework/src/main/java/net/maku/framework/common/utils/TreeUtils.java b/maku-framework/src/main/java/net/maku/framework/common/utils/TreeUtils.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/common/utils/TreeUtils.java rename to maku-framework/src/main/java/net/maku/framework/common/utils/TreeUtils.java diff --git a/fast-framework/src/main/java/net/maku/framework/config/CorsConfig.java b/maku-framework/src/main/java/net/maku/framework/config/CorsConfig.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/config/CorsConfig.java rename to maku-framework/src/main/java/net/maku/framework/config/CorsConfig.java diff --git a/fast-framework/src/main/java/net/maku/framework/config/MybatisPlusConfig.java b/maku-framework/src/main/java/net/maku/framework/config/MybatisPlusConfig.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/config/MybatisPlusConfig.java rename to maku-framework/src/main/java/net/maku/framework/config/MybatisPlusConfig.java diff --git a/fast-framework/src/main/java/net/maku/framework/config/RedisConfig.java b/maku-framework/src/main/java/net/maku/framework/config/RedisConfig.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/config/RedisConfig.java rename to maku-framework/src/main/java/net/maku/framework/config/RedisConfig.java diff --git a/fast-framework/src/main/java/net/maku/framework/config/SwaggerConfig.java b/maku-framework/src/main/java/net/maku/framework/config/SwaggerConfig.java similarity index 89% rename from fast-framework/src/main/java/net/maku/framework/config/SwaggerConfig.java rename to maku-framework/src/main/java/net/maku/framework/config/SwaggerConfig.java index e4c2afb..e82832e 100644 --- a/fast-framework/src/main/java/net/maku/framework/config/SwaggerConfig.java +++ b/maku-framework/src/main/java/net/maku/framework/config/SwaggerConfig.java @@ -20,7 +20,7 @@ public class SwaggerConfig{ public GroupedOpenApi userApi(){ String[] paths = { "/**" }; String[] packagedToMatch = { "net.maku" }; - return GroupedOpenApi.builder().group("FastBoot") + return GroupedOpenApi.builder().group("MakuBoot") .pathsToMatch(paths) .packagesToScan(packagedToMatch).build(); } @@ -31,8 +31,8 @@ public class SwaggerConfig{ contact.setName("阿沐 babamu@126.com"); return new OpenAPI().info(new Info() - .title("FastBoot") - .description( "FastBoot") + .title("MakuBoot") + .description( "MakuBoot") .contact(contact) .version("1.0") .termsOfService("https://maku.net") diff --git a/fast-framework/src/main/java/net/maku/framework/config/WebConfig.java b/maku-framework/src/main/java/net/maku/framework/config/WebConfig.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/config/WebConfig.java rename to maku-framework/src/main/java/net/maku/framework/config/WebConfig.java diff --git a/fast-framework/src/main/java/net/maku/framework/security/cache/TokenStoreCache.java b/maku-framework/src/main/java/net/maku/framework/security/cache/TokenStoreCache.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/security/cache/TokenStoreCache.java rename to maku-framework/src/main/java/net/maku/framework/security/cache/TokenStoreCache.java diff --git a/fast-framework/src/main/java/net/maku/framework/security/config/PasswordConfig.java b/maku-framework/src/main/java/net/maku/framework/security/config/PasswordConfig.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/security/config/PasswordConfig.java rename to maku-framework/src/main/java/net/maku/framework/security/config/PasswordConfig.java diff --git a/fast-framework/src/main/java/net/maku/framework/security/config/PermitResource.java b/maku-framework/src/main/java/net/maku/framework/security/config/PermitResource.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/security/config/PermitResource.java rename to maku-framework/src/main/java/net/maku/framework/security/config/PermitResource.java diff --git a/fast-framework/src/main/java/net/maku/framework/security/config/SecurityConfig.java b/maku-framework/src/main/java/net/maku/framework/security/config/SecurityConfig.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/security/config/SecurityConfig.java rename to maku-framework/src/main/java/net/maku/framework/security/config/SecurityConfig.java diff --git a/fast-framework/src/main/java/net/maku/framework/security/exception/SecurityAuthenticationEntryPoint.java b/maku-framework/src/main/java/net/maku/framework/security/exception/SecurityAuthenticationEntryPoint.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/security/exception/SecurityAuthenticationEntryPoint.java rename to maku-framework/src/main/java/net/maku/framework/security/exception/SecurityAuthenticationEntryPoint.java diff --git a/fast-framework/src/main/java/net/maku/framework/security/filter/AuthenticationTokenFilter.java b/maku-framework/src/main/java/net/maku/framework/security/filter/AuthenticationTokenFilter.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/security/filter/AuthenticationTokenFilter.java rename to maku-framework/src/main/java/net/maku/framework/security/filter/AuthenticationTokenFilter.java diff --git a/fast-framework/src/main/java/net/maku/framework/security/mobile/MobileAuthenticationProvider.java b/maku-framework/src/main/java/net/maku/framework/security/mobile/MobileAuthenticationProvider.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/security/mobile/MobileAuthenticationProvider.java rename to maku-framework/src/main/java/net/maku/framework/security/mobile/MobileAuthenticationProvider.java diff --git a/fast-framework/src/main/java/net/maku/framework/security/mobile/MobileAuthenticationToken.java b/maku-framework/src/main/java/net/maku/framework/security/mobile/MobileAuthenticationToken.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/security/mobile/MobileAuthenticationToken.java rename to maku-framework/src/main/java/net/maku/framework/security/mobile/MobileAuthenticationToken.java diff --git a/fast-framework/src/main/java/net/maku/framework/security/mobile/MobileUserDetailsService.java b/maku-framework/src/main/java/net/maku/framework/security/mobile/MobileUserDetailsService.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/security/mobile/MobileUserDetailsService.java rename to maku-framework/src/main/java/net/maku/framework/security/mobile/MobileUserDetailsService.java diff --git a/fast-framework/src/main/java/net/maku/framework/security/mobile/MobileVerifyCodeService.java b/maku-framework/src/main/java/net/maku/framework/security/mobile/MobileVerifyCodeService.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/security/mobile/MobileVerifyCodeService.java rename to maku-framework/src/main/java/net/maku/framework/security/mobile/MobileVerifyCodeService.java diff --git a/fast-framework/src/main/java/net/maku/framework/security/user/SecurityUser.java b/maku-framework/src/main/java/net/maku/framework/security/user/SecurityUser.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/security/user/SecurityUser.java rename to maku-framework/src/main/java/net/maku/framework/security/user/SecurityUser.java diff --git a/fast-framework/src/main/java/net/maku/framework/security/user/UserDetail.java b/maku-framework/src/main/java/net/maku/framework/security/user/UserDetail.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/security/user/UserDetail.java rename to maku-framework/src/main/java/net/maku/framework/security/user/UserDetail.java diff --git a/fast-framework/src/main/java/net/maku/framework/security/utils/TokenUtils.java b/maku-framework/src/main/java/net/maku/framework/security/utils/TokenUtils.java similarity index 100% rename from fast-framework/src/main/java/net/maku/framework/security/utils/TokenUtils.java rename to maku-framework/src/main/java/net/maku/framework/security/utils/TokenUtils.java diff --git a/fast-framework/src/main/resources/auth.yml b/maku-framework/src/main/resources/auth.yml similarity index 100% rename from fast-framework/src/main/resources/auth.yml rename to maku-framework/src/main/resources/auth.yml diff --git a/fast-server/pom.xml b/maku-server/pom.xml similarity index 84% rename from fast-server/pom.xml rename to maku-server/pom.xml index 878bf56..4924993 100644 --- a/fast-server/pom.xml +++ b/maku-server/pom.xml @@ -2,32 +2,32 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> net.maku - fast-boot + maku-boot ${revision} 4.0.0 - fast-server + maku-server jar - + net.maku - fast-boot-new + maku-boot-system ${revision} net.maku - fast-boot-quartz + maku-boot-new ${revision} net.maku - fast-boot-message + maku-boot-quartz ${revision} net.maku - fast-boot-system + maku-boot-message ${revision} diff --git a/fast-server/src/main/java/net/maku/ServerApplication.java b/maku-server/src/main/java/net/maku/ServerApplication.java similarity index 100% rename from fast-server/src/main/java/net/maku/ServerApplication.java rename to maku-server/src/main/java/net/maku/ServerApplication.java diff --git a/fast-server/src/main/resources/application-dev.yml b/maku-server/src/main/resources/application-dev.yml similarity index 84% rename from fast-server/src/main/resources/application-dev.yml rename to maku-server/src/main/resources/application-dev.yml index 51371e6..d6badf2 100644 --- a/fast-server/src/main/resources/application-dev.yml +++ b/maku-server/src/main/resources/application-dev.yml @@ -7,12 +7,12 @@ spring: #timeout: 6000ms # 连接超时时长（毫秒） datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/fast_boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true - username: fast + url: jdbc:mysql://localhost:3306/maku_boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true + username: maku password: 123456 # driver-class-name: dm.jdbc.driver.DmDriver -# url: jdbc:dm://192.168.3.19:5236/fast_boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true -# username: fast_boot +# url: jdbc:dm://192.168.3.19:5236/maku_boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true +# username: maku_boot # password: 12345678 hikari: connection-timeout: 30000 # 等待连接池分配链接的最大时长（毫秒），超过这个时长还没有可用的连接则发生 SQLException，默认：30 秒 @@ -22,4 +22,4 @@ spring: idle-timeout: 600000 # 连接超时的最大时长（毫秒），超时则被释放（retired），默认：10 分钟 max-lifetime: 1800000 # 连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认： 30 分钟 connection-test-query: SELECT 1 - pool-name: FastHikariCP \ No newline at end of file + pool-name: MakuHikariCP \ No newline at end of file diff --git a/fast-server/src/main/resources/application-prod.yml b/maku-server/src/main/resources/application-prod.yml similarity index 90% rename from fast-server/src/main/resources/application-prod.yml rename to maku-server/src/main/resources/application-prod.yml index 7b94da7..64b48bc 100644 --- a/fast-server/src/main/resources/application-prod.yml +++ b/maku-server/src/main/resources/application-prod.yml @@ -8,8 +8,8 @@ spring: datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/fast_boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true - username: fast + url: jdbc:mysql://localhost:3306/maku_boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true + username: maku password: 123456 hikari: connection-timeout: 30000 # 等待连接池分配链接的最大时长（毫秒），超过这个时长还没有可用的连接则发生 SQLException，默认：30 秒 @@ -19,4 +19,4 @@ spring: idle-timeout: 600000 # 连接超时的最大时长（毫秒），超时则被释放（retired），默认：10 分钟 max-lifetime: 1800000 # 连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认： 30 分钟 connection-test-query: SELECT 1 - pool-name: FastHikariCP \ No newline at end of file + pool-name: MakuHikariCP \ No newline at end of file diff --git a/fast-server/src/main/resources/application-test.yml b/maku-server/src/main/resources/application-test.yml similarity index 90% rename from fast-server/src/main/resources/application-test.yml rename to maku-server/src/main/resources/application-test.yml index 7b94da7..64b48bc 100644 --- a/fast-server/src/main/resources/application-test.yml +++ b/maku-server/src/main/resources/application-test.yml @@ -8,8 +8,8 @@ spring: datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/fast_boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true - username: fast + url: jdbc:mysql://localhost:3306/maku_boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true + username: maku password: 123456 hikari: connection-timeout: 30000 # 等待连接池分配链接的最大时长（毫秒），超过这个时长还没有可用的连接则发生 SQLException，默认：30 秒 @@ -19,4 +19,4 @@ spring: idle-timeout: 600000 # 连接超时的最大时长（毫秒），超时则被释放（retired），默认：10 分钟 max-lifetime: 1800000 # 连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认： 30 分钟 connection-test-query: SELECT 1 - pool-name: FastHikariCP \ No newline at end of file + pool-name: MakuHikariCP \ No newline at end of file diff --git a/fast-server/src/main/resources/application.yml b/maku-server/src/main/resources/application.yml similarity index 100% rename from fast-server/src/main/resources/application.yml rename to maku-server/src/main/resources/application.yml diff --git a/fast-server/src/main/resources/banner.txt b/maku-server/src/main/resources/banner.txt similarity index 68% rename from fast-server/src/main/resources/banner.txt rename to maku-server/src/main/resources/banner.txt index 7867f24..7fccb2b 100644 --- a/fast-server/src/main/resources/banner.txt +++ b/maku-server/src/main/resources/banner.txt @@ -1,5 +1,5 @@ ======================================================================================================================== - 欢迎使用fast-boot，基于MIT开源协议，终身免费使用，让开发更简单！ - Powered By https://maku.net + 欢迎使用maku-boot，基于MIT开源协议，终身免费使用，让开发更简单！ - Powered By https://maku.net ======================================================================================================================== \ No newline at end of file diff --git a/fast-server/src/main/resources/logback-spring.xml b/maku-server/src/main/resources/logback-spring.xml similarity index 100% rename from fast-server/src/main/resources/logback-spring.xml rename to maku-server/src/main/resources/logback-spring.xml diff --git a/maku-server/src/main/resources/public/1.jpg b/maku-server/src/main/resources/public/1.jpg new file mode 100644 index 0000000..af2d384 Binary files /dev/null and b/maku-server/src/main/resources/public/1.jpg differ diff --git a/maku-server/src/main/resources/public/2.jpg b/maku-server/src/main/resources/public/2.jpg new file mode 100644 index 0000000..2f5b336 Binary files /dev/null and b/maku-server/src/main/resources/public/2.jpg differ diff --git a/maku-server/src/main/resources/public/3.jpg b/maku-server/src/main/resources/public/3.jpg new file mode 100644 index 0000000..8cdd3a6 Binary files /dev/null and b/maku-server/src/main/resources/public/3.jpg differ diff --git a/maku-server/src/main/resources/public/4.jpg b/maku-server/src/main/resources/public/4.jpg new file mode 100644 index 0000000..7192686 Binary files /dev/null and b/maku-server/src/main/resources/public/4.jpg differ diff --git a/fast-server/src/main/resources/public/qrcode.png b/maku-server/src/main/resources/public/qrcode.png similarity index 100% rename from fast-server/src/main/resources/public/qrcode.png rename to maku-server/src/main/resources/public/qrcode.png diff --git a/fast-server/src/test/java/net/maku/FileUploadTest.java b/maku-server/src/test/java/net/maku/FileUploadTest.java similarity index 100% rename from fast-server/src/test/java/net/maku/FileUploadTest.java rename to maku-server/src/test/java/net/maku/FileUploadTest.java diff --git a/pom.xml b/pom.xml index 9bde57e..89f4e9a 100644 --- a/pom.xml +++ b/pom.xml @@ -2,12 +2,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 net.maku - fast-boot + maku-boot ${revision} pom - fast-boot - FastBoot + maku-boot + maku-boot https://maku.net @@ -17,12 +17,12 @@ - fast-boot-new - fast-boot-system - fast-boot-module - fast-boot-api - fast-framework - fast-server + maku-boot-new + maku-boot-system + maku-boot-module + maku-boot-api + maku-framework + maku-server @@ -36,7 +36,6 @@ 3.0.3 1.6.8 5.7.22 - 2.3.8.RELEASE 1.6.2 1.4.2.Final 3.8.0 @@ -71,11 +70,6 @@ - org.springframework.security.oauth - spring-security-oauth2 - ${security.oauth2.version} - - com.baomidou mybatis-plus-boot-starter ${mybatisplus.version}