diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2176394 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ + +*.iml + +**/target/ + +**/node_modules/ \ No newline at end of file diff --git a/LICENSE b/LICENSE index 7633c29..477a1b2 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019 1024创新实验室（http://1024lab.net） +Copyright (c) 2020 1024-lab Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index beba0d3..0dd1cf3 100644 --- a/README.md +++ b/README.md @@ -77,18 +77,53 @@ gitee: [https://gitee.com/lab1024/smart-admin](https://gitee.com/lab1024/smart- - 以上举例，只是沧海一粟，更多的细节等待你的发现！ ps：以上规范基础都是以团队出发，让团队开心快乐的写代码，而不是为了代码规范而规范。 +#### 演示图 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ #### 联系我们 [1024创新实验室](https://www.1024lab.net/) -1024Lab官方微信号（**加我拉你入群！**）： +官方QQ群：914442584 -![](http://cdn.1024lab.net/img/smart-admin/zhuoda-wechat.jpg)![](http://cdn.1024lab.net/img/smart-admin/zhuoda-wechat-money-v1.jpg) - -SmartAdmin 官方微信群; 官方QQ群：914442584 - -![](http://cdn.1024lab.net/img/smart-admin/smart-admin-wechat-group-v3.jpg)![](http://cdn.1024lab.net/img/smart-admin/smart-admin-qq-group.png) +SmartAdmin微信群（**加我拉你入群！**）： + + + + + + +
--- 作者简介: diff --git a/java/smart-admin-api/smart-admin-api.iml b/java/smart-admin-api/smart-admin-api.iml deleted file mode 100644 index 2130b11..0000000 --- a/java/smart-admin-api/smart-admin-api.iml +++ /dev/null @@ -1,218 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/java/smart-admin-api/src/test/java/com/gangquan360/smartadmin/module/codegenerator/CodeGeneratorServiceTest.java b/java/smart-admin-api/src/test/java/com/gangquan360/smartadmin/module/codegenerator/CodeGeneratorServiceTest.java deleted file mode 100644 index b3a2ffd..0000000 --- a/java/smart-admin-api/src/test/java/com/gangquan360/smartadmin/module/codegenerator/CodeGeneratorServiceTest.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.gangquan360.smartadmin.module.codegenerator; - -import com.gangquan360.smartadmin.BaseTest; -import com.gangquan360.smartadmin.module.codegenerator.service.CodeGeneratorService; -import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; - -/** - * IdGeneratorService Tester. - * - * @author lizongliang - * @version 1.0 - */ -public class CodeGeneratorServiceTest extends BaseTest { - - @Autowired - private CodeGeneratorService codeGeneratorService; - - @Test - public void testGenerate() throws Exception { - // CodeGeneratorQueryColumnDTO createTimeBetween = CodeGeneratorQueryColumnDTO.builder() - // .columnName("create_time") - // .sqlOperate(SqlOperateTypeEnum.TIME_BETWEEN).build(); - // CodeGeneratorQueryColumnDTO like = CodeGeneratorQueryColumnDTO.builder() - // .columnName("title") - // .sqlOperate(SqlOperateTypeEnum.LIKE).build(); - // - // List queryColumnList = Lists.newArrayList(createTimeBetween,like); - // CodeGeneratorDTO codeGenerator = CodeGeneratorDTO.builder() - // .author("yandanyang") - // .company("钢圈") - // .tableName("t_notice") - // .tablePrefix("t_") - // .basePackage("com.gangquan360.smartadmin") - // .queryColumnList(queryColumnList).build(); - // codeGeneratorService.codeGenerator(codeGenerator); - } - -} diff --git a/java/smart-admin-parent/README.md b/java/smart-admin-parent/README.md deleted file mode 100644 index 28e28be..0000000 --- a/java/smart-admin-parent/README.md +++ /dev/null @@ -1 +0,0 @@ -admin的项目采用maven bom和maven module的形式 \ No newline at end of file diff --git a/java/smart-admin-parent/smart-admin-parent.iml b/java/smart-admin-parent/smart-admin-parent.iml deleted file mode 100644 index 4fd5057..0000000 --- a/java/smart-admin-parent/smart-admin-parent.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/java/README.md b/smart-admin-service/README.md similarity index 87% rename from java/README.md rename to smart-admin-service/README.md index d27e4af..19273c1 100644 --- a/java/README.md +++ b/smart-admin-service/README.md @@ -2,7 +2,7 @@ #### 下载代码 -smart-admin-parent和smart-admin-api +smart-admin-service 将两个项目导入idea diff --git a/java/smart-admin-parent/pom.xml b/smart-admin-service/pom.xml similarity index 98% rename from java/smart-admin-parent/pom.xml rename to smart-admin-service/pom.xml index 10a279c..b23dde3 100644 --- a/java/smart-admin-parent/pom.xml +++ b/smart-admin-service/pom.xml @@ -4,9 +4,13 @@ 4.0.0 com.gangquan360 - smart-admin-parent + smart-admin-service-parent 1.0.0 pom + + + smart-admin-api + 1.8 @@ -34,7 +38,6 @@ 2.7.0 [7.2.0, 7.2.99] 1.3.1 - 1.2.9 0.9.0 0.0.1-RC11 6.0.2.Final @@ -481,11 +484,6 @@ - - pl.project13.maven - git-commit-id-plugin - 2.2.4 - org.apache.maven.plugins maven-compiler-plugin diff --git a/java/smart-admin-api/doc/readme.txt b/smart-admin-service/smart-admin-api/doc/readme.txt similarity index 100% rename from java/smart-admin-api/doc/readme.txt rename to smart-admin-service/smart-admin-api/doc/readme.txt diff --git a/java/smart-admin-api/pom.xml b/smart-admin-service/smart-admin-api/pom.xml similarity index 90% rename from java/smart-admin-api/pom.xml rename to smart-admin-service/smart-admin-api/pom.xml index c40ad51..0b35c3f 100644 --- a/java/smart-admin-api/pom.xml +++ b/smart-admin-service/smart-admin-api/pom.xml @@ -2,8 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.gangquan360 - smart-admin-parent + smart-admin-service-parent 1.0.0 + ../pom.xml 4.0.0 @@ -355,32 +356,6 @@ true - - pl.project13.maven - git-commit-id-plugin - 2.2.4 - - - get-the-git-infos - - revision - - - - - ${project.basedir}/.git - git - false - true - ${project.build.outputDirectory}/git.properties - json - - false - false - -dirty - - - \ No newline at end of file diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/SmartAdminApplication.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/SmartAdminApplication.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/SmartAdminApplication.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/SmartAdminApplication.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/ApiModelPropertyEnum.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/ApiModelPropertyEnum.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/ApiModelPropertyEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/ApiModelPropertyEnum.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/DataScope.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/DataScope.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/DataScope.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/DataScope.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/NoNeedLogin.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/NoNeedLogin.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/NoNeedLogin.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/NoNeedLogin.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/NoValidPrivilege.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/NoValidPrivilege.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/NoValidPrivilege.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/NoValidPrivilege.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/OperateLog.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/OperateLog.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/OperateLog.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/anno/OperateLog.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/constant/CommentSortTypeEnum.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/constant/CommentSortTypeEnum.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/constant/CommentSortTypeEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/constant/CommentSortTypeEnum.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/constant/JudgeEnum.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/constant/JudgeEnum.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/constant/JudgeEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/constant/JudgeEnum.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/constant/ResponseCodeConst.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/constant/ResponseCodeConst.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/constant/ResponseCodeConst.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/constant/ResponseCodeConst.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/BaseEntity.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/BaseEntity.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/BaseEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/BaseEntity.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/BaseEnum.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/BaseEnum.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/BaseEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/BaseEnum.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/PageParamDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/PageParamDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/PageParamDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/PageParamDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/PageResultDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/PageResultDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/PageResultDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/PageResultDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/ResponseDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/ResponseDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/ResponseDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/domain/ResponseDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/exception/SmartBusinessException.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/exception/SmartBusinessException.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/exception/SmartBusinessException.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/exception/SmartBusinessException.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/exception/SmartResponseCodeException.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/exception/SmartResponseCodeException.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/exception/SmartResponseCodeException.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/exception/SmartResponseCodeException.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/AbstractHeartBeatCommand.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/AbstractHeartBeatCommand.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/AbstractHeartBeatCommand.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/AbstractHeartBeatCommand.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatConfig.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatConfig.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatConfig.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatConfig.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatLogger.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatLogger.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatLogger.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatLogger.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatRecordCommendInterface.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatRecordCommendInterface.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatRecordCommendInterface.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatRecordCommendInterface.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatRecordDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatRecordDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatRecordDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeartBeatRecordDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeatBeatRecordHelper.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeatBeatRecordHelper.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeatBeatRecordHelper.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/HeatBeatRecordHelper.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/IpUtil.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/IpUtil.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/IpUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/IpUtil.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/StringUtil.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/StringUtil.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/StringUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/heartbeat/StringUtil.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/json/LongJsonDeserializer.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/json/LongJsonDeserializer.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/json/LongJsonDeserializer.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/json/LongJsonDeserializer.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/json/LongJsonSerializer.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/json/LongJsonSerializer.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/json/LongJsonSerializer.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/json/LongJsonSerializer.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/kaptcha/KaptchaColor.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/kaptcha/KaptchaColor.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/kaptcha/KaptchaColor.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/kaptcha/KaptchaColor.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/kaptcha/KaptchaNoise.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/kaptcha/KaptchaNoise.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/kaptcha/KaptchaNoise.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/kaptcha/KaptchaNoise.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/kaptcha/KaptchaWordRenderer.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/kaptcha/KaptchaWordRenderer.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/kaptcha/KaptchaWordRenderer.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/kaptcha/KaptchaWordRenderer.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/SmartReloadManager.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/SmartReloadManager.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/SmartReloadManager.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/SmartReloadManager.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/SmartReloadScheduler.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/SmartReloadScheduler.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/SmartReloadScheduler.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/SmartReloadScheduler.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/abstracts/AbstractSmartReloadCommand.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/abstracts/AbstractSmartReloadCommand.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/abstracts/AbstractSmartReloadCommand.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/abstracts/AbstractSmartReloadCommand.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/abstracts/AbstractSmartReloadCommand4Spring.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/abstracts/AbstractSmartReloadCommand4Spring.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/abstracts/AbstractSmartReloadCommand4Spring.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/abstracts/AbstractSmartReloadCommand4Spring.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/annotation/SmartReload.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/annotation/SmartReload.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/annotation/SmartReload.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/annotation/SmartReload.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/AbstractSmartReloadObject.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/AbstractSmartReloadObject.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/AbstractSmartReloadObject.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/AbstractSmartReloadObject.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/AnnotationReloadObject.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/AnnotationReloadObject.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/AnnotationReloadObject.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/AnnotationReloadObject.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/InterfaceReloadObject.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/InterfaceReloadObject.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/InterfaceReloadObject.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/InterfaceReloadObject.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/entity/ReloadItem.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/entity/ReloadItem.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/entity/ReloadItem.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/entity/ReloadItem.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/entity/SmartReloadResult.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/entity/SmartReloadResult.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/entity/SmartReloadResult.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/domain/entity/SmartReloadResult.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/interfaces/SmartReloadCommandInterface.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/interfaces/SmartReloadCommandInterface.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/interfaces/SmartReloadCommandInterface.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/interfaces/SmartReloadCommandInterface.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/interfaces/SmartReloadThreadLogger.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/interfaces/SmartReloadThreadLogger.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/interfaces/SmartReloadThreadLogger.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/interfaces/SmartReloadThreadLogger.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/interfaces/SmartReloadable.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/interfaces/SmartReloadable.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/interfaces/SmartReloadable.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/reload/interfaces/SmartReloadable.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/swagger/SmartSwaggerApiModelEnumPlugin.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/swagger/SmartSwaggerApiModelEnumPlugin.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/swagger/SmartSwaggerApiModelEnumPlugin.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/swagger/SmartSwaggerApiModelEnumPlugin.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/bigdecimal/BigDecimalValidator.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/bigdecimal/BigDecimalValidator.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/bigdecimal/BigDecimalValidator.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/bigdecimal/BigDecimalValidator.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/bigdecimal/CheckBigDecimal.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/bigdecimal/CheckBigDecimal.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/bigdecimal/CheckBigDecimal.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/bigdecimal/CheckBigDecimal.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/bigdecimal/ComparisonSymbolEnum.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/bigdecimal/ComparisonSymbolEnum.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/bigdecimal/ComparisonSymbolEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/bigdecimal/ComparisonSymbolEnum.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/en/CheckEnum.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/en/CheckEnum.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/en/CheckEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/en/CheckEnum.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/en/EnumValidator.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/en/EnumValidator.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/en/EnumValidator.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/common/validator/en/EnumValidator.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartAdminWebAppConfig.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartAdminWebAppConfig.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartAdminWebAppConfig.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartAdminWebAppConfig.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartDruidDataSourceConfig.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartDruidDataSourceConfig.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartDruidDataSourceConfig.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartDruidDataSourceConfig.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartHeartBeatConfig.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartHeartBeatConfig.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartHeartBeatConfig.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartHeartBeatConfig.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartKaptchaConfig.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartKaptchaConfig.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartKaptchaConfig.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartKaptchaConfig.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartMybatisPlusConfig.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartMybatisPlusConfig.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartMybatisPlusConfig.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartMybatisPlusConfig.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartRedisConfig.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartRedisConfig.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartRedisConfig.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartRedisConfig.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartReloadConfig.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartReloadConfig.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartReloadConfig.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartReloadConfig.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartRestTemplateConfig.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartRestTemplateConfig.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartRestTemplateConfig.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartRestTemplateConfig.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartSwaggerApiModelEnumConfig.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartSwaggerApiModelEnumConfig.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartSwaggerApiModelEnumConfig.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartSwaggerApiModelEnumConfig.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartSwaggerDynamicGroupConfig.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartSwaggerDynamicGroupConfig.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartSwaggerDynamicGroupConfig.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartSwaggerDynamicGroupConfig.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartWebSocketConfig.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartWebSocketConfig.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartWebSocketConfig.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SmartWebSocketConfig.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SystemEnvironmentCondition.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SystemEnvironmentCondition.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SystemEnvironmentCondition.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/config/SystemEnvironmentCondition.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/CommonConst.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/CommonConst.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/CommonConst.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/CommonConst.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/SmartReloadTagConst.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/SmartReloadTagConst.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/SmartReloadTagConst.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/SmartReloadTagConst.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/SwaggerTagConst.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/SwaggerTagConst.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/SwaggerTagConst.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/SwaggerTagConst.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/SystemEnvironmentEnum.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/SystemEnvironmentEnum.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/SystemEnvironmentEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/constant/SystemEnvironmentEnum.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/handler/SmartGlobalExceptionHandler.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/handler/SmartGlobalExceptionHandler.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/handler/SmartGlobalExceptionHandler.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/handler/SmartGlobalExceptionHandler.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/handler/SmartOperateLogAspect.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/handler/SmartOperateLogAspect.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/handler/SmartOperateLogAspect.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/handler/SmartOperateLogAspect.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/interceptor/SmartAuthenticationInterceptor.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/interceptor/SmartAuthenticationInterceptor.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/interceptor/SmartAuthenticationInterceptor.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/interceptor/SmartAuthenticationInterceptor.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/listener/SmartAdminStartupRunner.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/listener/SmartAdminStartupRunner.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/listener/SmartAdminStartupRunner.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/listener/SmartAdminStartupRunner.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/constant/SqlOperateTypeEnum.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/constant/SqlOperateTypeEnum.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/constant/SqlOperateTypeEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/constant/SqlOperateTypeEnum.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/dao/TableDao.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/dao/TableDao.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/dao/TableDao.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/dao/TableDao.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/CodeGeneratorDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/CodeGeneratorDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/CodeGeneratorDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/CodeGeneratorDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/CodeGeneratorQueryColumnDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/CodeGeneratorQueryColumnDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/CodeGeneratorQueryColumnDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/CodeGeneratorQueryColumnDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/ColumnVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/ColumnVO.java similarity index 82% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/ColumnVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/ColumnVO.java index 3d23b9d..84e5d58 100644 --- a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/ColumnVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/ColumnVO.java @@ -1,7 +1,9 @@ package com.gangquan360.smartadmin.module.codegenerator.domain; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; /** * [ ] @@ -15,6 +17,8 @@ import lombok.Data; */ @Data @Builder +@NoArgsConstructor +@AllArgsConstructor public class ColumnVO { private String columnName; diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/QueryFieldVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/QueryFieldVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/QueryFieldVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/domain/QueryFieldVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/service/CodeGeneratorComponent.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/service/CodeGeneratorComponent.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/service/CodeGeneratorComponent.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/service/CodeGeneratorComponent.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/service/CodeGeneratorService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/service/CodeGeneratorService.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/service/CodeGeneratorService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/codegenerator/service/CodeGeneratorService.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/DataScopeController.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/DataScopeController.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/DataScopeController.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/DataScopeController.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/DataScopeRoleDao.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/DataScopeRoleDao.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/DataScopeRoleDao.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/DataScopeRoleDao.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/MyBatisPlugin.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/MyBatisPlugin.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/MyBatisPlugin.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/MyBatisPlugin.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/constant/DataScopeTypeEnum.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/constant/DataScopeTypeEnum.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/constant/DataScopeTypeEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/constant/DataScopeTypeEnum.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/constant/DataScopeViewTypeEnum.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/constant/DataScopeViewTypeEnum.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/constant/DataScopeViewTypeEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/constant/DataScopeViewTypeEnum.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/constant/DataScopeWhereInTypeEnum.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/constant/DataScopeWhereInTypeEnum.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/constant/DataScopeWhereInTypeEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/constant/DataScopeWhereInTypeEnum.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeAndViewTypeVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeAndViewTypeVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeAndViewTypeVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeAndViewTypeVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeBatchSetDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeBatchSetDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeBatchSetDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeBatchSetDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeBatchSetRoleDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeBatchSetRoleDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeBatchSetRoleDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeBatchSetRoleDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeSelectVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeSelectVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeSelectVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeSelectVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeSqlConfigDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeSqlConfigDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeSqlConfigDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeSqlConfigDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeViewTypeVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeViewTypeVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeViewTypeVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/dto/DataScopeViewTypeVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/entity/DataScopeRoleEntity.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/entity/DataScopeRoleEntity.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/entity/DataScopeRoleEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/domain/entity/DataScopeRoleEntity.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/service/DataScopeService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/service/DataScopeService.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/service/DataScopeService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/service/DataScopeService.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/service/DataScopeSqlConfigService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/service/DataScopeSqlConfigService.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/service/DataScopeSqlConfigService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/service/DataScopeSqlConfigService.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/service/DataScopeViewService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/service/DataScopeViewService.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/service/DataScopeViewService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/service/DataScopeViewService.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentController.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentController.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentController.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentController.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentDao.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentDao.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentDao.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentDao.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentResponseCodeConst.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentResponseCodeConst.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentResponseCodeConst.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentResponseCodeConst.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentService.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentService.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentTreeService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentTreeService.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentTreeService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/DepartmentTreeService.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/dto/DepartmentCreateDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/dto/DepartmentCreateDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/dto/DepartmentCreateDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/dto/DepartmentCreateDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/dto/DepartmentUpdateDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/dto/DepartmentUpdateDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/dto/DepartmentUpdateDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/dto/DepartmentUpdateDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/dto/DepartmentVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/dto/DepartmentVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/dto/DepartmentVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/dto/DepartmentVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/entity/DepartmentEntity.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/entity/DepartmentEntity.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/entity/DepartmentEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/department/domain/entity/DepartmentEntity.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailController.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailController.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailController.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailController.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailDao.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailDao.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailDao.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailDao.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailSendStatusEnum.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailSendStatusEnum.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailSendStatusEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailSendStatusEnum.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailService.java similarity index 99% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailService.java index 483490c..9296f23 100644 --- a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/EmailService.java @@ -50,7 +50,7 @@ public class EmailService { List entities = emailDao.queryByPage(page, queryDTO); List dtoList = SmartBeanUtil.copyList(entities, EmailVO.class); page.setRecords(dtoList); - PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageInfoDTO(page); + PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page); return ResponseDTO.succData(pageResultDTO); } diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailConfigDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailConfigDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailConfigDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailConfigDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailQueryDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailQueryDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailQueryDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/dto/EmailVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/entity/EmailEntity.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/entity/EmailEntity.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/entity/EmailEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/email/domain/entity/EmailEntity.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/EmployeeController.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/EmployeeController.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/EmployeeController.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/EmployeeController.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/EmployeeDao.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/EmployeeDao.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/EmployeeDao.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/EmployeeDao.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/EmployeeService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/EmployeeService.java similarity index 88% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/EmployeeService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/EmployeeService.java index 34c0cf3..9e1403b 100644 --- a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/EmployeeService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/EmployeeService.java @@ -14,6 +14,7 @@ import com.gangquan360.smartadmin.module.employee.domain.dto.*; import com.gangquan360.smartadmin.module.employee.domain.entity.EmployeeEntity; import com.gangquan360.smartadmin.module.employee.domain.vo.EmployeeVO; import com.gangquan360.smartadmin.module.login.domain.RequestTokenBO; +import com.gangquan360.smartadmin.module.position.PositionDao; import com.gangquan360.smartadmin.module.position.PositionService; import com.gangquan360.smartadmin.module.position.domain.dto.PositionRelationAddDTO; import com.gangquan360.smartadmin.module.position.domain.dto.PositionRelationResultDTO; @@ -26,12 +27,15 @@ import com.gangquan360.smartadmin.util.SmartPaginationUtil; import com.gangquan360.smartadmin.util.SmartVerificationUtil; import com.google.common.collect.Lists; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -59,6 +63,9 @@ public class EmployeeService { @Autowired private PositionService positionService; + @Autowired + private PositionDao positionDao; + @Autowired private PrivilegeEmployeeService privilegeEmployeeService; @@ -90,15 +97,32 @@ public class EmployeeService { public ResponseDTO> selectEmployeeList(EmployeeQueryDTO queryDTO) { Page pageParam = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); queryDTO.setIsDelete(JudgeEnum.NO.getValue()); - List empList = employeeDao.selectEmployeeList(pageParam, queryDTO); - empList.stream().forEach(e -> { - List positionRelationList = positionService.queryPositionByEmployeeId(e.getId()); - if (CollectionUtils.isNotEmpty(positionRelationList)) { - e.setPositionRelationList(positionRelationList); - e.setPositionName(positionRelationList.stream().map(PositionRelationResultDTO::getPositionName).collect(Collectors.joining(","))); + List employeeList = employeeDao.selectEmployeeList(pageParam, queryDTO); + List employeeIdList = employeeList.stream().map(EmployeeDTO::getId).collect(Collectors.toList()); + + if (CollectionUtils.isNotEmpty(employeeIdList)) { + List positionRelationResultDTOList = positionDao.selectEmployeesRelation(employeeIdList); + Map> employeePositionMap = new HashedMap(); + + for (PositionRelationResultDTO positionRelationResultDTO : positionRelationResultDTOList) { + List relationResultDTOList = employeePositionMap.get(positionRelationResultDTO.getEmployeeId()); + //匹配对应的岗位 + if (relationResultDTOList == null) { + relationResultDTOList = new ArrayList<>(); + employeePositionMap.put(positionRelationResultDTO.getEmployeeId(), relationResultDTOList); + } + relationResultDTOList.add(positionRelationResultDTO); } - }); - return ResponseDTO.succData(SmartPaginationUtil.convert2PageInfoDTO(pageParam, empList, EmployeeVO.class)); + + for (EmployeeDTO employeeDTO : employeeList) { + List relationResultDTOList = employeePositionMap.get(employeeDTO.getId()); + if(relationResultDTOList != null){ + employeeDTO.setPositionRelationList(relationResultDTOList); + employeeDTO.setPositionName(relationResultDTOList.stream().map(PositionRelationResultDTO::getPositionName).collect(Collectors.joining(","))); + } + } + } + return ResponseDTO.succData(SmartPaginationUtil.convert2PageResultDTO(pageParam, employeeList, EmployeeVO.class)); } /** diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/constant/EmployeeResponseCodeConst.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/constant/EmployeeResponseCodeConst.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/constant/EmployeeResponseCodeConst.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/constant/EmployeeResponseCodeConst.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/constant/EmployeeStatusEnum.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/constant/EmployeeStatusEnum.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/constant/EmployeeStatusEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/constant/EmployeeStatusEnum.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/bo/EmployeeBO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/bo/EmployeeBO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/bo/EmployeeBO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/bo/EmployeeBO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeAddDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeAddDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeAddDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeAddDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeBaseDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeBaseDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeBaseDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeBaseDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeBatchUpdateStatusDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeBatchUpdateStatusDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeBatchUpdateStatusDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeBatchUpdateStatusDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeLoginFormDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeLoginFormDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeLoginFormDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeLoginFormDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeQueryDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeQueryDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeQueryDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeQueryExportDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeQueryExportDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeQueryExportDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeQueryExportDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeUpdateDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeUpdateDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeUpdateDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeUpdateDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeUpdatePwdDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeUpdatePwdDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeUpdatePwdDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeUpdatePwdDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeUpdateRolesDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeUpdateRolesDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeUpdateRolesDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/dto/EmployeeUpdateRolesDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/entity/EmployeeEntity.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/entity/EmployeeEntity.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/entity/EmployeeEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/entity/EmployeeEntity.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/vo/EmployeeVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/vo/EmployeeVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/vo/EmployeeVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/employee/domain/vo/EmployeeVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/FileController.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/FileController.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/FileController.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/FileController.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/FileDao.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/FileDao.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/FileDao.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/FileDao.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileModuleTypeEnum.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileModuleTypeEnum.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileModuleTypeEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileModuleTypeEnum.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileResponseCodeConst.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileResponseCodeConst.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileResponseCodeConst.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileResponseCodeConst.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileServiceNameConst.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileServiceNameConst.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileServiceNameConst.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileServiceNameConst.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileServiceTypeEnum.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileServiceTypeEnum.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileServiceTypeEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/constant/FileServiceTypeEnum.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/FileAddDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/FileAddDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/FileAddDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/FileAddDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/FileDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/FileDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/FileDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/FileDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/FileQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/FileQueryDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/FileQueryDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/FileQueryDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/OSSConfig.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/OSSConfig.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/OSSConfig.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/dto/OSSConfig.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/entity/FileEntity.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/entity/FileEntity.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/entity/FileEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/entity/FileEntity.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/vo/FileVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/vo/FileVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/vo/FileVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/vo/FileVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/vo/UploadVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/vo/UploadVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/vo/UploadVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/domain/vo/UploadVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileService.java similarity index 99% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileService.java index 51c0d75..91152a0 100644 --- a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileService.java @@ -158,7 +158,7 @@ public class FileService { e.setFileUrl(fileService.getFileUrl(e.getFilePath()).getData()); }); } - PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageInfoDTO(page, fileList); + PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page, fileList); return ResponseDTO.succData(pageResultDTO); } diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileServiceAliYun.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileServiceAliYun.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileServiceAliYun.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileServiceAliYun.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileServiceLocal.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileServiceLocal.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileServiceLocal.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileServiceLocal.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileServiceQiNiuYun.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileServiceQiNiuYun.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileServiceQiNiuYun.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/FileServiceQiNiuYun.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/IFileService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/IFileService.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/IFileService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/file/service/IFileService.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatController.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatController.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatController.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatController.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatRecordDao.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatRecordDao.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatRecordDao.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatRecordDao.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatRecordEntity.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatRecordEntity.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatRecordEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatRecordEntity.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatRecordVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatRecordVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatRecordVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatRecordVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatService.java similarity index 96% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatService.java index 2157998..8bdefc4 100644 --- a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/heartbeat/HeartBeatService.java @@ -12,7 +12,6 @@ import com.gangquan360.smartadmin.config.SmartHeartBeatConfig; import com.gangquan360.smartadmin.util.SmartBeanUtil; import com.gangquan360.smartadmin.util.SmartPaginationUtil; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -84,7 +83,7 @@ public class HeartBeatService extends AbstractHeartBeatCommand { public ResponseDTO> pageQuery(PageParamDTO pageParamDTO) { Page pageQueryInfo = SmartPaginationUtil.convert2PageQueryInfo(pageParamDTO); List recordVOList = heartBeatRecordDao.pageQuery(pageQueryInfo); - PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageInfoDTO(pageQueryInfo, recordVOList); + PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(pageQueryInfo, recordVOList); return ResponseDTO.succData(pageResultDTO); } diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/IdGeneratorDao.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/IdGeneratorDao.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/IdGeneratorDao.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/IdGeneratorDao.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/IdGeneratorManager.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/IdGeneratorManager.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/IdGeneratorManager.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/IdGeneratorManager.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/IdGeneratorService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/IdGeneratorService.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/IdGeneratorService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/IdGeneratorService.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/constant/IdGeneratorEnum.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/constant/IdGeneratorEnum.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/constant/IdGeneratorEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/constant/IdGeneratorEnum.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/constant/IdGeneratorRuleTypeEnum.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/constant/IdGeneratorRuleTypeEnum.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/constant/IdGeneratorRuleTypeEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/constant/IdGeneratorRuleTypeEnum.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorEntity.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorEntity.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorEntity.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorLastNumberDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorLastNumberDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorLastNumberDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorLastNumberDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorPOJO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorPOJO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorPOJO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorPOJO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorRecordDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorRecordDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorRecordDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/idgenerator/domain/IdGeneratorRecordDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/LogService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/LogService.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/LogService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/LogService.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/OrderOperateLogController.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/OrderOperateLogController.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/OrderOperateLogController.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/OrderOperateLogController.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/OrderOperateLogDao.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/OrderOperateLogDao.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/OrderOperateLogDao.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/OrderOperateLogDao.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/OrderOperateLogService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/OrderOperateLogService.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/OrderOperateLogService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/OrderOperateLogService.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/constant/OrderOperateLogDefaultEmpEnum.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/constant/OrderOperateLogDefaultEmpEnum.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/constant/OrderOperateLogDefaultEmpEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/constant/OrderOperateLogDefaultEmpEnum.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/constant/OrderOperateLogOperateTypeConst.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/constant/OrderOperateLogOperateTypeConst.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/constant/OrderOperateLogOperateTypeConst.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/constant/OrderOperateLogOperateTypeConst.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/constant/OrderOperateLogOrderTypeEnum.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/constant/OrderOperateLogOrderTypeEnum.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/constant/OrderOperateLogOrderTypeEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/constant/OrderOperateLogOrderTypeEnum.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/dto/OrderOperateLogSaveDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/dto/OrderOperateLogSaveDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/dto/OrderOperateLogSaveDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/dto/OrderOperateLogSaveDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/dto/SupplierOrderOperateVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/dto/SupplierOrderOperateVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/dto/SupplierOrderOperateVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/dto/SupplierOrderOperateVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/entity/OrderOperateLogEntity.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/entity/OrderOperateLogEntity.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/entity/OrderOperateLogEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/entity/OrderOperateLogEntity.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/vo/OrderOperateLogVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/vo/OrderOperateLogVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/vo/OrderOperateLogVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/orderoperatelog/domain/vo/OrderOperateLogVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/UserLoginLogController.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/UserLoginLogController.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/UserLoginLogController.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/UserLoginLogController.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/UserLoginLogDao.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/UserLoginLogDao.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/UserLoginLogDao.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/UserLoginLogDao.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/UserLoginLogService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/UserLoginLogService.java similarity index 98% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/UserLoginLogService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/UserLoginLogService.java index 083e0f7..9f20b35 100644 --- a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/UserLoginLogService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/UserLoginLogService.java @@ -48,7 +48,7 @@ public class UserLoginLogService { List entities = userLoginLogDao.queryByPage(page, queryDTO); List dtoList = SmartBeanUtil.copyList(entities, UserLoginLogDTO.class); page.setRecords(dtoList); - PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageInfoDTO(page); + PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page); return ResponseDTO.succData(pageResultDTO); } diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/domain/UserLoginLogDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/domain/UserLoginLogDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/domain/UserLoginLogDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/domain/UserLoginLogDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/domain/UserLoginLogEntity.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/domain/UserLoginLogEntity.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/domain/UserLoginLogEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/domain/UserLoginLogEntity.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/domain/UserLoginLogQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/domain/UserLoginLogQueryDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/domain/UserLoginLogQueryDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/userloginlog/domain/UserLoginLogQueryDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/UserOperateLogController.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/UserOperateLogController.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/UserOperateLogController.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/UserOperateLogController.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/UserOperateLogDao.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/UserOperateLogDao.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/UserOperateLogDao.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/UserOperateLogDao.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/UserOperateLogService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/UserOperateLogService.java similarity index 98% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/UserOperateLogService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/UserOperateLogService.java index f3aba98..2e2b3bf 100644 --- a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/UserOperateLogService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/UserOperateLogService.java @@ -40,7 +40,7 @@ public class UserOperateLogService { List entities = userOperateLogDao.queryByPage(page, queryDTO); List dtoList = SmartBeanUtil.copyList(entities, UserOperateLogDTO.class); page.setRecords(dtoList); - PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageInfoDTO(page); + PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page); return ResponseDTO.succData(pageResultDTO); } diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/domain/UserOperateLogDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/domain/UserOperateLogDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/domain/UserOperateLogDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/domain/UserOperateLogDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/domain/UserOperateLogEntity.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/domain/UserOperateLogEntity.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/domain/UserOperateLogEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/domain/UserOperateLogEntity.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/domain/UserOperateLogQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/domain/UserOperateLogQueryDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/domain/UserOperateLogQueryDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/log/useroperatelog/domain/UserOperateLogQueryDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginController.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginController.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginController.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginController.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginResponseCodeConst.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginResponseCodeConst.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginResponseCodeConst.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginResponseCodeConst.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginService.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginService.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginTokenService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginTokenService.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginTokenService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/LoginTokenService.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/KaptchaVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/KaptchaVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/KaptchaVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/KaptchaVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/LoginCacheDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/LoginCacheDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/LoginCacheDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/LoginCacheDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/LoginDetailVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/LoginDetailVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/LoginDetailVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/LoginDetailVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/LoginPrivilegeDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/LoginPrivilegeDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/LoginPrivilegeDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/LoginPrivilegeDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/RequestTokenBO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/RequestTokenBO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/RequestTokenBO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/login/domain/RequestTokenBO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/NoticeController.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/NoticeController.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/NoticeController.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/NoticeController.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/NoticeManage.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/NoticeManage.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/NoticeManage.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/NoticeManage.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/NoticeService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/NoticeService.java similarity index 98% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/NoticeService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/NoticeService.java index b98f1dd..5ac6678 100644 --- a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/NoticeService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/NoticeService.java @@ -58,7 +58,7 @@ public class NoticeService { Page page = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); List dtoList = noticeDao.queryByPage(page, queryDTO); page.setRecords(dtoList); - PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageInfoDTO(page); + PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page); return ResponseDTO.succData(pageResultDTO); } @@ -82,7 +82,7 @@ public class NoticeService { } }); page.setRecords(dtoList); - PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageInfoDTO(page); + PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page); return ResponseDTO.succData(pageResultDTO); } @@ -97,7 +97,7 @@ public class NoticeService { Page page = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); List dtoList = noticeDao.queryUnreadByPage(page, requestToken.getRequestUserId(), JudgeEnum.YES.getValue()); page.setRecords(dtoList); - PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageInfoDTO(page); + PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page); return ResponseDTO.succData(pageResultDTO); } diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/dao/NoticeDao.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/dao/NoticeDao.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/dao/NoticeDao.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/dao/NoticeDao.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/dao/NoticeReceiveRecordDao.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/dao/NoticeReceiveRecordDao.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/dao/NoticeReceiveRecordDao.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/dao/NoticeReceiveRecordDao.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeAddDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeAddDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeAddDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeAddDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeDetailVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeDetailVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeDetailVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeDetailVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeQueryDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeQueryDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeQueryDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeReadCountDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeReadCountDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeReadCountDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeReadCountDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeReceiveDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeReceiveDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeReceiveDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeReceiveDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeReceiveQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeReceiveQueryDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeReceiveQueryDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeReceiveQueryDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeUpdateDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeUpdateDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeUpdateDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeUpdateDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/dto/NoticeVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/entity/NoticeEntity.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/entity/NoticeEntity.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/entity/NoticeEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/entity/NoticeEntity.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/entity/NoticeReceiveRecordEntity.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/entity/NoticeReceiveRecordEntity.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/entity/NoticeReceiveRecordEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/notice/domain/entity/NoticeReceiveRecordEntity.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionController.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionController.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionController.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionController.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionDao.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionDao.java similarity index 88% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionDao.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionDao.java index ebb0a96..e7c95fc 100644 --- a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionDao.java +++ b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionDao.java @@ -37,6 +37,13 @@ public interface PositionDao extends BaseMapper { */ List selectRelation(PositionRelationQueryDTO positionRelationQueryDTO); + /** + * 批量查询员工岗位信息 + * @param employeeIdList + * @return + */ + List selectEmployeesRelation(@Param("employeeIdList") List employeeIdList); + /** * 批量添加岗位 人员 关联关系 * diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionResponseCodeConst.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionResponseCodeConst.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionResponseCodeConst.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionResponseCodeConst.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionService.java similarity index 98% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionService.java index 60a7c8d..3f6efe6 100644 --- a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/PositionService.java @@ -33,7 +33,7 @@ public class PositionService { Page page = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); List entityList = positionDao.selectByPage(page, queryDTO); page.setRecords(entityList.stream().map(e -> SmartBeanUtil.copy(e, PositionResultVO.class)).collect(Collectors.toList())); - PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageInfoDTO(page); + PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page); return ResponseDTO.succData(pageResultDTO); } diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionAddDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionAddDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionAddDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionAddDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionQueryDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionQueryDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionQueryDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionRelationAddDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionRelationAddDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionRelationAddDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionRelationAddDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionRelationQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionRelationQueryDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionRelationQueryDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionRelationQueryDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionRelationResultDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionRelationResultDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionRelationResultDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionRelationResultDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionResultVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionResultVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionResultVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionResultVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionUpdateDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionUpdateDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionUpdateDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/dto/PositionUpdateDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/entity/PositionEntity.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/entity/PositionEntity.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/entity/PositionEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/entity/PositionEntity.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/entity/PositionRelationEntity.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/entity/PositionRelationEntity.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/entity/PositionRelationEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/position/domain/entity/PositionRelationEntity.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/constant/PrivilegeResponseCodeConst.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/constant/PrivilegeResponseCodeConst.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/constant/PrivilegeResponseCodeConst.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/constant/PrivilegeResponseCodeConst.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/constant/PrivilegeTypeEnum.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/constant/PrivilegeTypeEnum.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/constant/PrivilegeTypeEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/constant/PrivilegeTypeEnum.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/controller/PrivilegeController.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/controller/PrivilegeController.java similarity index 97% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/controller/PrivilegeController.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/controller/PrivilegeController.java index f1126a3..eb462dc 100644 --- a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/controller/PrivilegeController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/controller/PrivilegeController.java @@ -46,7 +46,7 @@ public class PrivilegeController { @ApiOperation(value = "查询所有菜单项") @PostMapping("/privilege/menu/queryAll") - public ResponseDTO> queryAll() { + public ResponseDTO> queryAll() { return privilegeService.menuQueryAll(); } diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/dao/PrivilegeDao.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/dao/PrivilegeDao.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/dao/PrivilegeDao.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/dao/PrivilegeDao.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeFunctionDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeFunctionDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeFunctionDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeFunctionDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeFunctionVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeFunctionVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeFunctionVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeFunctionVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeMenuDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeMenuDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeMenuDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeMenuDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeMenuListVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeMenuVO.java similarity index 81% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeMenuListVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeMenuVO.java index 62aec55..a573f39 100644 --- a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeMenuListVO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeMenuVO.java @@ -3,6 +3,7 @@ package com.gangquan360.smartadmin.module.privilege.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; import java.util.List; /** @@ -16,7 +17,7 @@ import java.util.List; * @since JDK1.8 */ @Data -public class PrivilegeMenuListVO { +public class PrivilegeMenuVO { @ApiModelProperty("菜单名") private String menuName; @@ -30,8 +31,8 @@ public class PrivilegeMenuListVO { @ApiModelProperty("顺序") private Integer sort; - @ApiModelProperty("子菜单列表") - private List menuList; + @ApiModelProperty("前端路由path") + private String url; } diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeRequestUrlVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeRequestUrlVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeRequestUrlVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/dto/PrivilegeRequestUrlVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/entity/PrivilegeEntity.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/entity/PrivilegeEntity.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/entity/PrivilegeEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/domain/entity/PrivilegeEntity.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeEmployeeService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeEmployeeService.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeEmployeeService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeEmployeeService.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeRequestUrlService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeRequestUrlService.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeRequestUrlService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeRequestUrlService.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeService.java similarity index 96% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeService.java index 94b0ac9..dafa33a 100644 --- a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/privilege/service/PrivilegeService.java @@ -6,7 +6,6 @@ import com.gangquan360.smartadmin.module.privilege.dao.PrivilegeDao; import com.gangquan360.smartadmin.module.privilege.domain.dto.*; import com.gangquan360.smartadmin.module.privilege.domain.entity.PrivilegeEntity; import com.gangquan360.smartadmin.module.role.roleprivilege.RolePrivilegeDao; -import com.gangquan360.smartadmin.util.SmartBeanUtil; import com.google.common.collect.Lists; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -140,18 +139,19 @@ public class PrivilegeService { * * @return */ - public ResponseDTO> menuQueryAll() { + public ResponseDTO> menuQueryAll() { List privilegeEntityList = privilegeDao.selectByType(PrivilegeTypeEnum.MENU.getValue()); if (CollectionUtils.isEmpty(privilegeEntityList)) { return ResponseDTO.succData(Lists.newArrayList()); } - List voList = privilegeEntityList.stream().map( e-> { - PrivilegeMenuListVO vo = new PrivilegeMenuListVO(); + List voList = privilegeEntityList.stream().map(e-> { + PrivilegeMenuVO vo = new PrivilegeMenuVO(); vo.setMenuKey(e.getKey()); vo.setMenuName(e.getName()); vo.setParentKey(e.getParentKey()); vo.setSort(e.getSort()); + vo.setUrl(e.getUrl()); return vo; }).collect(Collectors.toList()); diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/constant/QuartzConst.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/constant/QuartzConst.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/constant/QuartzConst.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/constant/QuartzConst.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/constant/TaskResultEnum.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/constant/TaskResultEnum.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/constant/TaskResultEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/constant/TaskResultEnum.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/constant/TaskStatusEnum.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/constant/TaskStatusEnum.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/constant/TaskStatusEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/constant/TaskStatusEnum.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/controller/QuartzController.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/controller/QuartzController.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/controller/QuartzController.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/controller/QuartzController.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/dao/QuartzTaskDao.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/dao/QuartzTaskDao.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/dao/QuartzTaskDao.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/dao/QuartzTaskDao.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/dao/QuartzTaskLogDao.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/dao/QuartzTaskLogDao.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/dao/QuartzTaskLogDao.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/dao/QuartzTaskLogDao.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzLogQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzLogQueryDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzLogQueryDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzLogQueryDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzQueryDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzQueryDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzQueryDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzTaskDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzTaskDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzTaskDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzTaskDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzTaskLogVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzTaskLogVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzTaskLogVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzTaskLogVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzTaskVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzTaskVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzTaskVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/dto/QuartzTaskVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/entity/QuartzTaskEntity.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/entity/QuartzTaskEntity.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/entity/QuartzTaskEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/entity/QuartzTaskEntity.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/entity/QuartzTaskLogEntity.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/entity/QuartzTaskLogEntity.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/entity/QuartzTaskLogEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/domain/entity/QuartzTaskLogEntity.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/service/QuartzTask.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/service/QuartzTask.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/service/QuartzTask.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/service/QuartzTask.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/service/QuartzTaskLogService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/service/QuartzTaskLogService.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/service/QuartzTaskLogService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/service/QuartzTaskLogService.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/service/QuartzTaskService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/service/QuartzTaskService.java similarity index 99% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/service/QuartzTaskService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/service/QuartzTaskService.java index 75c2f91..05fb248 100644 --- a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/service/QuartzTaskService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/service/QuartzTaskService.java @@ -56,7 +56,7 @@ public class QuartzTaskService { Page pageParam = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); List taskList = quartzTaskDao.queryList(pageParam, queryDTO); pageParam.setRecords(taskList); - return ResponseDTO.succData(SmartPaginationUtil.convert2PageInfoDTO(pageParam)); + return ResponseDTO.succData(SmartPaginationUtil.convert2PageResultDTO(pageParam)); } /** @@ -69,7 +69,7 @@ public class QuartzTaskService { Page pageParam = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); List taskList = quartzTaskLogDao.queryList(pageParam, queryDTO); pageParam.setRecords(taskList); - return ResponseDTO.succData(SmartPaginationUtil.convert2PageInfoDTO(pageParam)); + return ResponseDTO.succData(SmartPaginationUtil.convert2PageResultDTO(pageParam)); } /** diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/task/ITask.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/task/ITask.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/task/ITask.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/task/ITask.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/task/test/Example.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/task/test/Example.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/task/test/Example.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/quartz/task/test/Example.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleController.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleController.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleController.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleController.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleDao.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleDao.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleDao.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleDao.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleResponseCodeConst.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleResponseCodeConst.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleResponseCodeConst.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleResponseCodeConst.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleService.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/RoleService.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleAddDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleAddDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleAddDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleAddDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleBatchDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleBatchDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleBatchDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleBatchDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleQueryDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleQueryDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleQueryDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleSelectedVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleSelectedVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleSelectedVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleSelectedVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleUpdateDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleUpdateDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleUpdateDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleUpdateDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/dto/RoleVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/entity/RoleEntity.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/entity/RoleEntity.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/entity/RoleEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/basic/domain/entity/RoleEntity.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/RoleEmployeeController.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/RoleEmployeeController.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/RoleEmployeeController.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/RoleEmployeeController.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/RoleEmployeeDao.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/RoleEmployeeDao.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/RoleEmployeeDao.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/RoleEmployeeDao.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/RoleEmployeeService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/RoleEmployeeService.java similarity index 98% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/RoleEmployeeService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/RoleEmployeeService.java index e49ad43..33653f7 100644 --- a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/RoleEmployeeService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/RoleEmployeeService.java @@ -55,7 +55,7 @@ public class RoleEmployeeService { DepartmentEntity departmentEntity = departmentDao.selectById(employeeDTO.getDepartmentId()); employeeDTO.setDepartmentName(departmentEntity.getName()); }); - PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageInfoDTO(page, employeeDTOS, EmployeeVO.class); + PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page, employeeDTOS, EmployeeVO.class); return ResponseDTO.succData(pageResultDTO); } diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/domain/RoleEmployeeDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/domain/RoleEmployeeDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/domain/RoleEmployeeDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/domain/RoleEmployeeDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/domain/RoleEmployeeEntity.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/domain/RoleEmployeeEntity.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/domain/RoleEmployeeEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleemployee/domain/RoleEmployeeEntity.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/RolePrivilegeController.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/RolePrivilegeController.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/RolePrivilegeController.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/RolePrivilegeController.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/RolePrivilegeDao.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/RolePrivilegeDao.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/RolePrivilegeDao.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/RolePrivilegeDao.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/RolePrivilegeService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/RolePrivilegeService.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/RolePrivilegeService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/RolePrivilegeService.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/dto/RolePrivilegeDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/dto/RolePrivilegeDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/dto/RolePrivilegeDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/dto/RolePrivilegeDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/dto/RolePrivilegeSimpleDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/dto/RolePrivilegeSimpleDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/dto/RolePrivilegeSimpleDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/dto/RolePrivilegeSimpleDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/dto/RolePrivilegeTreeVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/dto/RolePrivilegeTreeVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/dto/RolePrivilegeTreeVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/dto/RolePrivilegeTreeVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/entity/RolePrivilegeEntity.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/entity/RolePrivilegeEntity.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/entity/RolePrivilegeEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/role/roleprivilege/domain/entity/RolePrivilegeEntity.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/SmartReloadCommand.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/SmartReloadCommand.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/SmartReloadCommand.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/SmartReloadCommand.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/SmartReloadController.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/SmartReloadController.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/SmartReloadController.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/SmartReloadController.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/SmartReloadService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/SmartReloadService.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/SmartReloadService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/SmartReloadService.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/dao/ReloadItemDao.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/dao/ReloadItemDao.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/dao/ReloadItemDao.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/dao/ReloadItemDao.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/dao/ReloadResultDao.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/dao/ReloadResultDao.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/dao/ReloadResultDao.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/dao/ReloadResultDao.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/dto/ReloadItemUpdateDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/dto/ReloadItemUpdateDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/dto/ReloadItemUpdateDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/dto/ReloadItemUpdateDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/dto/ReloadItemVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/dto/ReloadItemVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/dto/ReloadItemVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/dto/ReloadItemVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/dto/ReloadResultVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/dto/ReloadResultVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/dto/ReloadResultVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/dto/ReloadResultVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/entity/ReloadItemEntity.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/entity/ReloadItemEntity.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/entity/ReloadItemEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/entity/ReloadItemEntity.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/entity/ReloadResultEntity.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/entity/ReloadResultEntity.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/entity/ReloadResultEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/smartreload/domain/entity/ReloadResultEntity.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/SystemConfigController.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/SystemConfigController.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/SystemConfigController.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/SystemConfigController.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/SystemConfigDao.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/SystemConfigDao.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/SystemConfigDao.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/SystemConfigDao.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/SystemConfigService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/SystemConfigService.java similarity index 99% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/SystemConfigService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/SystemConfigService.java index 9a69107..068998a 100644 --- a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/SystemConfigService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/SystemConfigService.java @@ -84,7 +84,7 @@ public class SystemConfigService { public ResponseDTO> getSystemConfigPage(SystemConfigQueryDTO queryDTO) { Page page = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); List entityList = systemConfigDao.selectSystemSettingList(page, queryDTO); - PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageInfoDTO(page, entityList, SystemConfigVO.class); + PageResultDTO pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page, entityList, SystemConfigVO.class); return ResponseDTO.succData(pageResultDTO); } diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/constant/SystemConfigDataType.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/constant/SystemConfigDataType.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/constant/SystemConfigDataType.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/constant/SystemConfigDataType.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/constant/SystemConfigEnum.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/constant/SystemConfigEnum.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/constant/SystemConfigEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/constant/SystemConfigEnum.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/constant/SystemConfigResponseCodeConst.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/constant/SystemConfigResponseCodeConst.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/constant/SystemConfigResponseCodeConst.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/constant/SystemConfigResponseCodeConst.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigAddDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigAddDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigAddDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigAddDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigQueryDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigQueryDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigQueryDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigQueryDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigUpdateDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigUpdateDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigUpdateDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigUpdateDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigVO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigVO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigVO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/dto/SystemConfigVO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/entity/SystemConfigEntity.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/entity/SystemConfigEntity.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/entity/SystemConfigEntity.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/systemconfig/domain/entity/SystemConfigEntity.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/MessageTypeEnum.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/MessageTypeEnum.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/MessageTypeEnum.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/MessageTypeEnum.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/WebSocketServer.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/WebSocketServer.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/WebSocketServer.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/WebSocketServer.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/domain/MessageCommonDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/domain/MessageCommonDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/domain/MessageCommonDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/domain/MessageCommonDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/domain/MessageDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/domain/MessageDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/domain/MessageDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/domain/MessageDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/domain/WebSocketHeartBeatDTO.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/domain/WebSocketHeartBeatDTO.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/domain/WebSocketHeartBeatDTO.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/websocket/domain/WebSocketHeartBeatDTO.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/third/SmartApplicationContext.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/third/SmartApplicationContext.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/third/SmartApplicationContext.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/third/SmartApplicationContext.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/third/SmartRedisService.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/third/SmartRedisService.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/third/SmartRedisService.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/third/SmartRedisService.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartBaseEnumUtil.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartBaseEnumUtil.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartBaseEnumUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartBaseEnumUtil.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartBeanUtil.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartBeanUtil.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartBeanUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartBeanUtil.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartBigDecimalUtil.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartBigDecimalUtil.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartBigDecimalUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartBigDecimalUtil.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartDateUtil.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartDateUtil.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartDateUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartDateUtil.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartDigestUtil.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartDigestUtil.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartDigestUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartDigestUtil.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartHttpUtil.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartHttpUtil.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartHttpUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartHttpUtil.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartIPUtil.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartIPUtil.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartIPUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartIPUtil.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartPaginationUtil.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartPaginationUtil.java similarity index 89% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartPaginationUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartPaginationUtil.java index 6aeed4b..fc2bb6c 100644 --- a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartPaginationUtil.java +++ b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartPaginationUtil.java @@ -16,7 +16,7 @@ import java.util.List; public class SmartPaginationUtil { - public static PageResultDTO convert2PageInfoDTO(Page page) { + public static PageResultDTO convert2PageResultDTO(Page page) { PageResultDTO result = new PageResultDTO<>(); result.setPageNum(page.getCurrent()); result.setPageSize(page.getSize()); @@ -51,7 +51,7 @@ public class SmartPaginationUtil { * @author yandanyang * @date 2018年5月16日 下午6:05:28 */ - public static PageResultDTO convert2PageInfoDTO(Page page, List sourceList, Class targetClazz) { + public static PageResultDTO convert2PageResultDTO(Page page, List sourceList, Class targetClazz) { PageResultDTO pageResultDTO = setPage(page); List records = SmartBeanUtil.copyList(sourceList, targetClazz); page.setRecords(records); @@ -68,7 +68,7 @@ public class SmartPaginationUtil { * @author yandanyang * @date 2018年5月16日 下午6:05:28 */ - public static PageResultDTO convert2PageInfoDTO(Page page, List sourceList) { + public static PageResultDTO convert2PageResultDTO(Page page, List sourceList) { PageResultDTO pageResultDTO = setPage(page); page.setRecords(sourceList); pageResultDTO.setList(sourceList); diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartQuartzUtil.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartQuartzUtil.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartQuartzUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartQuartzUtil.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartRequestTokenUtil.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartRequestTokenUtil.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartRequestTokenUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartRequestTokenUtil.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartSendMailUtil.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartSendMailUtil.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartSendMailUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartSendMailUtil.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartStringUtil.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartStringUtil.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartStringUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartStringUtil.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartThreadFactory.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartThreadFactory.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartThreadFactory.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartThreadFactory.java diff --git a/java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartVerificationUtil.java b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartVerificationUtil.java similarity index 100% rename from java/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartVerificationUtil.java rename to smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/util/SmartVerificationUtil.java diff --git a/java/smart-admin-api/src/main/resources/banner.txt b/smart-admin-service/smart-admin-api/src/main/resources/banner.txt similarity index 100% rename from java/smart-admin-api/src/main/resources/banner.txt rename to smart-admin-service/smart-admin-api/src/main/resources/banner.txt diff --git a/java/smart-admin-api/src/main/resources/pre/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties similarity index 95% rename from java/smart-admin-api/src/main/resources/pre/application.properties rename to smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties index ad34ca0..29eef45 100644 --- a/java/smart-admin-api/src/main/resources/pre/application.properties +++ b/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties @@ -21,12 +21,11 @@ spring.jackson.serialization.write-dates-as-timestamps=false spring.servlet.multipart.max-file-size=30MB spring.servlet.multipart.max-request-size=30MB file-upload-service.path=/home/upload/ -file-upload-service.geturl=http://172.16.0.145/smartAdmin/file/ ######################### database ######################### spring.datasource.url=jdbc:mysql://127.0.0.1:3306/smart-admin-dev?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=UTC -spring.datasource.username=erp -spring.datasource.password=listen1015 +spring.datasource.username=root +spring.datasource.password=Root.123 spring.datasource.initial-size=2 spring.datasource.min-idle=1 spring.datasource.max-active=10 @@ -36,17 +35,17 @@ spring.datasource.min-evictable-edle-time-millis=300000 spring.datasource.driver-class-name=com.mysql.jdbc.Driver spring.datasource.filters=stat spring.datasource.druid.username=druid -spring.datasource.druid.password=Gq123456 +spring.datasource.druid.password=123456 spring.datasource.druid.login.enabled=false ######################### redis ####################################### -spring.redis.database=13 -spring.redis.host=172.16.0.145 +spring.redis.database=0 +spring.redis.host=127.0.0.1 spring.redis.jedis.pool.max-active=100 spring.redis.jedis.pool.min-idle=5 spring.redis.jedis.pool.max-idle=10 spring.redis.jedis.pool.max-wait=30000ms -spring.redis.port=50000 +spring.redis.port=6379 spring.redis.timeout=10000ms spring.redis.password= diff --git a/java/smart-admin-api/src/main/resources/dev/log4j2.xml b/smart-admin-service/smart-admin-api/src/main/resources/dev/log4j2.xml similarity index 100% rename from java/smart-admin-api/src/main/resources/dev/log4j2.xml rename to smart-admin-service/smart-admin-api/src/main/resources/dev/log4j2.xml diff --git a/java/smart-admin-api/src/main/resources/mapper/codegenerator/TableMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/codegenerator/TableMapper.xml similarity index 100% rename from java/smart-admin-api/src/main/resources/mapper/codegenerator/TableMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/codegenerator/TableMapper.xml diff --git a/java/smart-admin-api/src/main/resources/mapper/datascope/DataScopeRoleMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/datascope/DataScopeRoleMapper.xml similarity index 100% rename from java/smart-admin-api/src/main/resources/mapper/datascope/DataScopeRoleMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/datascope/DataScopeRoleMapper.xml diff --git a/java/smart-admin-api/src/main/resources/mapper/department/DepartmentMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/department/DepartmentMapper.xml similarity index 100% rename from java/smart-admin-api/src/main/resources/mapper/department/DepartmentMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/department/DepartmentMapper.xml diff --git a/java/smart-admin-api/src/main/resources/mapper/email/EmailMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/email/EmailMapper.xml similarity index 100% rename from java/smart-admin-api/src/main/resources/mapper/email/EmailMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/email/EmailMapper.xml diff --git a/java/smart-admin-api/src/main/resources/mapper/employee/EmployeeMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/employee/EmployeeMapper.xml similarity index 100% rename from java/smart-admin-api/src/main/resources/mapper/employee/EmployeeMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/employee/EmployeeMapper.xml diff --git a/java/smart-admin-api/src/main/resources/mapper/file/FileMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/file/FileMapper.xml similarity index 100% rename from java/smart-admin-api/src/main/resources/mapper/file/FileMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/file/FileMapper.xml diff --git a/java/smart-admin-api/src/main/resources/mapper/heartbeat/HeartBeatRecordMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/heartbeat/HeartBeatRecordMapper.xml similarity index 100% rename from java/smart-admin-api/src/main/resources/mapper/heartbeat/HeartBeatRecordMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/heartbeat/HeartBeatRecordMapper.xml diff --git a/java/smart-admin-api/src/main/resources/mapper/idgenerator/IdGeneratorMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/idgenerator/IdGeneratorMapper.xml similarity index 100% rename from java/smart-admin-api/src/main/resources/mapper/idgenerator/IdGeneratorMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/idgenerator/IdGeneratorMapper.xml diff --git a/java/smart-admin-api/src/main/resources/mapper/log/OrderOperateLogMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/log/OrderOperateLogMapper.xml similarity index 100% rename from java/smart-admin-api/src/main/resources/mapper/log/OrderOperateLogMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/log/OrderOperateLogMapper.xml diff --git a/java/smart-admin-api/src/main/resources/mapper/log/UserLoginLogMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/log/UserLoginLogMapper.xml similarity index 100% rename from java/smart-admin-api/src/main/resources/mapper/log/UserLoginLogMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/log/UserLoginLogMapper.xml diff --git a/java/smart-admin-api/src/main/resources/mapper/log/UserOperateLogMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/log/UserOperateLogMapper.xml similarity index 100% rename from java/smart-admin-api/src/main/resources/mapper/log/UserOperateLogMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/log/UserOperateLogMapper.xml diff --git a/java/smart-admin-api/src/main/resources/mapper/notice/NoticeMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/notice/NoticeMapper.xml similarity index 100% rename from java/smart-admin-api/src/main/resources/mapper/notice/NoticeMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/notice/NoticeMapper.xml diff --git a/java/smart-admin-api/src/main/resources/mapper/notice/NoticeReceiveRecordMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/notice/NoticeReceiveRecordMapper.xml similarity index 100% rename from java/smart-admin-api/src/main/resources/mapper/notice/NoticeReceiveRecordMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/notice/NoticeReceiveRecordMapper.xml diff --git a/java/smart-admin-api/src/main/resources/mapper/position/PositionMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/position/PositionMapper.xml similarity index 75% rename from java/smart-admin-api/src/main/resources/mapper/position/PositionMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/position/PositionMapper.xml index cfb7792..87e7460 100644 --- a/java/smart-admin-api/src/main/resources/mapper/position/PositionMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/position/PositionMapper.xml @@ -44,6 +44,24 @@ + + INSERT INTO t_position_relation (position_id,employee_id) VALUES diff --git a/java/smart-admin-api/src/main/resources/mapper/privilege/PrivilegeMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/privilege/PrivilegeMapper.xml similarity index 100% rename from java/smart-admin-api/src/main/resources/mapper/privilege/PrivilegeMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/privilege/PrivilegeMapper.xml diff --git a/java/smart-admin-api/src/main/resources/mapper/quartz/QuartzTaskLogMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/quartz/QuartzTaskLogMapper.xml similarity index 100% rename from java/smart-admin-api/src/main/resources/mapper/quartz/QuartzTaskLogMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/quartz/QuartzTaskLogMapper.xml diff --git a/java/smart-admin-api/src/main/resources/mapper/quartz/QuartzTaskMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/quartz/QuartzTaskMapper.xml similarity index 100% rename from java/smart-admin-api/src/main/resources/mapper/quartz/QuartzTaskMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/quartz/QuartzTaskMapper.xml diff --git a/java/smart-admin-api/src/main/resources/mapper/role/RoleEmployeeMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/role/RoleEmployeeMapper.xml similarity index 100% rename from java/smart-admin-api/src/main/resources/mapper/role/RoleEmployeeMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/role/RoleEmployeeMapper.xml diff --git a/java/smart-admin-api/src/main/resources/mapper/role/RoleMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/role/RoleMapper.xml similarity index 100% rename from java/smart-admin-api/src/main/resources/mapper/role/RoleMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/role/RoleMapper.xml diff --git a/java/smart-admin-api/src/main/resources/mapper/role/RolePrivilegeMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/role/RolePrivilegeMapper.xml similarity index 100% rename from java/smart-admin-api/src/main/resources/mapper/role/RolePrivilegeMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/role/RolePrivilegeMapper.xml diff --git a/java/smart-admin-api/src/main/resources/mapper/smartreload/ReloadItemMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/smartreload/ReloadItemMapper.xml similarity index 100% rename from java/smart-admin-api/src/main/resources/mapper/smartreload/ReloadItemMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/smartreload/ReloadItemMapper.xml diff --git a/java/smart-admin-api/src/main/resources/mapper/smartreload/ReloadResultMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/smartreload/ReloadResultMapper.xml similarity index 100% rename from java/smart-admin-api/src/main/resources/mapper/smartreload/ReloadResultMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/smartreload/ReloadResultMapper.xml diff --git a/java/smart-admin-api/src/main/resources/mapper/systemconfig/SystemConfigMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/systemconfig/SystemConfigMapper.xml similarity index 100% rename from java/smart-admin-api/src/main/resources/mapper/systemconfig/SystemConfigMapper.xml rename to smart-admin-service/smart-admin-api/src/main/resources/mapper/systemconfig/SystemConfigMapper.xml diff --git a/java/smart-admin-api/src/main/resources/sit/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/pre/application.properties similarity index 98% rename from java/smart-admin-api/src/main/resources/sit/application.properties rename to smart-admin-service/smart-admin-api/src/main/resources/pre/application.properties index ad34ca0..837ec16 100644 --- a/java/smart-admin-api/src/main/resources/sit/application.properties +++ b/smart-admin-service/smart-admin-api/src/main/resources/pre/application.properties @@ -21,7 +21,6 @@ spring.jackson.serialization.write-dates-as-timestamps=false spring.servlet.multipart.max-file-size=30MB spring.servlet.multipart.max-request-size=30MB file-upload-service.path=/home/upload/ -file-upload-service.geturl=http://172.16.0.145/smartAdmin/file/ ######################### database ######################### spring.datasource.url=jdbc:mysql://127.0.0.1:3306/smart-admin-dev?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=UTC diff --git a/java/smart-admin-api/src/main/resources/pre/log4j2.xml b/smart-admin-service/smart-admin-api/src/main/resources/pre/log4j2.xml similarity index 100% rename from java/smart-admin-api/src/main/resources/pre/log4j2.xml rename to smart-admin-service/smart-admin-api/src/main/resources/pre/log4j2.xml diff --git a/java/smart-admin-api/src/main/resources/prod/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties similarity index 98% rename from java/smart-admin-api/src/main/resources/prod/application.properties rename to smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties index e42e3f9..a1a740f 100644 --- a/java/smart-admin-api/src/main/resources/prod/application.properties +++ b/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties @@ -22,7 +22,6 @@ spring.jackson.serialization.write-dates-as-timestamps=false spring.servlet.multipart.max-file-size=30MB spring.servlet.multipart.max-request-size=30MB file-upload-service.path=/home/upload/smart-admin-file -file-upload-service.geturl=http://smartadmin.gangquan360.com/demoAdmin/file/ ######################### database ######################### spring.datasource.url=jdbc:mysql://172.16.0.201:3306/smart-admin-prod?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true diff --git a/java/smart-admin-api/src/main/resources/prod/log4j2.xml b/smart-admin-service/smart-admin-api/src/main/resources/prod/log4j2.xml similarity index 100% rename from java/smart-admin-api/src/main/resources/prod/log4j2.xml rename to smart-admin-service/smart-admin-api/src/main/resources/prod/log4j2.xml diff --git a/java/smart-admin-api/src/main/resources/dev/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/sit/application.properties similarity index 98% rename from java/smart-admin-api/src/main/resources/dev/application.properties rename to smart-admin-service/smart-admin-api/src/main/resources/sit/application.properties index ad34ca0..837ec16 100644 --- a/java/smart-admin-api/src/main/resources/dev/application.properties +++ b/smart-admin-service/smart-admin-api/src/main/resources/sit/application.properties @@ -21,7 +21,6 @@ spring.jackson.serialization.write-dates-as-timestamps=false spring.servlet.multipart.max-file-size=30MB spring.servlet.multipart.max-request-size=30MB file-upload-service.path=/home/upload/ -file-upload-service.geturl=http://172.16.0.145/smartAdmin/file/ ######################### database ######################### spring.datasource.url=jdbc:mysql://127.0.0.1:3306/smart-admin-dev?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=UTC diff --git a/java/smart-admin-api/src/main/resources/sit/log4j2.xml b/smart-admin-service/smart-admin-api/src/main/resources/sit/log4j2.xml similarity index 100% rename from java/smart-admin-api/src/main/resources/sit/log4j2.xml rename to smart-admin-service/smart-admin-api/src/main/resources/sit/log4j2.xml diff --git a/java/smart-admin-api/src/main/resources/sql/quartz_mysql_2.3.0.sql b/smart-admin-service/smart-admin-api/src/main/resources/sql/quartz_mysql_2.3.0.sql similarity index 100% rename from java/smart-admin-api/src/main/resources/sql/quartz_mysql_2.3.0.sql rename to smart-admin-service/smart-admin-api/src/main/resources/sql/quartz_mysql_2.3.0.sql diff --git a/java/smart-admin-api/src/main/resources/sql/smart-admin.sql b/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql similarity index 99% rename from java/smart-admin-api/src/main/resources/sql/smart-admin.sql rename to smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql index 2090e36..e64ff53 100644 --- a/java/smart-admin-api/src/main/resources/sql/smart-admin.sql +++ b/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql @@ -1283,7 +1283,7 @@ INSERT INTO `t_system_config` (`id`, `config_name`, `config_key`, `config_value` (1, '超级管理员', 'employee_superman', '12,13,1', 'employee', 1, '123r8566456', '2019-11-14 16:40:48', '2018-08-18 16:28:03'), (13, '本地上传URL前缀', 'local_upload_url_prefix', 'http://172.16.0.145/smartAdmin/file/', 'upload', 1, '', '2019-09-04 16:23:49', '2019-04-26 17:06:53'), (14, '阿里云上传配置', 'ali_oss', '{"accessKeyId":"","accessKeySecret":"","bucketName":"sit","endpoint":"http://oss-cn-beijing.aliyuncs.com"}', 'upload', 1, 'eefwfwfds', '2019-11-16 18:04:30', '2019-05-11 18:00:06'), - (15, '邮件发配置', 'email_config', '{"password":"smartadmin","smtpHost":"smtp.163.com","username":"{"password":"smartadmin","smtpHost":"smtp.163.com","username":"smartadmin1024@163.com"}"}', 'email', 1, NULL, '2019-09-04 16:42:17', '2019-05-13 16:57:48'), + (15, '邮件发配置', 'email_config', '{"password":"smartadmin","smtpHost":"smtp.163.com","username":"smartadmin1024@163.com"}', 'email', 1, NULL, '2019-09-04 16:42:17', '2019-05-13 16:57:48'), (16, '七牛云上传配置', 'qi_niu_oss', '{"accessKeyId":"rX7HgY1ZLpUD25JrA-uwMM_jj-","accessKeySecret":"","bucketName":"sun-smart-admin","endpoint":"http://puvpyay08.bkt.clouddn.com"}', 'upload', 1, NULL, '2019-11-16 18:04:42', '2019-07-19 16:05:56'), (17, 'test', 'ww_1', 'ewr', '3', 1, 'testoo', '2019-11-08 09:43:36', '2019-11-08 09:27:19'), (18, '4234', '42342', '423423', '23423', 1, '423423111111111111111111111111111111111111423423111111111111111111111111111111111111423423111111111111111111111111111111111111423423111111111111111111111111111111111111423423111111111111111111111111111111111111', '2019-11-14 14:58:39', '2019-11-14 11:22:49'), diff --git a/java/smart-admin-api/src/main/resources/templates/codegenerator/Controller.java.vm b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/Controller.java.vm similarity index 90% rename from java/smart-admin-api/src/main/resources/templates/codegenerator/Controller.java.vm rename to smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/Controller.java.vm index a04de01..7eb0113 100644 --- a/java/smart-admin-api/src/main/resources/templates/codegenerator/Controller.java.vm +++ b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/Controller.java.vm @@ -1,7 +1,6 @@ package ${basePackage}.module.${modulePackage}.controller; -import ${basePackage}.common.constant.SwaggerTagConst; -import ${basePackage}.common.domain.PageInfoDTO; +import ${basePackage}.common.domain.PageResultDTO; import ${basePackage}.common.domain.ResponseDTO; import ${basePackage}.module.${modulePackage}.domain.dto.${moduleClass}DTO; import ${basePackage}.module.${modulePackage}.domain.dto.${moduleClass}QueryDTO; @@ -32,7 +31,7 @@ public class ${moduleClass}Controller { @ApiOperation(value = "分页查询${tableDesc}",notes = "@author ${author}") @PostMapping("/${moduleVar}/page/query") - public ResponseDTO> queryByPage(@RequestBody ${moduleClass}QueryDTO queryDTO) { + public ResponseDTO> queryByPage(@RequestBody ${moduleClass}QueryDTO queryDTO) { return ${moduleVar}Service.queryByPage(queryDTO); } diff --git a/java/smart-admin-api/src/main/resources/templates/codegenerator/DTO.java.vm b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/DTO.java.vm similarity index 100% rename from java/smart-admin-api/src/main/resources/templates/codegenerator/DTO.java.vm rename to smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/DTO.java.vm diff --git a/java/smart-admin-api/src/main/resources/templates/codegenerator/Dao.java.vm b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/Dao.java.vm similarity index 96% rename from java/smart-admin-api/src/main/resources/templates/codegenerator/Dao.java.vm rename to smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/Dao.java.vm index c491c70..c2b99d7 100644 --- a/java/smart-admin-api/src/main/resources/templates/codegenerator/Dao.java.vm +++ b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/Dao.java.vm @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.plugins.pagination.Pagination; import ${basePackage}.module.${modulePackage}.domain.dto.${moduleClass}QueryDTO; import ${basePackage}.module.${modulePackage}.domain.entity.${moduleClass}Entity; -import ${basePackage}.utils.PaginationUtil; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; diff --git a/java/smart-admin-api/src/main/resources/templates/codegenerator/Dao.xml.vm b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/Dao.xml.vm similarity index 100% rename from java/smart-admin-api/src/main/resources/templates/codegenerator/Dao.xml.vm rename to smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/Dao.xml.vm diff --git a/java/smart-admin-api/src/main/resources/templates/codegenerator/Entity.java.vm b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/Entity.java.vm similarity index 100% rename from java/smart-admin-api/src/main/resources/templates/codegenerator/Entity.java.vm rename to smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/Entity.java.vm diff --git a/java/smart-admin-api/src/main/resources/templates/codegenerator/QueryDTO.java.vm b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/QueryDTO.java.vm similarity index 90% rename from java/smart-admin-api/src/main/resources/templates/codegenerator/QueryDTO.java.vm rename to smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/QueryDTO.java.vm index 8ebf55b..15c3041 100644 --- a/java/smart-admin-api/src/main/resources/templates/codegenerator/QueryDTO.java.vm +++ b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/QueryDTO.java.vm @@ -1,6 +1,6 @@ package ${basePackage}.module.${modulePackage}.domain.dto; -import ${basePackage}.common.domain.PageBaseDTO; +import ${basePackage}.common.domain.PageParamDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; #foreach ($queryImport in $queryImports) @@ -18,7 +18,7 @@ $queryImport * @since JDK1.8 */ @Data -public class ${moduleClass}QueryDTO extends PageBaseDTO { +public class ${moduleClass}QueryDTO extends PageParamDTO { #foreach ($queryField in $queryFieldList) diff --git a/java/smart-admin-api/src/main/resources/templates/codegenerator/Service.java.vm b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/Service.java.vm similarity index 86% rename from java/smart-admin-api/src/main/resources/templates/codegenerator/Service.java.vm rename to smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/Service.java.vm index 88e418a..72201ef 100644 --- a/java/smart-admin-api/src/main/resources/templates/codegenerator/Service.java.vm +++ b/smart-admin-service/smart-admin-api/src/main/resources/templates/codegenerator/Service.java.vm @@ -1,14 +1,14 @@ package ${basePackage}.module.${modulePackage}.service; import com.baomidou.mybatisplus.plugins.Page; -import ${basePackage}.common.domain.PageInfoDTO; +import ${basePackage}.common.domain.PageResultDTO; import ${basePackage}.common.domain.ResponseDTO; import ${basePackage}.module.${modulePackage}.dao.${moduleClass}Dao; import ${basePackage}.module.${modulePackage}.domain.dto.${moduleClass}DTO; import ${basePackage}.module.${modulePackage}.domain.dto.${moduleClass}QueryDTO; import ${basePackage}.module.${modulePackage}.domain.entity.${moduleClass}Entity; -import ${basePackage}.utils.PaginationUtil; -import com.gangquan360.smartutil.bean.SmartBeanUtil; +import ${basePackage}.util.SmartPaginationUtil; +import ${basePackage}.util.SmartBeanUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -37,12 +37,12 @@ public class ${moduleClass}Service { * @description 分页查询 * @date ${date} */ - public ResponseDTO> queryByPage(${moduleClass}QueryDTO queryDTO) { - Page page = PaginationUtil.convert2PageQueryInfo(queryDTO); + public ResponseDTO> queryByPage(${moduleClass}QueryDTO queryDTO) { + Page page = SmartPaginationUtil.convert2PageQueryInfo(queryDTO); List<${moduleClass}Entity> entities = ${moduleVar}Dao.queryByPage(page, queryDTO); List<${moduleClass}DTO> dtoList = SmartBeanUtil.copyList(entities, ${moduleClass}DTO.class); page.setRecords(dtoList); - PageInfoDTO<${moduleClass}DTO> pageResultDTO = PaginationUtil.convert2PageInfoDTO(page); + PageResultDTO<${moduleClass}DTO> pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page); return ResponseDTO.succData(pageResultDTO); } diff --git a/java/smart-admin-api/src/test/java/com/gangquan360/smartadmin/BaseTest.java b/smart-admin-service/smart-admin-api/src/test/java/com/gangquan360/smartadmin/BaseTest.java similarity index 100% rename from java/smart-admin-api/src/test/java/com/gangquan360/smartadmin/BaseTest.java rename to smart-admin-service/smart-admin-api/src/test/java/com/gangquan360/smartadmin/BaseTest.java diff --git a/java/smart-admin-api/src/test/java/com/gangquan360/smartadmin/SmartAdminApplicationTests.java b/smart-admin-service/smart-admin-api/src/test/java/com/gangquan360/smartadmin/SmartAdminApplicationTests.java similarity index 100% rename from java/smart-admin-api/src/test/java/com/gangquan360/smartadmin/SmartAdminApplicationTests.java rename to smart-admin-service/smart-admin-api/src/test/java/com/gangquan360/smartadmin/SmartAdminApplicationTests.java diff --git a/smart-admin-service/smart-admin-api/src/test/java/com/gangquan360/smartadmin/module/codegenerator/CodeGeneratorServiceTest.java b/smart-admin-service/smart-admin-api/src/test/java/com/gangquan360/smartadmin/module/codegenerator/CodeGeneratorServiceTest.java new file mode 100644 index 0000000..2a0880c --- /dev/null +++ b/smart-admin-service/smart-admin-api/src/test/java/com/gangquan360/smartadmin/module/codegenerator/CodeGeneratorServiceTest.java @@ -0,0 +1,45 @@ +package com.gangquan360.smartadmin.module.codegenerator; + +import com.gangquan360.smartadmin.BaseTest; +import com.gangquan360.smartadmin.module.codegenerator.constant.SqlOperateTypeEnum; +import com.gangquan360.smartadmin.module.codegenerator.domain.CodeGeneratorDTO; +import com.gangquan360.smartadmin.module.codegenerator.domain.CodeGeneratorQueryColumnDTO; +import com.gangquan360.smartadmin.module.codegenerator.service.CodeGeneratorService; +import com.google.common.collect.Lists; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; + +/** + * IdGeneratorService Tester. + * + * @author lizongliang + * @version 1.0 + */ +public class CodeGeneratorServiceTest extends BaseTest { + + @Autowired + private CodeGeneratorService codeGeneratorService; + + @Test + public void testGenerate() throws Exception { + CodeGeneratorQueryColumnDTO createTimeBetween = CodeGeneratorQueryColumnDTO.builder() + .columnName("create_time") + .sqlOperate(SqlOperateTypeEnum.TIME_BETWEEN).build(); + CodeGeneratorQueryColumnDTO like = CodeGeneratorQueryColumnDTO.builder() + .columnName("title") + .sqlOperate(SqlOperateTypeEnum.LIKE).build(); + + List queryColumnList = Lists.newArrayList(createTimeBetween,like); + CodeGeneratorDTO codeGenerator = CodeGeneratorDTO.builder() + .author("zhuoda") + .company("1024创新( www.1024lab.net )") + .tableName("t_notice") + .tablePrefix("t_") + .basePackage("com.gangquan360.smartadmin") + .queryColumnList(queryColumnList).build(); + codeGeneratorService.codeGenerator(codeGenerator); + } + +} diff --git a/front/.babelrc b/smart-admin-web/.babelrc similarity index 100% rename from front/.babelrc rename to smart-admin-web/.babelrc diff --git a/front/.editorconfig b/smart-admin-web/.editorconfig similarity index 100% rename from front/.editorconfig rename to smart-admin-web/.editorconfig diff --git a/front/.env.development b/smart-admin-web/.env.development similarity index 100% rename from front/.env.development rename to smart-admin-web/.env.development diff --git a/front/.env.local b/smart-admin-web/.env.local similarity index 100% rename from front/.env.local rename to smart-admin-web/.env.local diff --git a/front/.env.prod b/smart-admin-web/.env.prod similarity index 100% rename from front/.env.prod rename to smart-admin-web/.env.prod diff --git a/front/.env.sit b/smart-admin-web/.env.sit similarity index 100% rename from front/.env.sit rename to smart-admin-web/.env.sit diff --git a/front/.eslintignore b/smart-admin-web/.eslintignore similarity index 100% rename from front/.eslintignore rename to smart-admin-web/.eslintignore diff --git a/front/.eslintrc.js b/smart-admin-web/.eslintrc.js similarity index 100% rename from front/.eslintrc.js rename to smart-admin-web/.eslintrc.js diff --git a/front/.gitignore b/smart-admin-web/.gitignore similarity index 100% rename from front/.gitignore rename to smart-admin-web/.gitignore diff --git a/front/.postcssrc.js b/smart-admin-web/.postcssrc.js similarity index 100% rename from front/.postcssrc.js rename to smart-admin-web/.postcssrc.js diff --git a/front/.travis.yml b/smart-admin-web/.travis.yml similarity index 100% rename from front/.travis.yml rename to smart-admin-web/.travis.yml diff --git a/front/LICENSE b/smart-admin-web/LICENSE similarity index 100% rename from front/LICENSE rename to smart-admin-web/LICENSE diff --git a/front/README.md b/smart-admin-web/README.md similarity index 100% rename from front/README.md rename to smart-admin-web/README.md diff --git a/front/cypress.json b/smart-admin-web/cypress.json similarity index 100% rename from front/cypress.json rename to smart-admin-web/cypress.json diff --git a/front/doc/notice.txt b/smart-admin-web/doc/notice.txt similarity index 100% rename from front/doc/notice.txt rename to smart-admin-web/doc/notice.txt diff --git a/front/package.json b/smart-admin-web/package.json similarity index 100% rename from front/package.json rename to smart-admin-web/package.json diff --git a/front/public/favicon.ico b/smart-admin-web/public/favicon.ico similarity index 100% rename from front/public/favicon.ico rename to smart-admin-web/public/favicon.ico diff --git a/front/public/index.html b/smart-admin-web/public/index.html similarity index 100% rename from front/public/index.html rename to smart-admin-web/public/index.html diff --git a/front/src/App.vue b/smart-admin-web/src/App.vue similarity index 100% rename from front/src/App.vue rename to smart-admin-web/src/App.vue diff --git a/front/src/api/data-scope.js b/smart-admin-web/src/api/data-scope.js similarity index 100% rename from front/src/api/data-scope.js rename to smart-admin-web/src/api/data-scope.js diff --git a/front/src/api/department.js b/smart-admin-web/src/api/department.js similarity index 100% rename from front/src/api/department.js rename to smart-admin-web/src/api/department.js diff --git a/front/src/api/email.js b/smart-admin-web/src/api/email.js similarity index 100% rename from front/src/api/email.js rename to smart-admin-web/src/api/email.js diff --git a/front/src/api/employee.js b/smart-admin-web/src/api/employee.js similarity index 100% rename from front/src/api/employee.js rename to smart-admin-web/src/api/employee.js diff --git a/front/src/api/file.js b/smart-admin-web/src/api/file.js similarity index 100% rename from front/src/api/file.js rename to smart-admin-web/src/api/file.js diff --git a/front/src/api/heart-beat.js b/smart-admin-web/src/api/heart-beat.js similarity index 100% rename from front/src/api/heart-beat.js rename to smart-admin-web/src/api/heart-beat.js diff --git a/front/src/api/login.js b/smart-admin-web/src/api/login.js similarity index 100% rename from front/src/api/login.js rename to smart-admin-web/src/api/login.js diff --git a/front/src/api/notice.js b/smart-admin-web/src/api/notice.js similarity index 100% rename from front/src/api/notice.js rename to smart-admin-web/src/api/notice.js diff --git a/front/src/api/online-user.js b/smart-admin-web/src/api/online-user.js similarity index 100% rename from front/src/api/online-user.js rename to smart-admin-web/src/api/online-user.js diff --git a/front/src/api/position.js b/smart-admin-web/src/api/position.js similarity index 100% rename from front/src/api/position.js rename to smart-admin-web/src/api/position.js diff --git a/front/src/api/privilege.js b/smart-admin-web/src/api/privilege.js similarity index 100% rename from front/src/api/privilege.js rename to smart-admin-web/src/api/privilege.js diff --git a/front/src/api/role.js b/smart-admin-web/src/api/role.js similarity index 100% rename from front/src/api/role.js rename to smart-admin-web/src/api/role.js diff --git a/front/src/api/smart-reload.js b/smart-admin-web/src/api/smart-reload.js similarity index 100% rename from front/src/api/smart-reload.js rename to smart-admin-web/src/api/smart-reload.js diff --git a/front/src/api/system-config.js b/smart-admin-web/src/api/system-config.js similarity index 100% rename from front/src/api/system-config.js rename to smart-admin-web/src/api/system-config.js diff --git a/front/src/api/task-manage.js b/smart-admin-web/src/api/task-manage.js similarity index 100% rename from front/src/api/task-manage.js rename to smart-admin-web/src/api/task-manage.js diff --git a/front/src/api/user-log.js b/smart-admin-web/src/api/user-log.js similarity index 100% rename from front/src/api/user-log.js rename to smart-admin-web/src/api/user-log.js diff --git a/front/src/api/user.js b/smart-admin-web/src/api/user.js similarity index 100% rename from front/src/api/user.js rename to smart-admin-web/src/api/user.js diff --git a/front/src/assets/icons/demo.css b/smart-admin-web/src/assets/icons/demo.css similarity index 100% rename from front/src/assets/icons/demo.css rename to smart-admin-web/src/assets/icons/demo.css diff --git a/front/src/assets/icons/demo_index.html b/smart-admin-web/src/assets/icons/demo_index.html similarity index 100% rename from front/src/assets/icons/demo_index.html rename to smart-admin-web/src/assets/icons/demo_index.html diff --git a/front/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/demo.css b/smart-admin-web/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/demo.css similarity index 100% rename from front/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/demo.css rename to smart-admin-web/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/demo.css diff --git a/front/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/demo_index.html b/smart-admin-web/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/demo_index.html similarity index 100% rename from front/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/demo_index.html rename to smart-admin-web/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/demo_index.html diff --git a/front/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.css b/smart-admin-web/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.css similarity index 100% rename from front/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.css rename to smart-admin-web/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.css diff --git a/front/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.eot b/smart-admin-web/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.eot similarity index 100% rename from front/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.eot rename to smart-admin-web/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.eot diff --git a/front/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.js b/smart-admin-web/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.js similarity index 100% rename from front/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.js rename to smart-admin-web/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.js diff --git a/front/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.svg b/smart-admin-web/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.svg similarity index 100% rename from front/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.svg rename to smart-admin-web/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.svg diff --git a/front/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.ttf b/smart-admin-web/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.ttf similarity index 100% rename from front/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.ttf rename to smart-admin-web/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.ttf diff --git a/front/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.woff b/smart-admin-web/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.woff similarity index 100% rename from front/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.woff rename to smart-admin-web/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.woff diff --git a/front/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.woff2 b/smart-admin-web/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.woff2 similarity index 100% rename from front/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.woff2 rename to smart-admin-web/src/assets/icons/download (4)/font_1299963_2zqwx2axi0j/iconfont.woff2 diff --git a/front/src/assets/icons/iconfont.css b/smart-admin-web/src/assets/icons/iconfont.css similarity index 100% rename from front/src/assets/icons/iconfont.css rename to smart-admin-web/src/assets/icons/iconfont.css diff --git a/front/src/assets/icons/iconfont.eot b/smart-admin-web/src/assets/icons/iconfont.eot similarity index 100% rename from front/src/assets/icons/iconfont.eot rename to smart-admin-web/src/assets/icons/iconfont.eot diff --git a/front/src/assets/icons/iconfont.js b/smart-admin-web/src/assets/icons/iconfont.js similarity index 100% rename from front/src/assets/icons/iconfont.js rename to smart-admin-web/src/assets/icons/iconfont.js diff --git a/front/src/assets/icons/iconfont.svg b/smart-admin-web/src/assets/icons/iconfont.svg similarity index 100% rename from front/src/assets/icons/iconfont.svg rename to smart-admin-web/src/assets/icons/iconfont.svg diff --git a/front/src/assets/icons/iconfont.ttf b/smart-admin-web/src/assets/icons/iconfont.ttf similarity index 100% rename from front/src/assets/icons/iconfont.ttf rename to smart-admin-web/src/assets/icons/iconfont.ttf diff --git a/front/src/assets/icons/iconfont.woff b/smart-admin-web/src/assets/icons/iconfont.woff similarity index 100% rename from front/src/assets/icons/iconfont.woff rename to smart-admin-web/src/assets/icons/iconfont.woff diff --git a/front/src/assets/icons/iconfont.woff2 b/smart-admin-web/src/assets/icons/iconfont.woff2 similarity index 100% rename from front/src/assets/icons/iconfont.woff2 rename to smart-admin-web/src/assets/icons/iconfont.woff2 diff --git a/front/src/assets/images/default_icon.png b/smart-admin-web/src/assets/images/default_icon.png similarity index 100% rename from front/src/assets/images/default_icon.png rename to smart-admin-web/src/assets/images/default_icon.png diff --git a/front/src/assets/images/error-page/error-401.svg b/smart-admin-web/src/assets/images/error-page/error-401.svg similarity index 100% rename from front/src/assets/images/error-page/error-401.svg rename to smart-admin-web/src/assets/images/error-page/error-401.svg diff --git a/front/src/assets/images/error-page/error-404.svg b/smart-admin-web/src/assets/images/error-page/error-404.svg similarity index 100% rename from front/src/assets/images/error-page/error-404.svg rename to smart-admin-web/src/assets/images/error-page/error-404.svg diff --git a/front/src/assets/images/error-page/error-500.svg b/smart-admin-web/src/assets/images/error-page/error-500.svg similarity index 100% rename from front/src/assets/images/error-page/error-500.svg rename to smart-admin-web/src/assets/images/error-page/error-500.svg diff --git a/front/src/assets/images/icon-qr-qq-wechat.png b/smart-admin-web/src/assets/images/icon-qr-qq-wechat.png similarity index 100% rename from front/src/assets/images/icon-qr-qq-wechat.png rename to smart-admin-web/src/assets/images/icon-qr-qq-wechat.png diff --git a/front/src/assets/images/icon-social-bilibili.svg b/smart-admin-web/src/assets/images/icon-social-bilibili.svg similarity index 100% rename from front/src/assets/images/icon-social-bilibili.svg rename to smart-admin-web/src/assets/images/icon-social-bilibili.svg diff --git a/front/src/assets/images/icon-social-juejin.svg b/smart-admin-web/src/assets/images/icon-social-juejin.svg similarity index 100% rename from front/src/assets/images/icon-social-juejin.svg rename to smart-admin-web/src/assets/images/icon-social-juejin.svg diff --git a/front/src/assets/images/icon-social-twitter.svg b/smart-admin-web/src/assets/images/icon-social-twitter.svg similarity index 100% rename from front/src/assets/images/icon-social-twitter.svg rename to smart-admin-web/src/assets/images/icon-social-twitter.svg diff --git a/front/src/assets/images/icon-social-zhihu.svg b/smart-admin-web/src/assets/images/icon-social-zhihu.svg similarity index 100% rename from front/src/assets/images/icon-social-zhihu.svg rename to smart-admin-web/src/assets/images/icon-social-zhihu.svg diff --git a/front/src/assets/images/login-alipay.png b/smart-admin-web/src/assets/images/login-alipay.png similarity index 100% rename from front/src/assets/images/login-alipay.png rename to smart-admin-web/src/assets/images/login-alipay.png diff --git a/front/src/assets/images/login-bg.jpg b/smart-admin-web/src/assets/images/login-bg.jpg similarity index 100% rename from front/src/assets/images/login-bg.jpg rename to smart-admin-web/src/assets/images/login-bg.jpg diff --git a/front/src/assets/images/login-logo.png b/smart-admin-web/src/assets/images/login-logo.png similarity index 100% rename from front/src/assets/images/login-logo.png rename to smart-admin-web/src/assets/images/login-logo.png diff --git a/front/src/assets/images/login-sina.png b/smart-admin-web/src/assets/images/login-sina.png similarity index 100% rename from front/src/assets/images/login-sina.png rename to smart-admin-web/src/assets/images/login-sina.png diff --git a/front/src/assets/images/login-taobao.png b/smart-admin-web/src/assets/images/login-taobao.png similarity index 100% rename from front/src/assets/images/login-taobao.png rename to smart-admin-web/src/assets/images/login-taobao.png diff --git a/front/src/assets/images/login_desc_bg.png b/smart-admin-web/src/assets/images/login_desc_bg.png similarity index 100% rename from front/src/assets/images/login_desc_bg.png rename to smart-admin-web/src/assets/images/login_desc_bg.png diff --git a/front/src/assets/images/login_logo.png b/smart-admin-web/src/assets/images/login_logo.png similarity index 100% rename from front/src/assets/images/login_logo.png rename to smart-admin-web/src/assets/images/login_logo.png diff --git a/front/src/assets/images/logo-min.png b/smart-admin-web/src/assets/images/logo-min.png similarity index 100% rename from front/src/assets/images/logo-min.png rename to smart-admin-web/src/assets/images/logo-min.png diff --git a/front/src/assets/images/logo.png b/smart-admin-web/src/assets/images/logo.png similarity index 100% rename from front/src/assets/images/logo.png rename to smart-admin-web/src/assets/images/logo.png diff --git a/front/src/assets/images/message.png b/smart-admin-web/src/assets/images/message.png similarity index 100% rename from front/src/assets/images/message.png rename to smart-admin-web/src/assets/images/message.png diff --git a/front/src/assets/images/shadow.png b/smart-admin-web/src/assets/images/shadow.png similarity index 100% rename from front/src/assets/images/shadow.png rename to smart-admin-web/src/assets/images/shadow.png diff --git a/front/src/assets/images/slider/sub_slider_active.png b/smart-admin-web/src/assets/images/slider/sub_slider_active.png similarity index 100% rename from front/src/assets/images/slider/sub_slider_active.png rename to smart-admin-web/src/assets/images/slider/sub_slider_active.png diff --git a/front/src/assets/images/slider/sub_slider_default.png b/smart-admin-web/src/assets/images/slider/sub_slider_default.png similarity index 100% rename from front/src/assets/images/slider/sub_slider_default.png rename to smart-admin-web/src/assets/images/slider/sub_slider_default.png diff --git a/front/src/assets/style/lib/animate.css b/smart-admin-web/src/assets/style/lib/animate.css similarity index 100% rename from front/src/assets/style/lib/animate.css rename to smart-admin-web/src/assets/style/lib/animate.css diff --git a/front/src/components/active-plate/active-plate.vue b/smart-admin-web/src/components/active-plate/active-plate.vue similarity index 100% rename from front/src/components/active-plate/active-plate.vue rename to smart-admin-web/src/components/active-plate/active-plate.vue diff --git a/front/src/components/charts/bar.vue b/smart-admin-web/src/components/charts/bar.vue similarity index 100% rename from front/src/components/charts/bar.vue rename to smart-admin-web/src/components/charts/bar.vue diff --git a/front/src/components/charts/index.js b/smart-admin-web/src/components/charts/index.js similarity index 100% rename from front/src/components/charts/index.js rename to smart-admin-web/src/components/charts/index.js diff --git a/front/src/components/charts/pie.vue b/smart-admin-web/src/components/charts/pie.vue similarity index 100% rename from front/src/components/charts/pie.vue rename to smart-admin-web/src/components/charts/pie.vue diff --git a/front/src/components/charts/theme.json b/smart-admin-web/src/components/charts/theme.json similarity index 100% rename from front/src/components/charts/theme.json rename to smart-admin-web/src/components/charts/theme.json diff --git a/front/src/components/common-icon/common-icon.vue b/smart-admin-web/src/components/common-icon/common-icon.vue similarity index 100% rename from front/src/components/common-icon/common-icon.vue rename to smart-admin-web/src/components/common-icon/common-icon.vue diff --git a/front/src/components/common-icon/index.js b/smart-admin-web/src/components/common-icon/index.js similarity index 100% rename from front/src/components/common-icon/index.js rename to smart-admin-web/src/components/common-icon/index.js diff --git a/front/src/components/count-to/count-to.vue b/smart-admin-web/src/components/count-to/count-to.vue similarity index 100% rename from front/src/components/count-to/count-to.vue rename to smart-admin-web/src/components/count-to/count-to.vue diff --git a/front/src/components/count-to/index.js b/smart-admin-web/src/components/count-to/index.js similarity index 100% rename from front/src/components/count-to/index.js rename to smart-admin-web/src/components/count-to/index.js diff --git a/front/src/components/count-to/index.less b/smart-admin-web/src/components/count-to/index.less similarity index 100% rename from front/src/components/count-to/index.less rename to smart-admin-web/src/components/count-to/index.less diff --git a/front/src/components/editor/editor.vue b/smart-admin-web/src/components/editor/editor.vue similarity index 100% rename from front/src/components/editor/editor.vue rename to smart-admin-web/src/components/editor/editor.vue diff --git a/front/src/components/editor/index.js b/smart-admin-web/src/components/editor/index.js similarity index 100% rename from front/src/components/editor/index.js rename to smart-admin-web/src/components/editor/index.js diff --git a/front/src/components/icons/icons.vue b/smart-admin-web/src/components/icons/icons.vue similarity index 100% rename from front/src/components/icons/icons.vue rename to smart-admin-web/src/components/icons/icons.vue diff --git a/front/src/components/icons/index.js b/smart-admin-web/src/components/icons/index.js similarity index 100% rename from front/src/components/icons/index.js rename to smart-admin-web/src/components/icons/index.js diff --git a/front/src/components/main/components/a-back-top/index.js b/smart-admin-web/src/components/main/components/a-back-top/index.js similarity index 100% rename from front/src/components/main/components/a-back-top/index.js rename to smart-admin-web/src/components/main/components/a-back-top/index.js diff --git a/front/src/components/main/components/a-back-top/index.vue b/smart-admin-web/src/components/main/components/a-back-top/index.vue similarity index 100% rename from front/src/components/main/components/a-back-top/index.vue rename to smart-admin-web/src/components/main/components/a-back-top/index.vue diff --git a/front/src/components/main/components/fullscreen/fullscreen.vue b/smart-admin-web/src/components/main/components/fullscreen/fullscreen.vue similarity index 100% rename from front/src/components/main/components/fullscreen/fullscreen.vue rename to smart-admin-web/src/components/main/components/fullscreen/fullscreen.vue diff --git a/front/src/components/main/components/fullscreen/index.js b/smart-admin-web/src/components/main/components/fullscreen/index.js similarity index 100% rename from front/src/components/main/components/fullscreen/index.js rename to smart-admin-web/src/components/main/components/fullscreen/index.js diff --git a/front/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.less b/smart-admin-web/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.less similarity index 100% rename from front/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.less rename to smart-admin-web/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.less diff --git a/front/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue b/smart-admin-web/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue similarity index 100% rename from front/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue rename to smart-admin-web/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue diff --git a/front/src/components/main/components/header-bar/custom-bread-crumb/index.js b/smart-admin-web/src/components/main/components/header-bar/custom-bread-crumb/index.js similarity index 100% rename from front/src/components/main/components/header-bar/custom-bread-crumb/index.js rename to smart-admin-web/src/components/main/components/header-bar/custom-bread-crumb/index.js diff --git a/front/src/components/main/components/header-bar/header-bar.less b/smart-admin-web/src/components/main/components/header-bar/header-bar.less similarity index 100% rename from front/src/components/main/components/header-bar/header-bar.less rename to smart-admin-web/src/components/main/components/header-bar/header-bar.less diff --git a/front/src/components/main/components/header-bar/header-bar.vue b/smart-admin-web/src/components/main/components/header-bar/header-bar.vue similarity index 100% rename from front/src/components/main/components/header-bar/header-bar.vue rename to smart-admin-web/src/components/main/components/header-bar/header-bar.vue diff --git a/front/src/components/main/components/header-bar/index.js b/smart-admin-web/src/components/main/components/header-bar/index.js similarity index 100% rename from front/src/components/main/components/header-bar/index.js rename to smart-admin-web/src/components/main/components/header-bar/index.js diff --git a/front/src/components/main/components/header-bar/sider-trigger/index.js b/smart-admin-web/src/components/main/components/header-bar/sider-trigger/index.js similarity index 100% rename from front/src/components/main/components/header-bar/sider-trigger/index.js rename to smart-admin-web/src/components/main/components/header-bar/sider-trigger/index.js diff --git a/front/src/components/main/components/header-bar/sider-trigger/sider-trigger.less b/smart-admin-web/src/components/main/components/header-bar/sider-trigger/sider-trigger.less similarity index 100% rename from front/src/components/main/components/header-bar/sider-trigger/sider-trigger.less rename to smart-admin-web/src/components/main/components/header-bar/sider-trigger/sider-trigger.less diff --git a/front/src/components/main/components/header-bar/sider-trigger/sider-trigger.vue b/smart-admin-web/src/components/main/components/header-bar/sider-trigger/sider-trigger.vue similarity index 100% rename from front/src/components/main/components/header-bar/sider-trigger/sider-trigger.vue rename to smart-admin-web/src/components/main/components/header-bar/sider-trigger/sider-trigger.vue diff --git a/front/src/components/main/components/language/index.js b/smart-admin-web/src/components/main/components/language/index.js similarity index 100% rename from front/src/components/main/components/language/index.js rename to smart-admin-web/src/components/main/components/language/index.js diff --git a/front/src/components/main/components/language/language.vue b/smart-admin-web/src/components/main/components/language/language.vue similarity index 100% rename from front/src/components/main/components/language/language.vue rename to smart-admin-web/src/components/main/components/language/language.vue diff --git a/front/src/components/main/components/notice/notice.vue b/smart-admin-web/src/components/main/components/notice/notice.vue similarity index 100% rename from front/src/components/main/components/notice/notice.vue rename to smart-admin-web/src/components/main/components/notice/notice.vue diff --git a/front/src/components/main/components/side-menu/collapsed-menu.vue b/smart-admin-web/src/components/main/components/side-menu/collapsed-menu.vue similarity index 100% rename from front/src/components/main/components/side-menu/collapsed-menu.vue rename to smart-admin-web/src/components/main/components/side-menu/collapsed-menu.vue diff --git a/front/src/components/main/components/side-menu/index.js b/smart-admin-web/src/components/main/components/side-menu/index.js similarity index 100% rename from front/src/components/main/components/side-menu/index.js rename to smart-admin-web/src/components/main/components/side-menu/index.js diff --git a/front/src/components/main/components/side-menu/item-mixin.js b/smart-admin-web/src/components/main/components/side-menu/item-mixin.js similarity index 100% rename from front/src/components/main/components/side-menu/item-mixin.js rename to smart-admin-web/src/components/main/components/side-menu/item-mixin.js diff --git a/front/src/components/main/components/side-menu/mixin.js b/smart-admin-web/src/components/main/components/side-menu/mixin.js similarity index 100% rename from front/src/components/main/components/side-menu/mixin.js rename to smart-admin-web/src/components/main/components/side-menu/mixin.js diff --git a/front/src/components/main/components/side-menu/side-menu-item.vue b/smart-admin-web/src/components/main/components/side-menu/side-menu-item.vue similarity index 100% rename from front/src/components/main/components/side-menu/side-menu-item.vue rename to smart-admin-web/src/components/main/components/side-menu/side-menu-item.vue diff --git a/front/src/components/main/components/side-menu/side-menu.less b/smart-admin-web/src/components/main/components/side-menu/side-menu.less similarity index 100% rename from front/src/components/main/components/side-menu/side-menu.less rename to smart-admin-web/src/components/main/components/side-menu/side-menu.less diff --git a/front/src/components/main/components/side-menu/side-menu.vue b/smart-admin-web/src/components/main/components/side-menu/side-menu.vue similarity index 100% rename from front/src/components/main/components/side-menu/side-menu.vue rename to smart-admin-web/src/components/main/components/side-menu/side-menu.vue diff --git a/front/src/components/main/components/tags-nav/index.js b/smart-admin-web/src/components/main/components/tags-nav/index.js similarity index 100% rename from front/src/components/main/components/tags-nav/index.js rename to smart-admin-web/src/components/main/components/tags-nav/index.js diff --git a/front/src/components/main/components/tags-nav/tags-nav.less b/smart-admin-web/src/components/main/components/tags-nav/tags-nav.less similarity index 100% rename from front/src/components/main/components/tags-nav/tags-nav.less rename to smart-admin-web/src/components/main/components/tags-nav/tags-nav.less diff --git a/front/src/components/main/components/tags-nav/tags-nav.vue b/smart-admin-web/src/components/main/components/tags-nav/tags-nav.vue similarity index 100% rename from front/src/components/main/components/tags-nav/tags-nav.vue rename to smart-admin-web/src/components/main/components/tags-nav/tags-nav.vue diff --git a/front/src/components/main/components/user/index.js b/smart-admin-web/src/components/main/components/user/index.js similarity index 100% rename from front/src/components/main/components/user/index.js rename to smart-admin-web/src/components/main/components/user/index.js diff --git a/front/src/components/main/components/user/user.less b/smart-admin-web/src/components/main/components/user/user.less similarity index 100% rename from front/src/components/main/components/user/user.less rename to smart-admin-web/src/components/main/components/user/user.less diff --git a/front/src/components/main/components/user/user.vue b/smart-admin-web/src/components/main/components/user/user.vue similarity index 100% rename from front/src/components/main/components/user/user.vue rename to smart-admin-web/src/components/main/components/user/user.vue diff --git a/front/src/components/main/index.js b/smart-admin-web/src/components/main/index.js similarity index 100% rename from front/src/components/main/index.js rename to smart-admin-web/src/components/main/index.js diff --git a/front/src/components/main/main.less b/smart-admin-web/src/components/main/main.less similarity index 100% rename from front/src/components/main/main.less rename to smart-admin-web/src/components/main/main.less diff --git a/front/src/components/main/main.vue b/smart-admin-web/src/components/main/main.vue similarity index 100% rename from front/src/components/main/main.vue rename to smart-admin-web/src/components/main/main.vue diff --git a/smart-admin-web/src/components/smart-admin-ad/ad.vue b/smart-admin-web/src/components/smart-admin-ad/ad.vue new file mode 100644 index 0000000..43f2d9e --- /dev/null +++ b/smart-admin-web/src/components/smart-admin-ad/ad.vue @@ -0,0 +1,34 @@ + + + diff --git a/smart-admin-web/src/components/smart-admin-ad/index.js b/smart-admin-web/src/components/smart-admin-ad/index.js new file mode 100644 index 0000000..f0b0e3f --- /dev/null +++ b/smart-admin-web/src/components/smart-admin-ad/index.js @@ -0,0 +1,2 @@ +import Ad from './ad.vue'; +export default Ad; diff --git a/front/src/components/tables/edit.vue b/smart-admin-web/src/components/tables/edit.vue similarity index 100% rename from front/src/components/tables/edit.vue rename to smart-admin-web/src/components/tables/edit.vue diff --git a/front/src/components/tables/handle-btns.js b/smart-admin-web/src/components/tables/handle-btns.js similarity index 100% rename from front/src/components/tables/handle-btns.js rename to smart-admin-web/src/components/tables/handle-btns.js diff --git a/front/src/components/tables/index.js b/smart-admin-web/src/components/tables/index.js similarity index 100% rename from front/src/components/tables/index.js rename to smart-admin-web/src/components/tables/index.js diff --git a/front/src/components/tables/index.less b/smart-admin-web/src/components/tables/index.less similarity index 100% rename from front/src/components/tables/index.less rename to smart-admin-web/src/components/tables/index.less diff --git a/front/src/components/tables/tables.vue b/smart-admin-web/src/components/tables/tables.vue similarity index 100% rename from front/src/components/tables/tables.vue rename to smart-admin-web/src/components/tables/tables.vue diff --git a/front/src/config/index.js b/smart-admin-web/src/config/index.js similarity index 100% rename from front/src/config/index.js rename to smart-admin-web/src/config/index.js diff --git a/front/src/constants/file.js b/smart-admin-web/src/constants/file.js similarity index 100% rename from front/src/constants/file.js rename to smart-admin-web/src/constants/file.js diff --git a/front/src/constants/index.js b/smart-admin-web/src/constants/index.js similarity index 100% rename from front/src/constants/index.js rename to smart-admin-web/src/constants/index.js diff --git a/front/src/constants/login.js b/smart-admin-web/src/constants/login.js similarity index 100% rename from front/src/constants/login.js rename to smart-admin-web/src/constants/login.js diff --git a/front/src/constants/notice.js b/smart-admin-web/src/constants/notice.js similarity index 100% rename from front/src/constants/notice.js rename to smart-admin-web/src/constants/notice.js diff --git a/front/src/constants/privilege.js b/smart-admin-web/src/constants/privilege.js similarity index 100% rename from front/src/constants/privilege.js rename to smart-admin-web/src/constants/privilege.js diff --git a/front/src/directives/directives.js b/smart-admin-web/src/directives/directives.js similarity index 100% rename from front/src/directives/directives.js rename to smart-admin-web/src/directives/directives.js diff --git a/front/src/directives/index.js b/smart-admin-web/src/directives/index.js similarity index 100% rename from front/src/directives/index.js rename to smart-admin-web/src/directives/index.js diff --git a/front/src/directives/module/clipboard.js b/smart-admin-web/src/directives/module/clipboard.js similarity index 100% rename from front/src/directives/module/clipboard.js rename to smart-admin-web/src/directives/module/clipboard.js diff --git a/front/src/directives/module/draggable.js b/smart-admin-web/src/directives/module/draggable.js similarity index 100% rename from front/src/directives/module/draggable.js rename to smart-admin-web/src/directives/module/draggable.js diff --git a/front/src/directives/module/privilege.js b/smart-admin-web/src/directives/module/privilege.js similarity index 100% rename from front/src/directives/module/privilege.js rename to smart-admin-web/src/directives/module/privilege.js diff --git a/front/src/filters/index.js b/smart-admin-web/src/filters/index.js similarity index 100% rename from front/src/filters/index.js rename to smart-admin-web/src/filters/index.js diff --git a/front/src/lib/cookie.js b/smart-admin-web/src/lib/cookie.js similarity index 100% rename from front/src/lib/cookie.js rename to smart-admin-web/src/lib/cookie.js diff --git a/front/src/lib/http.js b/smart-admin-web/src/lib/http.js similarity index 100% rename from front/src/lib/http.js rename to smart-admin-web/src/lib/http.js diff --git a/front/src/lib/local.js b/smart-admin-web/src/lib/local.js similarity index 100% rename from front/src/lib/local.js rename to smart-admin-web/src/lib/local.js diff --git a/front/src/lib/menu-func.js b/smart-admin-web/src/lib/menu-func.js similarity index 100% rename from front/src/lib/menu-func.js rename to smart-admin-web/src/lib/menu-func.js diff --git a/front/src/lib/printPlugs.js b/smart-admin-web/src/lib/printPlugs.js similarity index 100% rename from front/src/lib/printPlugs.js rename to smart-admin-web/src/lib/printPlugs.js diff --git a/front/src/lib/render-dom.js b/smart-admin-web/src/lib/render-dom.js similarity index 100% rename from front/src/lib/render-dom.js rename to smart-admin-web/src/lib/render-dom.js diff --git a/front/src/lib/table-action.js b/smart-admin-web/src/lib/table-action.js similarity index 100% rename from front/src/lib/table-action.js rename to smart-admin-web/src/lib/table-action.js diff --git a/front/src/lib/util.js b/smart-admin-web/src/lib/util.js similarity index 100% rename from front/src/lib/util.js rename to smart-admin-web/src/lib/util.js diff --git a/front/src/locale/index.js b/smart-admin-web/src/locale/index.js similarity index 100% rename from front/src/locale/index.js rename to smart-admin-web/src/locale/index.js diff --git a/front/src/locale/lang/en-US.js b/smart-admin-web/src/locale/lang/en-US.js similarity index 100% rename from front/src/locale/lang/en-US.js rename to smart-admin-web/src/locale/lang/en-US.js diff --git a/front/src/locale/lang/zh-CN.js b/smart-admin-web/src/locale/lang/zh-CN.js similarity index 100% rename from front/src/locale/lang/zh-CN.js rename to smart-admin-web/src/locale/lang/zh-CN.js diff --git a/front/src/locale/lang/zh-TW.js b/smart-admin-web/src/locale/lang/zh-TW.js similarity index 100% rename from front/src/locale/lang/zh-TW.js rename to smart-admin-web/src/locale/lang/zh-TW.js diff --git a/front/src/main.js b/smart-admin-web/src/main.js similarity index 100% rename from front/src/main.js rename to smart-admin-web/src/main.js diff --git a/front/src/main.less b/smart-admin-web/src/main.less similarity index 100% rename from front/src/main.less rename to smart-admin-web/src/main.less diff --git a/front/src/plugins/error-store/index.js b/smart-admin-web/src/plugins/error-store/index.js similarity index 100% rename from front/src/plugins/error-store/index.js rename to smart-admin-web/src/plugins/error-store/index.js diff --git a/front/src/plugins/index.js b/smart-admin-web/src/plugins/index.js similarity index 100% rename from front/src/plugins/index.js rename to smart-admin-web/src/plugins/index.js diff --git a/front/src/router/before-close.js b/smart-admin-web/src/router/before-close.js similarity index 100% rename from front/src/router/before-close.js rename to smart-admin-web/src/router/before-close.js diff --git a/front/src/router/index.js b/smart-admin-web/src/router/index.js similarity index 95% rename from front/src/router/index.js rename to smart-admin-web/src/router/index.js index aeaba49..5cad796 100644 --- a/front/src/router/index.js +++ b/smart-admin-web/src/router/index.js @@ -6,6 +6,9 @@ import iView from 'iview'; import cookie from '@/lib/cookie'; import { localRead } from '@/lib/local'; import { setTitle } from '@/lib/menu-func'; +import config from '@/config'; + +const { homeName } = config; Vue.use(Router); const router = new Router({ @@ -62,8 +65,12 @@ router.beforeEach((to, from, next) => { } else if (token && to.name === LOGIN_PAGE_NAME) { // 已登录且要跳转的页面是登录页 next({ - name: 'home' // 跳转到home页 + // 跳转到home页 + name: homeName }); + setTitle(to, router.app); + iView.LoadingBar.finish(); + window.scrollTo(0, 0); } else { // 特殊页面直接放行 if (to.meta.access) { diff --git a/front/src/router/module/api-doc.js b/smart-admin-web/src/router/module/api-doc.js similarity index 100% rename from front/src/router/module/api-doc.js rename to smart-admin-web/src/router/module/api-doc.js diff --git a/front/src/router/module/email.js b/smart-admin-web/src/router/module/email.js similarity index 100% rename from front/src/router/module/email.js rename to smart-admin-web/src/router/module/email.js diff --git a/front/src/router/module/employee.js b/smart-admin-web/src/router/module/employee.js similarity index 100% rename from front/src/router/module/employee.js rename to smart-admin-web/src/router/module/employee.js diff --git a/front/src/router/module/error.js b/smart-admin-web/src/router/module/error.js similarity index 100% rename from front/src/router/module/error.js rename to smart-admin-web/src/router/module/error.js diff --git a/front/src/router/module/file.js b/smart-admin-web/src/router/module/file.js similarity index 100% rename from front/src/router/module/file.js rename to smart-admin-web/src/router/module/file.js diff --git a/front/src/router/module/heart-beat.js b/smart-admin-web/src/router/module/heart-beat.js similarity index 100% rename from front/src/router/module/heart-beat.js rename to smart-admin-web/src/router/module/heart-beat.js diff --git a/front/src/router/module/home.js b/smart-admin-web/src/router/module/home.js similarity index 100% rename from front/src/router/module/home.js rename to smart-admin-web/src/router/module/home.js diff --git a/front/src/router/module/keep-alive.js b/smart-admin-web/src/router/module/keep-alive.js similarity index 100% rename from front/src/router/module/keep-alive.js rename to smart-admin-web/src/router/module/keep-alive.js diff --git a/front/src/router/module/monitor.js b/smart-admin-web/src/router/module/monitor.js similarity index 100% rename from front/src/router/module/monitor.js rename to smart-admin-web/src/router/module/monitor.js diff --git a/front/src/router/module/notice.js b/smart-admin-web/src/router/module/notice.js similarity index 100% rename from front/src/router/module/notice.js rename to smart-admin-web/src/router/module/notice.js diff --git a/front/src/router/module/reload.js b/smart-admin-web/src/router/module/reload.js similarity index 100% rename from front/src/router/module/reload.js rename to smart-admin-web/src/router/module/reload.js diff --git a/front/src/router/module/system-setting.js b/smart-admin-web/src/router/module/system-setting.js similarity index 100% rename from front/src/router/module/system-setting.js rename to smart-admin-web/src/router/module/system-setting.js diff --git a/front/src/router/module/task.js b/smart-admin-web/src/router/module/task.js similarity index 100% rename from front/src/router/module/task.js rename to smart-admin-web/src/router/module/task.js diff --git a/front/src/router/module/three-router.js b/smart-admin-web/src/router/module/three-router.js similarity index 100% rename from front/src/router/module/three-router.js rename to smart-admin-web/src/router/module/three-router.js diff --git a/front/src/router/module/user-log.js b/smart-admin-web/src/router/module/user-log.js similarity index 100% rename from front/src/router/module/user-log.js rename to smart-admin-web/src/router/module/user-log.js diff --git a/front/src/router/routers.js b/smart-admin-web/src/router/routers.js similarity index 100% rename from front/src/router/routers.js rename to smart-admin-web/src/router/routers.js diff --git a/front/src/store/index.js b/smart-admin-web/src/store/index.js similarity index 100% rename from front/src/store/index.js rename to smart-admin-web/src/store/index.js diff --git a/front/src/store/module/app.js b/smart-admin-web/src/store/module/app.js similarity index 100% rename from front/src/store/module/app.js rename to smart-admin-web/src/store/module/app.js diff --git a/front/src/store/module/notice.js b/smart-admin-web/src/store/module/notice.js similarity index 100% rename from front/src/store/module/notice.js rename to smart-admin-web/src/store/module/notice.js diff --git a/front/src/store/module/user.js b/smart-admin-web/src/store/module/user.js similarity index 100% rename from front/src/store/module/user.js rename to smart-admin-web/src/store/module/user.js diff --git a/front/src/themes/ReadMe.md b/smart-admin-web/src/themes/ReadMe.md similarity index 100% rename from front/src/themes/ReadMe.md rename to smart-admin-web/src/themes/ReadMe.md diff --git a/front/src/themes/index.less b/smart-admin-web/src/themes/index.less similarity index 100% rename from front/src/themes/index.less rename to smart-admin-web/src/themes/index.less diff --git a/front/src/views/api-doc/swagger.vue b/smart-admin-web/src/views/api-doc/swagger.vue similarity index 100% rename from front/src/views/api-doc/swagger.vue rename to smart-admin-web/src/views/api-doc/swagger.vue diff --git a/front/src/views/email/email-list.vue b/smart-admin-web/src/views/email/email-list.vue similarity index 100% rename from front/src/views/email/email-list.vue rename to smart-admin-web/src/views/email/email-list.vue diff --git a/front/src/views/email/send-mail.vue b/smart-admin-web/src/views/email/send-mail.vue similarity index 100% rename from front/src/views/email/send-mail.vue rename to smart-admin-web/src/views/email/send-mail.vue diff --git a/front/src/views/employee/components/department-employee-tree-item/department-employee-tree-item.vue b/smart-admin-web/src/views/employee/components/department-employee-tree-item/department-employee-tree-item.vue similarity index 100% rename from front/src/views/employee/components/department-employee-tree-item/department-employee-tree-item.vue rename to smart-admin-web/src/views/employee/components/department-employee-tree-item/department-employee-tree-item.vue diff --git a/front/src/views/employee/components/department-employee-tree/department-employee-tree.vue b/smart-admin-web/src/views/employee/components/department-employee-tree/department-employee-tree.vue similarity index 100% rename from front/src/views/employee/components/department-employee-tree/department-employee-tree.vue rename to smart-admin-web/src/views/employee/components/department-employee-tree/department-employee-tree.vue diff --git a/front/src/views/employee/position/position-list.vue b/smart-admin-web/src/views/employee/position/position-list.vue similarity index 100% rename from front/src/views/employee/position/position-list.vue rename to smart-admin-web/src/views/employee/position/position-list.vue diff --git a/front/src/views/employee/role-employee/components/employee-table-add/employee-table-add.vue b/smart-admin-web/src/views/employee/role-employee/components/employee-table-add/employee-table-add.vue similarity index 100% rename from front/src/views/employee/role-employee/components/employee-table-add/employee-table-add.vue rename to smart-admin-web/src/views/employee/role-employee/components/employee-table-add/employee-table-add.vue diff --git a/front/src/views/employee/role-employee/components/employee-table-detail/employee-table-detail.vue b/smart-admin-web/src/views/employee/role-employee/components/employee-table-detail/employee-table-detail.vue similarity index 100% rename from front/src/views/employee/role-employee/components/employee-table-detail/employee-table-detail.vue rename to smart-admin-web/src/views/employee/role-employee/components/employee-table-detail/employee-table-detail.vue diff --git a/front/src/views/employee/role-employee/components/employee-table/employee-table.vue b/smart-admin-web/src/views/employee/role-employee/components/employee-table/employee-table.vue similarity index 99% rename from front/src/views/employee/role-employee/components/employee-table/employee-table.vue rename to smart-admin-web/src/views/employee/role-employee/components/employee-table/employee-table.vue index fc2ef70..d75ae5d 100644 --- a/front/src/views/employee/role-employee/components/employee-table/employee-table.vue +++ b/smart-admin-web/src/views/employee/role-employee/components/employee-table/employee-table.vue @@ -134,7 +134,7 @@ export default { // 员工id mid: '', totalPage: 0, - pageSize: 10, + pageSize: 20, pageNum: 1, isShowManageRoleModal: false, isShowTablesLoading: false, diff --git a/front/src/views/employee/role-employee/role-employee-manage.vue b/smart-admin-web/src/views/employee/role-employee/role-employee-manage.vue similarity index 100% rename from front/src/views/employee/role-employee/role-employee-manage.vue rename to smart-admin-web/src/views/employee/role-employee/role-employee-manage.vue diff --git a/front/src/views/employee/role/components/role-data-scope/role-data-scope.vue b/smart-admin-web/src/views/employee/role/components/role-data-scope/role-data-scope.vue similarity index 100% rename from front/src/views/employee/role/components/role-data-scope/role-data-scope.vue rename to smart-admin-web/src/views/employee/role/components/role-data-scope/role-data-scope.vue diff --git a/front/src/views/employee/role/components/role-list/role-list.vue b/smart-admin-web/src/views/employee/role/components/role-list/role-list.vue similarity index 100% rename from front/src/views/employee/role/components/role-list/role-list.vue rename to smart-admin-web/src/views/employee/role/components/role-list/role-list.vue diff --git a/front/src/views/employee/role/components/role-tree/role-tree.vue b/smart-admin-web/src/views/employee/role/components/role-tree/role-tree.vue similarity index 100% rename from front/src/views/employee/role/components/role-tree/role-tree.vue rename to smart-admin-web/src/views/employee/role/components/role-tree/role-tree.vue diff --git a/front/src/views/employee/role/role-manage.vue b/smart-admin-web/src/views/employee/role/role-manage.vue similarity index 100% rename from front/src/views/employee/role/role-manage.vue rename to smart-admin-web/src/views/employee/role/role-manage.vue diff --git a/front/src/views/error-page/401.vue b/smart-admin-web/src/views/error-page/401.vue similarity index 100% rename from front/src/views/error-page/401.vue rename to smart-admin-web/src/views/error-page/401.vue diff --git a/front/src/views/error-page/404.vue b/smart-admin-web/src/views/error-page/404.vue similarity index 100% rename from front/src/views/error-page/404.vue rename to smart-admin-web/src/views/error-page/404.vue diff --git a/front/src/views/error-page/500.vue b/smart-admin-web/src/views/error-page/500.vue similarity index 100% rename from front/src/views/error-page/500.vue rename to smart-admin-web/src/views/error-page/500.vue diff --git a/front/src/views/error-page/back-btn-group.vue b/smart-admin-web/src/views/error-page/back-btn-group.vue similarity index 100% rename from front/src/views/error-page/back-btn-group.vue rename to smart-admin-web/src/views/error-page/back-btn-group.vue diff --git a/front/src/views/error-page/error-content.vue b/smart-admin-web/src/views/error-page/error-content.vue similarity index 100% rename from front/src/views/error-page/error-content.vue rename to smart-admin-web/src/views/error-page/error-content.vue diff --git a/front/src/views/error-page/error.less b/smart-admin-web/src/views/error-page/error.less similarity index 100% rename from front/src/views/error-page/error.less rename to smart-admin-web/src/views/error-page/error.less diff --git a/front/src/views/file/file-list.vue b/smart-admin-web/src/views/file/file-list.vue similarity index 100% rename from front/src/views/file/file-list.vue rename to smart-admin-web/src/views/file/file-list.vue diff --git a/front/src/views/heart-beat/heart-beat-list.vue b/smart-admin-web/src/views/heart-beat/heart-beat-list.vue similarity index 100% rename from front/src/views/heart-beat/heart-beat-list.vue rename to smart-admin-web/src/views/heart-beat/heart-beat-list.vue diff --git a/front/src/views/home/components/card.vue b/smart-admin-web/src/views/home/components/card.vue similarity index 100% rename from front/src/views/home/components/card.vue rename to smart-admin-web/src/views/home/components/card.vue diff --git a/front/src/views/home/components/chart-bar.vue b/smart-admin-web/src/views/home/components/chart-bar.vue similarity index 100% rename from front/src/views/home/components/chart-bar.vue rename to smart-admin-web/src/views/home/components/chart-bar.vue diff --git a/front/src/views/home/components/chart-funnel.vue b/smart-admin-web/src/views/home/components/chart-funnel.vue similarity index 100% rename from front/src/views/home/components/chart-funnel.vue rename to smart-admin-web/src/views/home/components/chart-funnel.vue diff --git a/front/src/views/home/components/chart-gauge.vue b/smart-admin-web/src/views/home/components/chart-gauge.vue similarity index 100% rename from front/src/views/home/components/chart-gauge.vue rename to smart-admin-web/src/views/home/components/chart-gauge.vue diff --git a/front/src/views/home/components/chart-line.vue b/smart-admin-web/src/views/home/components/chart-line.vue similarity index 100% rename from front/src/views/home/components/chart-line.vue rename to smart-admin-web/src/views/home/components/chart-line.vue diff --git a/front/src/views/home/components/chart-pie.vue b/smart-admin-web/src/views/home/components/chart-pie.vue similarity index 100% rename from front/src/views/home/components/chart-pie.vue rename to smart-admin-web/src/views/home/components/chart-pie.vue diff --git a/front/src/views/home/components/home-circle.vue b/smart-admin-web/src/views/home/components/home-circle.vue similarity index 100% rename from front/src/views/home/components/home-circle.vue rename to smart-admin-web/src/views/home/components/home-circle.vue diff --git a/front/src/views/home/components/home-progress.vue b/smart-admin-web/src/views/home/components/home-progress.vue similarity index 100% rename from front/src/views/home/components/home-progress.vue rename to smart-admin-web/src/views/home/components/home-progress.vue diff --git a/front/src/views/home/components/theme.json b/smart-admin-web/src/views/home/components/theme.json similarity index 100% rename from front/src/views/home/components/theme.json rename to smart-admin-web/src/views/home/components/theme.json diff --git a/front/src/views/home/home.vue b/smart-admin-web/src/views/home/home.vue similarity index 95% rename from front/src/views/home/home.vue rename to smart-admin-web/src/views/home/home.vue index 6992ab6..99cdbac 100644 --- a/front/src/views/home/home.vue +++ b/smart-admin-web/src/views/home/home.vue @@ -48,6 +48,13 @@ + + + + + + @@ -62,6 +69,7 @@ import ChartBar from './components/chart-bar'; import HomeCircle from './components/home-circle'; import HomeProgress from './components/home-progress'; import ChartFunnel from './components/chart-funnel'; +import Ad from '@/components/smart-admin-ad'; export default { name: 'Home', @@ -75,11 +83,13 @@ export default { HomeCircle, ChartGauge, ChartBar, - HomeProgress + HomeProgress, + Ad }, props: {}, data() { return { + adModal:true, infoCardData: [ { title: '新增用户', diff --git a/front/src/views/home/index.js b/smart-admin-web/src/views/home/index.js similarity index 100% rename from front/src/views/home/index.js rename to smart-admin-web/src/views/home/index.js diff --git a/front/src/views/keep-alive/add-content.vue b/smart-admin-web/src/views/keep-alive/add-content.vue similarity index 100% rename from front/src/views/keep-alive/add-content.vue rename to smart-admin-web/src/views/keep-alive/add-content.vue diff --git a/front/src/views/keep-alive/content-list.vue b/smart-admin-web/src/views/keep-alive/content-list.vue similarity index 100% rename from front/src/views/keep-alive/content-list.vue rename to smart-admin-web/src/views/keep-alive/content-list.vue diff --git a/front/src/views/login/canvas.js b/smart-admin-web/src/views/login/canvas.js similarity index 100% rename from front/src/views/login/canvas.js rename to smart-admin-web/src/views/login/canvas.js diff --git a/front/src/views/login/components/login-form.vue b/smart-admin-web/src/views/login/components/login-form.vue similarity index 100% rename from front/src/views/login/components/login-form.vue rename to smart-admin-web/src/views/login/components/login-form.vue diff --git a/front/src/views/login/login.less b/smart-admin-web/src/views/login/login.less similarity index 100% rename from front/src/views/login/login.less rename to smart-admin-web/src/views/login/login.less diff --git a/front/src/views/login/login.vue b/smart-admin-web/src/views/login/login.vue similarity index 100% rename from front/src/views/login/login.vue rename to smart-admin-web/src/views/login/login.vue diff --git a/front/src/views/monitor/online-user.vue b/smart-admin-web/src/views/monitor/online-user.vue similarity index 100% rename from front/src/views/monitor/online-user.vue rename to smart-admin-web/src/views/monitor/online-user.vue diff --git a/front/src/views/monitor/sql.vue b/smart-admin-web/src/views/monitor/sql.vue similarity index 100% rename from front/src/views/monitor/sql.vue rename to smart-admin-web/src/views/monitor/sql.vue diff --git a/front/src/views/notice/notice-list.vue b/smart-admin-web/src/views/notice/notice-list.vue similarity index 100% rename from front/src/views/notice/notice-list.vue rename to smart-admin-web/src/views/notice/notice-list.vue diff --git a/front/src/views/notice/person-notice.vue b/smart-admin-web/src/views/notice/person-notice.vue similarity index 100% rename from front/src/views/notice/person-notice.vue rename to smart-admin-web/src/views/notice/person-notice.vue diff --git a/front/src/views/reload/smart-reload/smart-reload-list.vue b/smart-admin-web/src/views/reload/smart-reload/smart-reload-list.vue similarity index 100% rename from front/src/views/reload/smart-reload/smart-reload-list.vue rename to smart-admin-web/src/views/reload/smart-reload/smart-reload-list.vue diff --git a/front/src/views/system-setting/system-config/system-config.vue b/smart-admin-web/src/views/system-setting/system-config/system-config.vue similarity index 100% rename from front/src/views/system-setting/system-config/system-config.vue rename to smart-admin-web/src/views/system-setting/system-config/system-config.vue diff --git a/front/src/views/system-setting/system-privilege/components/privilege-form.vue b/smart-admin-web/src/views/system-setting/system-privilege/components/privilege-form.vue similarity index 100% rename from front/src/views/system-setting/system-privilege/components/privilege-form.vue rename to smart-admin-web/src/views/system-setting/system-privilege/components/privilege-form.vue diff --git a/front/src/views/system-setting/system-privilege/system-privilege.vue b/smart-admin-web/src/views/system-setting/system-privilege/system-privilege.vue similarity index 99% rename from front/src/views/system-setting/system-privilege/system-privilege.vue rename to smart-admin-web/src/views/system-setting/system-privilege/system-privilege.vue index c6b33e4..0bffac0 100644 --- a/front/src/views/system-setting/system-privilege/system-privilege.vue +++ b/smart-admin-web/src/views/system-setting/system-privilege/system-privilege.vue @@ -241,7 +241,8 @@ export default { isChange = serverMenu.menuName !== menu.menuName || serverMenu.menuKey !== menu.menuKey || - serverMenu.parentKey !== menu.parentKey; + serverMenu.parentKey !== menu.parentKey|| + serverMenu.url !== menu.url; } else { isChange = true; } diff --git a/front/src/views/task/task-list.vue b/smart-admin-web/src/views/task/task-list.vue similarity index 100% rename from front/src/views/task/task-list.vue rename to smart-admin-web/src/views/task/task-list.vue diff --git a/front/src/views/user-log/user-login-log.vue b/smart-admin-web/src/views/user-log/user-login-log.vue similarity index 98% rename from front/src/views/user-log/user-login-log.vue rename to smart-admin-web/src/views/user-log/user-login-log.vue index f326625..bc9b092 100644 --- a/front/src/views/user-log/user-login-log.vue +++ b/smart-admin-web/src/views/user-log/user-login-log.vue @@ -84,6 +84,10 @@ export default { title: '操作系统', key: 'remoteOs' }, + { + title: 'Ip', + key: 'remoteIp' + }, { title: '用户端口', key: 'remotePort' diff --git a/front/src/views/user-log/user-operate-log.vue b/smart-admin-web/src/views/user-log/user-operate-log.vue similarity index 100% rename from front/src/views/user-log/user-operate-log.vue rename to smart-admin-web/src/views/user-log/user-operate-log.vue diff --git a/front/tests/e2e/.eslintrc b/smart-admin-web/tests/e2e/.eslintrc similarity index 100% rename from front/tests/e2e/.eslintrc rename to smart-admin-web/tests/e2e/.eslintrc diff --git a/front/tests/e2e/plugins/index.js b/smart-admin-web/tests/e2e/plugins/index.js similarity index 100% rename from front/tests/e2e/plugins/index.js rename to smart-admin-web/tests/e2e/plugins/index.js diff --git a/front/tests/e2e/specs/test.js b/smart-admin-web/tests/e2e/specs/test.js similarity index 100% rename from front/tests/e2e/specs/test.js rename to smart-admin-web/tests/e2e/specs/test.js diff --git a/front/tests/e2e/support/commands.js b/smart-admin-web/tests/e2e/support/commands.js similarity index 100% rename from front/tests/e2e/support/commands.js rename to smart-admin-web/tests/e2e/support/commands.js diff --git a/front/tests/e2e/support/index.js b/smart-admin-web/tests/e2e/support/index.js similarity index 100% rename from front/tests/e2e/support/index.js rename to smart-admin-web/tests/e2e/support/index.js diff --git a/front/tests/unit/.eslintrc.js b/smart-admin-web/tests/unit/.eslintrc.js similarity index 100% rename from front/tests/unit/.eslintrc.js rename to smart-admin-web/tests/unit/.eslintrc.js diff --git a/front/tests/unit/HelloWorld.spec.js b/smart-admin-web/tests/unit/HelloWorld.spec.js similarity index 100% rename from front/tests/unit/HelloWorld.spec.js rename to smart-admin-web/tests/unit/HelloWorld.spec.js diff --git a/front/vscode/settings.json b/smart-admin-web/vscode/settings.json similarity index 100% rename from front/vscode/settings.json rename to smart-admin-web/vscode/settings.json diff --git a/front/vue.config.js b/smart-admin-web/vue.config.js similarity index 100% rename from front/vue.config.js rename to smart-admin-web/vue.config.js