diff --git a/nladmin-common/pom.xml b/nladmin-common/pom.xml deleted file mode 100644 index 37871f1b2..000000000 --- a/nladmin-common/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - nladmin - org.nl - 2.6 - - 4.0.0 - - 5.7.14 - - - - - nladmin-common - 公共模块 - - - - - cn.hutool - hutool-all - ${hutool.version} - - - - - - - nexus - - nexus - http://121.40.234.130:8081/repository/maven-releases/ - - - - diff --git a/nladmin-common/src/main/java/org/nl/exception/WDKException.java b/nladmin-common/src/main/java/org/nl/exception/WDKException.java deleted file mode 100644 index 04b26373d..000000000 --- a/nladmin-common/src/main/java/org/nl/exception/WDKException.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.nl.exception; - -public class WDKException extends RuntimeException { - private static final long serialVersionUID = 9059634125483898385L; - private String code; - private String desc; - private String message = ""; - - public WDKException() { - } - - public WDKException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { - super(message, cause); - this.message = message; - } - - public WDKException(String message, Throwable cause) { - super(message, cause); - this.message = message; - } - - public WDKException(String message) { - super(message); - this.message = message; - } - - public WDKException(Throwable cause) { - super(cause); - } - - public String getCode() { - return this.code; - } - - public void setCode(String code) { - this.code = code; - } - - public String getDesc() { - return this.desc; - } - - public void setDesc(String desc) { - this.desc = desc; - } - - public String getMessage() { - return this.message; - } - - public void setMessage(String message) { - this.message = message; - } -} \ No newline at end of file diff --git a/nladmin-common/src/test/java/org/nl/utils/DateUtilsTest.java b/nladmin-common/src/test/java/org/nl/utils/DateUtilsTest.java deleted file mode 100644 index 0c8af3779..000000000 --- a/nladmin-common/src/test/java/org/nl/utils/DateUtilsTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.nl.utils; - -import org.junit.Test; - -import java.time.LocalDateTime; -import java.util.Date; - -public class DateUtilsTest { - @Test - public void test1() { - long l = System.currentTimeMillis() / 1000; - LocalDateTime localDateTime = DateUtil.fromTimeStamp(l); - System.out.printf(DateUtil.localDateTimeFormatyMdHms(localDateTime)); - } - - @Test - public void test2() { - LocalDateTime now = LocalDateTime.now(); - System.out.println(DateUtil.localDateTimeFormatyMdHms(now)); - Date date = DateUtil.toDate(now); - LocalDateTime localDateTime = DateUtil.toLocalDateTime(date); - System.out.println(DateUtil.localDateTimeFormatyMdHms(localDateTime)); - LocalDateTime localDateTime1 = DateUtil.fromTimeStamp(date.getTime() / 1000); - System.out.println(DateUtil.localDateTimeFormatyMdHms(localDateTime1)); - } -} diff --git a/nladmin-common/src/test/java/org/nl/utils/EncryptUtilsTest.java b/nladmin-common/src/test/java/org/nl/utils/EncryptUtilsTest.java deleted file mode 100644 index 3f32e113a..000000000 --- a/nladmin-common/src/test/java/org/nl/utils/EncryptUtilsTest.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.nl.utils; - -import org.junit.Assert; -import org.junit.Test; - -public class EncryptUtilsTest { - - /** - * 对称加密 - */ - @Test - public void testDesEncrypt() { - try { - Assert.assertEquals("7772841DC6099402", EncryptUtils.desEncrypt("123456")); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * 对称解密 - */ - @Test - public void testDesDecrypt() { - try { - Assert.assertEquals("123456", EncryptUtils.desDecrypt("7772841DC6099402")); - } catch (Exception e) { - e.printStackTrace(); - } - } -} diff --git a/nladmin-common/src/test/java/org/nl/utils/FileUtilTest.java b/nladmin-common/src/test/java/org/nl/utils/FileUtilTest.java deleted file mode 100644 index 2593c6c98..000000000 --- a/nladmin-common/src/test/java/org/nl/utils/FileUtilTest.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.nl.utils; - -import org.junit.Assert; -import org.junit.Test; -import org.springframework.mock.web.MockMultipartFile; - -import static org.junit.Assert.*; - -public class FileUtilTest { - - @Test - public void testToFile() { - long retval = FileUtil.toFile(new MockMultipartFile("foo", (byte[]) null)).getTotalSpace(); - assertEquals(500695072768L, retval); - } - - @Test - public void testGetExtensionName() { - Assert.assertEquals("foo", FileUtil.getExtensionName("foo")); - Assert.assertEquals("exe", FileUtil.getExtensionName("bar.exe")); - } - - @Test - public void testGetFileNameNoEx() { - Assert.assertEquals("foo", FileUtil.getFileNameNoEx("foo")); - Assert.assertEquals("bar", FileUtil.getFileNameNoEx("bar.txt")); - } - - @Test - public void testGetSize() { - Assert.assertEquals("1000B ", FileUtil.getSize(1000)); - Assert.assertEquals("1.00KB ", FileUtil.getSize(1024)); - Assert.assertEquals("1.00MB ", FileUtil.getSize(1048576)); - Assert.assertEquals("1.00GB ", FileUtil.getSize(1073741824)); - } -} diff --git a/nladmin-common/src/test/java/org/nl/utils/StringUtilsTest.java b/nladmin-common/src/test/java/org/nl/utils/StringUtilsTest.java deleted file mode 100644 index 15ccb06b9..000000000 --- a/nladmin-common/src/test/java/org/nl/utils/StringUtilsTest.java +++ /dev/null @@ -1,44 +0,0 @@ -/* -package org.nl.utils; - -import org.junit.Assert; -import org.junit.Test; -import org.springframework.mock.web.MockHttpServletRequest; - -import java.text.SimpleDateFormat; -import java.util.*; - -import static org.junit.Assert.*; - -public class StringUtilsTest { - - @Test - public void testToCamelCase() { - assertNull(StringUtils.toCamelCase(null)); - } - - @Test - public void testToCapitalizeCamelCase() { - assertNull(StringUtils.toCapitalizeCamelCase(null)); - Assert.assertEquals("HelloWorld", StringUtils.toCapitalizeCamelCase("hello_world")); - } - - @Test - public void testToUnderScoreCase() { - assertNull(StringUtils.toUnderScoreCase(null)); - Assert.assertEquals("hello_world", StringUtils.toUnderScoreCase("helloWorld")); - Assert.assertEquals("\u0000\u0000", StringUtils.toUnderScoreCase("\u0000\u0000")); - Assert.assertEquals("\u0000_a", StringUtils.toUnderScoreCase("\u0000A")); - } - - @Test - public void testGetWeekDay() { - SimpleDateFormat simpleDateformat = new SimpleDateFormat("E"); - Assert.assertEquals(simpleDateformat.format(new Date()), StringUtils.getWeekDay()); - } - - @Test - public void testGetIP() { - Assert.assertEquals("127.0.0.1", StringUtils.getIp(new MockHttpServletRequest())); - } -}*/ diff --git a/nladmin-generator/pom.xml b/nladmin-generator/pom.xml deleted file mode 100644 index be828edb4..000000000 --- a/nladmin-generator/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - nladmin - org.nl - 2.6 - - 4.0.0 - - nladmin-generator - 代码生成模块 - - - 1.9 - - - - - org.nl - nladmin-common - 2.6 - - - - - org.springframework.boot - spring-boot-starter-freemarker - - - - - commons-configuration - commons-configuration - ${configuration.version} - - - - - - - - nexus - - nexus - http://121.40.234.130:8081/repository/maven-releases/ - - - - diff --git a/nladmin-logging/pom.xml b/nladmin-logging/pom.xml deleted file mode 100644 index a54f1a668..000000000 --- a/nladmin-logging/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - nladmin - org.nl - 2.6 - - 4.0.0 - - nladmin-logging - 日志模块 - - - - org.nl - nladmin-common - 2.6 - - - \ No newline at end of file diff --git a/nladmin-system/pom.xml b/nladmin-system/pom.xml index 23c775483..b9b2c9943 100644 --- a/nladmin-system/pom.xml +++ b/nladmin-system/pom.xml @@ -16,10 +16,41 @@ 0.11.1 5.5.0 + 1.9 + + org.aspectj + aspectjweaver + 1.9.2 + + + + org.springframework.boot + spring-boot-starter-aop + + + + + com.google.guava + guava + 29.0-jre + + + + org.springframework.boot + spring-boot-starter-freemarker + + + + + commons-configuration + commons-configuration + ${configuration.version} + + com.alicp.jetcache jetcache-starter-redis @@ -38,28 +69,9 @@ 11.2.0.4 - - - org.nl - nladmin-generator - 2.6 - - - org.nl - nladmin-common - - - - - - org.nl - nladmin-tools - 2.6 - - org.springframework.boot @@ -109,6 +121,23 @@ + + + + + nexus + + nexus + http://121.40.234.130:8081/repository/maven-releases/ + + + + diff --git a/nladmin-system/src/main/java/org/nl/AppRun.java b/nladmin-system/src/main/java/org/nl/AppRun.java index 768ea50c4..e49a6ab24 100644 --- a/nladmin-system/src/main/java/org/nl/AppRun.java +++ b/nladmin-system/src/main/java/org/nl/AppRun.java @@ -3,8 +3,8 @@ package org.nl; import com.alicp.jetcache.anno.config.EnableCreateCacheAnnotation; import com.alicp.jetcache.anno.config.EnableMethodCache; import io.swagger.annotations.Api; -import org.nl.annotation.rest.AnonymousGetMapping; -import org.nl.utils.SpringContextHolder; +import org.nl.modules.common.annotation.rest.AnonymousGetMapping; +import org.nl.wql.util.SpringContextHolder; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; diff --git a/nladmin-system/src/main/java/org/nl/config/ConfigurerAdapter.java b/nladmin-system/src/main/java/org/nl/config/ConfigurerAdapter.java index f4915e9df..4cae4e880 100644 --- a/nladmin-system/src/main/java/org/nl/config/ConfigurerAdapter.java +++ b/nladmin-system/src/main/java/org/nl/config/ConfigurerAdapter.java @@ -15,6 +15,7 @@ */ package org.nl.config; +import org.nl.modules.common.config.FileProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.cors.CorsConfiguration; diff --git a/nladmin-system/src/main/java/org/nl/config/thread/ThreadPoolExecutorUtil.java b/nladmin-system/src/main/java/org/nl/config/thread/ThreadPoolExecutorUtil.java index bbd4735a0..81d494e82 100644 --- a/nladmin-system/src/main/java/org/nl/config/thread/ThreadPoolExecutorUtil.java +++ b/nladmin-system/src/main/java/org/nl/config/thread/ThreadPoolExecutorUtil.java @@ -15,7 +15,8 @@ */ package org.nl.config.thread; -import org.nl.utils.SpringContextHolder; + +import org.nl.wql.util.SpringContextHolder; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; diff --git a/nladmin-common/src/main/java/org/nl/annotation/AnonymousAccess.java b/nladmin-system/src/main/java/org/nl/modules/common/annotation/AnonymousAccess.java similarity index 100% rename from nladmin-common/src/main/java/org/nl/annotation/AnonymousAccess.java rename to nladmin-system/src/main/java/org/nl/modules/common/annotation/AnonymousAccess.java diff --git a/nladmin-common/src/main/java/org/nl/annotation/DataPermission.java b/nladmin-system/src/main/java/org/nl/modules/common/annotation/DataPermission.java similarity index 97% rename from nladmin-common/src/main/java/org/nl/annotation/DataPermission.java rename to nladmin-system/src/main/java/org/nl/modules/common/annotation/DataPermission.java index 1debdc2e5..922bf5e2d 100644 --- a/nladmin-common/src/main/java/org/nl/annotation/DataPermission.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/annotation/DataPermission.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.annotation; +package org.nl.modules.common.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/nladmin-common/src/main/java/org/nl/annotation/Limit.java b/nladmin-system/src/main/java/org/nl/modules/common/annotation/Limit.java similarity index 93% rename from nladmin-common/src/main/java/org/nl/annotation/Limit.java rename to nladmin-system/src/main/java/org/nl/modules/common/annotation/Limit.java index 9edc057e8..ae7e363d8 100644 --- a/nladmin-common/src/main/java/org/nl/annotation/Limit.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/annotation/Limit.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.annotation; +package org.nl.modules.common.annotation; -import org.nl.aspect.LimitType; +import org.nl.modules.common.aspect.LimitType; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/nladmin-common/src/main/java/org/nl/annotation/Query.java b/nladmin-system/src/main/java/org/nl/modules/common/annotation/Query.java similarity index 98% rename from nladmin-common/src/main/java/org/nl/annotation/Query.java rename to nladmin-system/src/main/java/org/nl/modules/common/annotation/Query.java index 81ba8b90c..9ff0ad1d2 100644 --- a/nladmin-common/src/main/java/org/nl/annotation/Query.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/annotation/Query.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.annotation; +package org.nl.modules.common.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/nladmin-common/src/main/java/org/nl/annotation/rest/AnonymousDeleteMapping.java b/nladmin-system/src/main/java/org/nl/modules/common/annotation/rest/AnonymousDeleteMapping.java similarity index 90% rename from nladmin-common/src/main/java/org/nl/annotation/rest/AnonymousDeleteMapping.java rename to nladmin-system/src/main/java/org/nl/modules/common/annotation/rest/AnonymousDeleteMapping.java index a1966dd64..dedeeb4d4 100644 --- a/nladmin-common/src/main/java/org/nl/annotation/rest/AnonymousDeleteMapping.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/annotation/rest/AnonymousDeleteMapping.java @@ -13,20 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package org.nl.annotation.rest; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +package org.nl.modules.common.annotation.rest; import org.nl.annotation.AnonymousAccess; import org.springframework.core.annotation.AliasFor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import java.lang.annotation.*; + /** * Annotation for mapping HTTP {@code DELETE} requests onto specific handler * methods. diff --git a/nladmin-common/src/main/java/org/nl/annotation/rest/AnonymousGetMapping.java b/nladmin-system/src/main/java/org/nl/modules/common/annotation/rest/AnonymousGetMapping.java similarity index 90% rename from nladmin-common/src/main/java/org/nl/annotation/rest/AnonymousGetMapping.java rename to nladmin-system/src/main/java/org/nl/modules/common/annotation/rest/AnonymousGetMapping.java index e84c23c77..0588a58e0 100644 --- a/nladmin-common/src/main/java/org/nl/annotation/rest/AnonymousGetMapping.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/annotation/rest/AnonymousGetMapping.java @@ -14,19 +14,15 @@ * limitations under the License. */ -package org.nl.annotation.rest; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +package org.nl.modules.common.annotation.rest; import org.nl.annotation.AnonymousAccess; import org.springframework.core.annotation.AliasFor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import java.lang.annotation.*; + /** * Annotation for mapping HTTP {@code GET} requests onto specific handler * methods. diff --git a/nladmin-common/src/main/java/org/nl/annotation/rest/AnonymousPatchMapping.java b/nladmin-system/src/main/java/org/nl/modules/common/annotation/rest/AnonymousPatchMapping.java similarity index 91% rename from nladmin-common/src/main/java/org/nl/annotation/rest/AnonymousPatchMapping.java rename to nladmin-system/src/main/java/org/nl/modules/common/annotation/rest/AnonymousPatchMapping.java index e6b34f921..515ddd1ed 100644 --- a/nladmin-common/src/main/java/org/nl/annotation/rest/AnonymousPatchMapping.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/annotation/rest/AnonymousPatchMapping.java @@ -14,19 +14,15 @@ * limitations under the License. */ -package org.nl.annotation.rest; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +package org.nl.modules.common.annotation.rest; import org.nl.annotation.AnonymousAccess; import org.springframework.core.annotation.AliasFor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import java.lang.annotation.*; + /** * Annotation for mapping HTTP {@code PATCH} requests onto specific handler * methods. diff --git a/nladmin-common/src/main/java/org/nl/annotation/rest/AnonymousPostMapping.java b/nladmin-system/src/main/java/org/nl/modules/common/annotation/rest/AnonymousPostMapping.java similarity index 90% rename from nladmin-common/src/main/java/org/nl/annotation/rest/AnonymousPostMapping.java rename to nladmin-system/src/main/java/org/nl/modules/common/annotation/rest/AnonymousPostMapping.java index dd4cdfd70..326e9b17c 100644 --- a/nladmin-common/src/main/java/org/nl/annotation/rest/AnonymousPostMapping.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/annotation/rest/AnonymousPostMapping.java @@ -14,19 +14,15 @@ * limitations under the License. */ -package org.nl.annotation.rest; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +package org.nl.modules.common.annotation.rest; import org.nl.annotation.AnonymousAccess; import org.springframework.core.annotation.AliasFor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import java.lang.annotation.*; + /** * Annotation for mapping HTTP {@code POST} requests onto specific handler * methods. diff --git a/nladmin-common/src/main/java/org/nl/annotation/rest/AnonymousPutMapping.java b/nladmin-system/src/main/java/org/nl/modules/common/annotation/rest/AnonymousPutMapping.java similarity index 90% rename from nladmin-common/src/main/java/org/nl/annotation/rest/AnonymousPutMapping.java rename to nladmin-system/src/main/java/org/nl/modules/common/annotation/rest/AnonymousPutMapping.java index 8b28bce23..bef341b20 100644 --- a/nladmin-common/src/main/java/org/nl/annotation/rest/AnonymousPutMapping.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/annotation/rest/AnonymousPutMapping.java @@ -14,19 +14,15 @@ * limitations under the License. */ -package org.nl.annotation.rest; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +package org.nl.modules.common.annotation.rest; import org.nl.annotation.AnonymousAccess; import org.springframework.core.annotation.AliasFor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import java.lang.annotation.*; + /** * Annotation for mapping HTTP {@code PUT} requests onto specific handler * methods. diff --git a/nladmin-common/src/main/java/org/nl/aspect/LimitAspect.java b/nladmin-system/src/main/java/org/nl/modules/common/aspect/LimitAspect.java similarity index 91% rename from nladmin-common/src/main/java/org/nl/aspect/LimitAspect.java rename to nladmin-system/src/main/java/org/nl/modules/common/aspect/LimitAspect.java index db0defa86..7a8118fdb 100644 --- a/nladmin-common/src/main/java/org/nl/aspect/LimitAspect.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/aspect/LimitAspect.java @@ -13,26 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.aspect; +package org.nl.modules.common.aspect; import cn.hutool.core.util.StrUtil; import com.google.common.collect.ImmutableList; import lombok.extern.slf4j.Slf4j; -import org.nl.annotation.Limit; -import org.nl.exception.BadRequestException; -import org.nl.utils.RequestHolder; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; -import org.nl.utils.StringUtils; +import org.nl.modules.common.annotation.Limit; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.RequestHolder; +import org.nl.modules.common.utils.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.script.DefaultRedisScript; import org.springframework.data.redis.core.script.RedisScript; import org.springframework.stereotype.Component; + import javax.servlet.http.HttpServletRequest; import java.lang.reflect.Method; @@ -51,7 +52,7 @@ public class LimitAspect { this.redisTemplate = redisTemplate; } - @Pointcut("@annotation(org.nl.annotation.Limit)") + @Pointcut("@annotation(org.nl.modules.common.annotation.Limit)") public void pointcut() { } @@ -100,3 +101,4 @@ public class LimitAspect { "\nreturn c;"; } } + diff --git a/nladmin-common/src/main/java/org/nl/aspect/LimitType.java b/nladmin-system/src/main/java/org/nl/modules/common/aspect/LimitType.java similarity index 95% rename from nladmin-common/src/main/java/org/nl/aspect/LimitType.java rename to nladmin-system/src/main/java/org/nl/modules/common/aspect/LimitType.java index 39965ed20..12ca6e0d9 100644 --- a/nladmin-common/src/main/java/org/nl/aspect/LimitType.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/aspect/LimitType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.aspect; +package org.nl.modules.common.aspect; /** * 限流枚举 diff --git a/nladmin-common/src/main/java/org/nl/base/BaseDTO.java b/nladmin-system/src/main/java/org/nl/modules/common/base/BaseDTO.java similarity index 96% rename from nladmin-common/src/main/java/org/nl/base/BaseDTO.java rename to nladmin-system/src/main/java/org/nl/modules/common/base/BaseDTO.java index fb1ee876c..ccb2a517b 100644 --- a/nladmin-common/src/main/java/org/nl/base/BaseDTO.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/base/BaseDTO.java @@ -1,8 +1,9 @@ -package org.nl.base; +package org.nl.modules.common.base; import lombok.Getter; import lombok.Setter; import org.apache.commons.lang3.builder.ToStringBuilder; + import java.io.Serializable; import java.lang.reflect.Field; import java.sql.Timestamp; diff --git a/nladmin-common/src/main/java/org/nl/base/BaseEntity.java b/nladmin-system/src/main/java/org/nl/modules/common/base/BaseEntity.java similarity index 95% rename from nladmin-common/src/main/java/org/nl/base/BaseEntity.java rename to nladmin-system/src/main/java/org/nl/modules/common/base/BaseEntity.java index 61a191464..582cb1a21 100644 --- a/nladmin-common/src/main/java/org/nl/base/BaseEntity.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/base/BaseEntity.java @@ -13,22 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.base; +package org.nl.modules.common.base; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; -import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; import org.springframework.data.annotation.CreatedBy; import org.springframework.data.annotation.LastModifiedBy; import org.springframework.data.jpa.domain.support.AuditingEntityListener; + import javax.persistence.Column; import javax.persistence.EntityListeners; import javax.persistence.MappedSuperclass; import java.io.Serializable; -import java.lang.reflect.Field; import java.sql.Timestamp; /** diff --git a/nladmin-common/src/main/java/org/nl/base/BaseMapper.java b/nladmin-system/src/main/java/org/nl/modules/common/base/BaseMapper.java similarity index 97% rename from nladmin-common/src/main/java/org/nl/base/BaseMapper.java rename to nladmin-system/src/main/java/org/nl/modules/common/base/BaseMapper.java index 0c7b1c181..95345ba98 100644 --- a/nladmin-common/src/main/java/org/nl/base/BaseMapper.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/base/BaseMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.base; +package org.nl.modules.common.base; import java.util.List; diff --git a/nladmin-common/src/main/java/org/nl/config/AuditorConfig.java b/nladmin-system/src/main/java/org/nl/modules/common/config/AuditorConfig.java similarity index 97% rename from nladmin-common/src/main/java/org/nl/config/AuditorConfig.java rename to nladmin-system/src/main/java/org/nl/modules/common/config/AuditorConfig.java index 7ce0e4a7f..e9d4558ae 100644 --- a/nladmin-common/src/main/java/org/nl/config/AuditorConfig.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/config/AuditorConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.config; +package org.nl.modules.common.config; import org.springframework.data.domain.AuditorAware; import org.springframework.stereotype.Component; diff --git a/nladmin-common/src/main/java/org/nl/config/ElAdminProperties.java b/nladmin-system/src/main/java/org/nl/modules/common/config/ElAdminProperties.java similarity index 96% rename from nladmin-common/src/main/java/org/nl/config/ElAdminProperties.java rename to nladmin-system/src/main/java/org/nl/modules/common/config/ElAdminProperties.java index b407c2450..546b0743c 100644 --- a/nladmin-common/src/main/java/org/nl/config/ElAdminProperties.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/config/ElAdminProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.config; +package org.nl.modules.common.config; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/nladmin-common/src/main/java/org/nl/config/ElPermissionConfig.java b/nladmin-system/src/main/java/org/nl/modules/common/config/ElPermissionConfig.java similarity index 96% rename from nladmin-common/src/main/java/org/nl/config/ElPermissionConfig.java rename to nladmin-system/src/main/java/org/nl/modules/common/config/ElPermissionConfig.java index 4abc37f28..328630ff2 100644 --- a/nladmin-common/src/main/java/org/nl/config/ElPermissionConfig.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/config/ElPermissionConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.config; +package org.nl.modules.common.config; import org.springframework.stereotype.Service; diff --git a/nladmin-common/src/main/java/org/nl/config/FileProperties.java b/nladmin-system/src/main/java/org/nl/modules/common/config/FileProperties.java similarity index 94% rename from nladmin-common/src/main/java/org/nl/config/FileProperties.java rename to nladmin-system/src/main/java/org/nl/modules/common/config/FileProperties.java index aa508f947..1d8cfdbe3 100644 --- a/nladmin-common/src/main/java/org/nl/config/FileProperties.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/config/FileProperties.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.config; +package org.nl.modules.common.config; import lombok.Data; -import org.nl.utils.ElAdminConstant; +import org.nl.modules.common.utils.ElAdminConstant; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/nladmin-common/src/main/java/org/nl/config/RedisConfig.java b/nladmin-system/src/main/java/org/nl/modules/common/config/RedisConfig.java similarity index 99% rename from nladmin-common/src/main/java/org/nl/config/RedisConfig.java rename to nladmin-system/src/main/java/org/nl/modules/common/config/RedisConfig.java index f410e855b..cf09c5505 100644 --- a/nladmin-common/src/main/java/org/nl/config/RedisConfig.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/config/RedisConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.config; +package org.nl.modules.common.config; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; @@ -39,6 +39,7 @@ import org.springframework.data.redis.core.RedisOperations; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.serializer.RedisSerializationContext; import org.springframework.data.redis.serializer.RedisSerializer; + import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.time.Duration; diff --git a/nladmin-common/src/main/java/org/nl/config/RsaProperties.java b/nladmin-system/src/main/java/org/nl/modules/common/config/RsaProperties.java similarity index 96% rename from nladmin-common/src/main/java/org/nl/config/RsaProperties.java rename to nladmin-system/src/main/java/org/nl/modules/common/config/RsaProperties.java index 49cb9b552..bdffaf8d6 100644 --- a/nladmin-common/src/main/java/org/nl/config/RsaProperties.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/config/RsaProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.config; +package org.nl.modules.common.config; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/nladmin-common/src/main/java/org/nl/config/SwaggerConfig.java b/nladmin-system/src/main/java/org/nl/modules/common/config/SwaggerConfig.java similarity index 99% rename from nladmin-common/src/main/java/org/nl/config/SwaggerConfig.java rename to nladmin-system/src/main/java/org/nl/modules/common/config/SwaggerConfig.java index ed06d77d0..0085cb03f 100644 --- a/nladmin-common/src/main/java/org/nl/config/SwaggerConfig.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/config/SwaggerConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.config; +package org.nl.modules.common.config; import com.fasterxml.classmate.TypeResolver; import io.swagger.annotations.ApiModel; diff --git a/nladmin-common/src/main/java/org/nl/exception/BadConfigurationException.java b/nladmin-system/src/main/java/org/nl/modules/common/exception/BadConfigurationException.java similarity index 98% rename from nladmin-common/src/main/java/org/nl/exception/BadConfigurationException.java rename to nladmin-system/src/main/java/org/nl/modules/common/exception/BadConfigurationException.java index 770def0b2..ab0bf9498 100644 --- a/nladmin-common/src/main/java/org/nl/exception/BadConfigurationException.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/exception/BadConfigurationException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.exception; +package org.nl.modules.common.exception; /** * 统一关于错误配置信息 异常 diff --git a/nladmin-common/src/main/java/org/nl/exception/BadRequestException.java b/nladmin-system/src/main/java/org/nl/modules/common/exception/BadRequestException.java similarity index 96% rename from nladmin-common/src/main/java/org/nl/exception/BadRequestException.java rename to nladmin-system/src/main/java/org/nl/modules/common/exception/BadRequestException.java index 3bb0960ba..d5e771177 100644 --- a/nladmin-common/src/main/java/org/nl/exception/BadRequestException.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/exception/BadRequestException.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.exception; +package org.nl.modules.common.exception; import lombok.Getter; import org.springframework.http.HttpStatus; + import static org.springframework.http.HttpStatus.BAD_REQUEST; /** diff --git a/nladmin-common/src/main/java/org/nl/exception/EntityExistException.java b/nladmin-system/src/main/java/org/nl/modules/common/exception/EntityExistException.java similarity index 96% rename from nladmin-common/src/main/java/org/nl/exception/EntityExistException.java rename to nladmin-system/src/main/java/org/nl/modules/common/exception/EntityExistException.java index 5a52884a6..dbf2fb6a4 100644 --- a/nladmin-common/src/main/java/org/nl/exception/EntityExistException.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/exception/EntityExistException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.exception; +package org.nl.modules.common.exception; import org.springframework.util.StringUtils; diff --git a/nladmin-common/src/main/java/org/nl/exception/EntityNotFoundException.java b/nladmin-system/src/main/java/org/nl/modules/common/exception/EntityNotFoundException.java similarity index 96% rename from nladmin-common/src/main/java/org/nl/exception/EntityNotFoundException.java rename to nladmin-system/src/main/java/org/nl/modules/common/exception/EntityNotFoundException.java index 4deb88a0c..19034e6f1 100644 --- a/nladmin-common/src/main/java/org/nl/exception/EntityNotFoundException.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/exception/EntityNotFoundException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.exception; +package org.nl.modules.common.exception; import org.springframework.util.StringUtils; diff --git a/nladmin-common/src/main/java/org/nl/exception/handler/ApiError.java b/nladmin-system/src/main/java/org/nl/modules/common/exception/handler/ApiError.java similarity index 96% rename from nladmin-common/src/main/java/org/nl/exception/handler/ApiError.java rename to nladmin-system/src/main/java/org/nl/modules/common/exception/handler/ApiError.java index 85e50ca81..24bc6db0e 100644 --- a/nladmin-common/src/main/java/org/nl/exception/handler/ApiError.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/exception/handler/ApiError.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.exception.handler; +package org.nl.modules.common.exception.handler; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; + import java.time.LocalDateTime; /** diff --git a/nladmin-common/src/main/java/org/nl/exception/handler/GlobalExceptionHandler.java b/nladmin-system/src/main/java/org/nl/modules/common/exception/handler/GlobalExceptionHandler.java similarity index 93% rename from nladmin-common/src/main/java/org/nl/exception/handler/GlobalExceptionHandler.java rename to nladmin-system/src/main/java/org/nl/modules/common/exception/handler/GlobalExceptionHandler.java index dd8bc3e6e..3528d9477 100644 --- a/nladmin-common/src/main/java/org/nl/exception/handler/GlobalExceptionHandler.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/exception/handler/GlobalExceptionHandler.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.exception.handler; +package org.nl.modules.common.exception.handler; import cn.dev33.satoken.exception.NotLoginException; import lombok.extern.slf4j.Slf4j; -import org.nl.exception.BadRequestException; -import org.nl.exception.EntityExistException; -import org.nl.exception.EntityNotFoundException; -import org.nl.utils.ThrowableUtil; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.exception.EntityExistException; +import org.nl.modules.common.exception.EntityNotFoundException; +import org.nl.modules.common.utils.ThrowableUtil; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.MethodArgumentNotValidException; diff --git a/nladmin-common/src/main/java/org/nl/utils/CacheKey.java b/nladmin-system/src/main/java/org/nl/modules/common/utils/CacheKey.java similarity index 97% rename from nladmin-common/src/main/java/org/nl/utils/CacheKey.java rename to nladmin-system/src/main/java/org/nl/modules/common/utils/CacheKey.java index 212d4ee96..abbb456f0 100644 --- a/nladmin-common/src/main/java/org/nl/utils/CacheKey.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/utils/CacheKey.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.utils; +package org.nl.modules.common.utils; /** * @author: liaojinlong diff --git a/nladmin-common/src/main/java/org/nl/utils/DateUtil.java b/nladmin-system/src/main/java/org/nl/modules/common/utils/DateUtil.java similarity index 99% rename from nladmin-common/src/main/java/org/nl/utils/DateUtil.java rename to nladmin-system/src/main/java/org/nl/modules/common/utils/DateUtil.java index 3ae7f2279..2edc7107b 100644 --- a/nladmin-common/src/main/java/org/nl/utils/DateUtil.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/utils/DateUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.nl.utils; +package org.nl.modules.common.utils; import java.time.*; import java.time.format.DateTimeFormatter; diff --git a/nladmin-common/src/main/java/org/nl/utils/ElAdminConstant.java b/nladmin-system/src/main/java/org/nl/modules/common/utils/ElAdminConstant.java similarity index 96% rename from nladmin-common/src/main/java/org/nl/utils/ElAdminConstant.java rename to nladmin-system/src/main/java/org/nl/modules/common/utils/ElAdminConstant.java index 69637f3e5..de4970ed8 100644 --- a/nladmin-common/src/main/java/org/nl/utils/ElAdminConstant.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/utils/ElAdminConstant.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.utils; +package org.nl.modules.common.utils; /** * 常用静态常量 diff --git a/nladmin-common/src/main/java/org/nl/utils/EncryptUtils.java b/nladmin-system/src/main/java/org/nl/modules/common/utils/EncryptUtils.java similarity index 98% rename from nladmin-common/src/main/java/org/nl/utils/EncryptUtils.java rename to nladmin-system/src/main/java/org/nl/modules/common/utils/EncryptUtils.java index 0187e6fe9..b4df59c04 100644 --- a/nladmin-common/src/main/java/org/nl/utils/EncryptUtils.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/utils/EncryptUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.utils; +package org.nl.modules.common.utils; import javax.crypto.Cipher; import javax.crypto.SecretKey; diff --git a/nladmin-common/src/main/java/org/nl/utils/FileUtil.java b/nladmin-system/src/main/java/org/nl/modules/common/utils/FileUtil.java similarity index 99% rename from nladmin-common/src/main/java/org/nl/utils/FileUtil.java rename to nladmin-system/src/main/java/org/nl/modules/common/utils/FileUtil.java index 4235c536c..f2cc72f80 100644 --- a/nladmin-common/src/main/java/org/nl/utils/FileUtil.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/utils/FileUtil.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.utils; +package org.nl.modules.common.utils; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.poi.excel.BigExcelWriter; import cn.hutool.poi.excel.ExcelUtil; -import org.nl.exception.BadRequestException; import org.apache.poi.util.IOUtils; import org.apache.poi.xssf.streaming.SXSSFSheet; +import org.nl.modules.common.exception.BadRequestException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.multipart.MultipartFile; diff --git a/nladmin-common/src/main/java/org/nl/utils/PageUtil.java b/nladmin-system/src/main/java/org/nl/modules/common/utils/PageUtil.java similarity index 92% rename from nladmin-common/src/main/java/org/nl/utils/PageUtil.java rename to nladmin-system/src/main/java/org/nl/modules/common/utils/PageUtil.java index 2b82f3d5c..4b5973b65 100644 --- a/nladmin-common/src/main/java/org/nl/utils/PageUtil.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/utils/PageUtil.java @@ -13,10 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.utils; +package org.nl.modules.common.utils; import org.springframework.data.domain.Page; -import java.util.*; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; /** * 分页工具 diff --git a/nladmin-common/src/main/java/org/nl/utils/QueryHelp.java b/nladmin-system/src/main/java/org/nl/modules/common/utils/QueryHelp.java similarity index 97% rename from nladmin-common/src/main/java/org/nl/utils/QueryHelp.java rename to nladmin-system/src/main/java/org/nl/modules/common/utils/QueryHelp.java index 73e4c50bc..340304841 100644 --- a/nladmin-common/src/main/java/org/nl/utils/QueryHelp.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/utils/QueryHelp.java @@ -13,18 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.utils; +package org.nl.modules.common.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; -import org.nl.annotation.DataPermission; -import org.nl.annotation.Query; +import org.nl.modules.common.annotation.DataPermission; +import org.nl.modules.common.annotation.Query; + import javax.persistence.criteria.*; import java.lang.reflect.Field; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; /** * @author Zheng Jie diff --git a/nladmin-common/src/main/java/org/nl/utils/RedisUtils.java b/nladmin-system/src/main/java/org/nl/modules/common/utils/RedisUtils.java similarity index 98% rename from nladmin-common/src/main/java/org/nl/utils/RedisUtils.java rename to nladmin-system/src/main/java/org/nl/modules/common/utils/RedisUtils.java index 4ea649cb3..6dbd667f5 100644 --- a/nladmin-common/src/main/java/org/nl/utils/RedisUtils.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/utils/RedisUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.utils; +package org.nl.modules.common.utils; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -22,7 +22,10 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.core.*; +import org.springframework.data.redis.core.Cursor; +import org.springframework.data.redis.core.RedisConnectionUtils; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.ScanOptions; import org.springframework.stereotype.Component; import java.util.*; diff --git a/nladmin-common/src/main/java/org/nl/utils/RequestHolder.java b/nladmin-system/src/main/java/org/nl/modules/common/utils/RequestHolder.java similarity index 96% rename from nladmin-common/src/main/java/org/nl/utils/RequestHolder.java rename to nladmin-system/src/main/java/org/nl/modules/common/utils/RequestHolder.java index fbb6f91d4..119625886 100644 --- a/nladmin-common/src/main/java/org/nl/utils/RequestHolder.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/utils/RequestHolder.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.utils; +package org.nl.modules.common.utils; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; + import javax.servlet.http.HttpServletRequest; import java.util.Objects; diff --git a/nladmin-common/src/main/java/org/nl/utils/RsaUtils.java b/nladmin-system/src/main/java/org/nl/modules/common/utils/RsaUtils.java similarity index 99% rename from nladmin-common/src/main/java/org/nl/utils/RsaUtils.java rename to nladmin-system/src/main/java/org/nl/modules/common/utils/RsaUtils.java index 5bf95bb4a..b1d5f1e7f 100644 --- a/nladmin-common/src/main/java/org/nl/utils/RsaUtils.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/utils/RsaUtils.java @@ -1,6 +1,7 @@ -package org.nl.utils; +package org.nl.modules.common.utils; import org.apache.commons.codec.binary.Base64; + import javax.crypto.Cipher; import java.security.*; import java.security.interfaces.RSAPrivateKey; diff --git a/nladmin-common/src/main/java/org/nl/utils/SecurityUtils.java b/nladmin-system/src/main/java/org/nl/modules/common/utils/SecurityUtils.java similarity index 95% rename from nladmin-common/src/main/java/org/nl/utils/SecurityUtils.java rename to nladmin-system/src/main/java/org/nl/modules/common/utils/SecurityUtils.java index 5d0a9d318..ec8718c3a 100644 --- a/nladmin-common/src/main/java/org/nl/utils/SecurityUtils.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/utils/SecurityUtils.java @@ -1,8 +1,8 @@ -package org.nl.utils; +package org.nl.modules.common.utils; import cn.dev33.satoken.stp.StpUtil; import lombok.extern.slf4j.Slf4j; -import org.nl.utils.dto.CurrentUser; +import org.nl.modules.common.utils.dto.CurrentUser; import java.util.List; diff --git a/nladmin-common/src/main/java/org/nl/utils/StringUtils.java b/nladmin-system/src/main/java/org/nl/modules/common/utils/StringUtils.java similarity index 98% rename from nladmin-common/src/main/java/org/nl/utils/StringUtils.java rename to nladmin-system/src/main/java/org/nl/modules/common/utils/StringUtils.java index f48f59473..dd86ed652 100644 --- a/nladmin-common/src/main/java/org/nl/utils/StringUtils.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/utils/StringUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.utils; +package org.nl.modules.common.utils; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONObject; @@ -23,7 +23,8 @@ import net.dreamlu.mica.ip2region.core.Ip2regionSearcher; import net.dreamlu.mica.ip2region.core.IpInfo; import nl.basjes.parse.useragent.UserAgent; import nl.basjes.parse.useragent.UserAgentAnalyzer; -import org.nl.config.ElAdminProperties; +import org.nl.modules.common.config.ElAdminProperties; +import org.nl.wql.util.SpringContextHolder; import javax.servlet.http.HttpServletRequest; import java.net.InetAddress; diff --git a/nladmin-common/src/main/java/org/nl/utils/ThrowableUtil.java b/nladmin-system/src/main/java/org/nl/modules/common/utils/ThrowableUtil.java similarity index 96% rename from nladmin-common/src/main/java/org/nl/utils/ThrowableUtil.java rename to nladmin-system/src/main/java/org/nl/modules/common/utils/ThrowableUtil.java index 2af338110..a20693844 100644 --- a/nladmin-common/src/main/java/org/nl/utils/ThrowableUtil.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/utils/ThrowableUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.utils; +package org.nl.modules.common.utils; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/nladmin-common/src/main/java/org/nl/utils/TranslatorUtil.java b/nladmin-system/src/main/java/org/nl/modules/common/utils/TranslatorUtil.java similarity index 98% rename from nladmin-common/src/main/java/org/nl/utils/TranslatorUtil.java rename to nladmin-system/src/main/java/org/nl/modules/common/utils/TranslatorUtil.java index bc366e796..e86f08137 100644 --- a/nladmin-common/src/main/java/org/nl/utils/TranslatorUtil.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/utils/TranslatorUtil.java @@ -13,9 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.utils; +package org.nl.modules.common.utils; import cn.hutool.json.JSONArray; + import java.io.BufferedReader; import java.io.InputStreamReader; import java.net.HttpURLConnection; diff --git a/nladmin-common/src/main/java/org/nl/utils/ValidationUtil.java b/nladmin-system/src/main/java/org/nl/modules/common/utils/ValidationUtil.java similarity index 92% rename from nladmin-common/src/main/java/org/nl/utils/ValidationUtil.java rename to nladmin-system/src/main/java/org/nl/modules/common/utils/ValidationUtil.java index 9e1280203..4b0ae57dc 100644 --- a/nladmin-common/src/main/java/org/nl/utils/ValidationUtil.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/utils/ValidationUtil.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.utils; +package org.nl.modules.common.utils; import cn.hutool.core.util.ObjectUtil; -import org.nl.exception.BadRequestException; import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator; +import org.nl.modules.common.exception.BadRequestException; /** * 验证工具 diff --git a/nladmin-common/src/main/java/org/nl/utils/dto/CurrentUser.java b/nladmin-system/src/main/java/org/nl/modules/common/utils/dto/CurrentUser.java similarity index 93% rename from nladmin-common/src/main/java/org/nl/utils/dto/CurrentUser.java rename to nladmin-system/src/main/java/org/nl/modules/common/utils/dto/CurrentUser.java index 3827800ff..a0f36d2ab 100644 --- a/nladmin-common/src/main/java/org/nl/utils/dto/CurrentUser.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/utils/dto/CurrentUser.java @@ -1,4 +1,4 @@ -package org.nl.utils.dto; +package org.nl.modules.common.utils.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/nladmin-common/src/main/java/org/nl/utils/enums/CodeBiEnum.java b/nladmin-system/src/main/java/org/nl/modules/common/utils/enums/CodeBiEnum.java similarity index 96% rename from nladmin-common/src/main/java/org/nl/utils/enums/CodeBiEnum.java rename to nladmin-system/src/main/java/org/nl/modules/common/utils/enums/CodeBiEnum.java index e3fb7ee27..5b735d8bb 100644 --- a/nladmin-common/src/main/java/org/nl/utils/enums/CodeBiEnum.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/utils/enums/CodeBiEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.utils.enums; +package org.nl.modules.common.utils.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/nladmin-common/src/main/java/org/nl/utils/enums/CodeEnum.java b/nladmin-system/src/main/java/org/nl/modules/common/utils/enums/CodeEnum.java similarity index 97% rename from nladmin-common/src/main/java/org/nl/utils/enums/CodeEnum.java rename to nladmin-system/src/main/java/org/nl/modules/common/utils/enums/CodeEnum.java index 9e20b664d..2a56bb019 100644 --- a/nladmin-common/src/main/java/org/nl/utils/enums/CodeEnum.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/utils/enums/CodeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.utils.enums; +package org.nl.modules.common.utils.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/nladmin-common/src/main/java/org/nl/utils/enums/DataScopeEnum.java b/nladmin-system/src/main/java/org/nl/modules/common/utils/enums/DataScopeEnum.java similarity index 97% rename from nladmin-common/src/main/java/org/nl/utils/enums/DataScopeEnum.java rename to nladmin-system/src/main/java/org/nl/modules/common/utils/enums/DataScopeEnum.java index a4249aeb0..eed5830b3 100644 --- a/nladmin-common/src/main/java/org/nl/utils/enums/DataScopeEnum.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/utils/enums/DataScopeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.utils.enums; +package org.nl.modules.common.utils.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/nladmin-common/src/main/java/org/nl/utils/enums/RequestMethodEnum.java b/nladmin-system/src/main/java/org/nl/modules/common/utils/enums/RequestMethodEnum.java similarity index 97% rename from nladmin-common/src/main/java/org/nl/utils/enums/RequestMethodEnum.java rename to nladmin-system/src/main/java/org/nl/modules/common/utils/enums/RequestMethodEnum.java index e2caf134e..dff3cb95e 100644 --- a/nladmin-common/src/main/java/org/nl/utils/enums/RequestMethodEnum.java +++ b/nladmin-system/src/main/java/org/nl/modules/common/utils/enums/RequestMethodEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.utils.enums; +package org.nl.modules.common.utils.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/nladmin-generator/src/main/java/org/nl/domain/ColumnInfo.java b/nladmin-system/src/main/java/org/nl/modules/generator/domain/ColumnInfo.java similarity index 96% rename from nladmin-generator/src/main/java/org/nl/domain/ColumnInfo.java rename to nladmin-system/src/main/java/org/nl/modules/generator/domain/ColumnInfo.java index c5a025181..cc23dd560 100644 --- a/nladmin-generator/src/main/java/org/nl/domain/ColumnInfo.java +++ b/nladmin-system/src/main/java/org/nl/modules/generator/domain/ColumnInfo.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.domain; +package org.nl.modules.generator.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.nl.utils.GenUtil; +import org.nl.modules.generator.utils.GenUtil; import javax.persistence.*; import java.io.Serializable; diff --git a/nladmin-generator/src/main/java/org/nl/domain/GenConfig.java b/nladmin-system/src/main/java/org/nl/modules/generator/domain/GenConfig.java similarity index 97% rename from nladmin-generator/src/main/java/org/nl/domain/GenConfig.java rename to nladmin-system/src/main/java/org/nl/modules/generator/domain/GenConfig.java index fc278b309..454b1e93f 100644 --- a/nladmin-generator/src/main/java/org/nl/domain/GenConfig.java +++ b/nladmin-system/src/main/java/org/nl/modules/generator/domain/GenConfig.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.domain; +package org.nl.modules.generator.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; + import javax.persistence.*; import javax.validation.constraints.NotBlank; import java.io.Serializable; diff --git a/nladmin-generator/src/main/java/org/nl/domain/vo/TableInfo.java b/nladmin-system/src/main/java/org/nl/modules/generator/domain/vo/TableInfo.java similarity index 96% rename from nladmin-generator/src/main/java/org/nl/domain/vo/TableInfo.java rename to nladmin-system/src/main/java/org/nl/modules/generator/domain/vo/TableInfo.java index d482a88d4..ddf3388cd 100644 --- a/nladmin-generator/src/main/java/org/nl/domain/vo/TableInfo.java +++ b/nladmin-system/src/main/java/org/nl/modules/generator/domain/vo/TableInfo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.domain.vo; +package org.nl.modules.generator.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/nladmin-generator/src/main/java/org/nl/repository/ColumnInfoRepository.java b/nladmin-system/src/main/java/org/nl/modules/generator/repository/ColumnInfoRepository.java similarity index 91% rename from nladmin-generator/src/main/java/org/nl/repository/ColumnInfoRepository.java rename to nladmin-system/src/main/java/org/nl/modules/generator/repository/ColumnInfoRepository.java index 53272414a..8af5fbb07 100644 --- a/nladmin-generator/src/main/java/org/nl/repository/ColumnInfoRepository.java +++ b/nladmin-system/src/main/java/org/nl/modules/generator/repository/ColumnInfoRepository.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.repository; +package org.nl.modules.generator.repository; -import org.nl.domain.ColumnInfo; +import org.nl.modules.generator.domain.ColumnInfo; import org.springframework.data.jpa.repository.JpaRepository; + import java.util.List; /** diff --git a/nladmin-generator/src/main/java/org/nl/repository/GenConfigRepository.java b/nladmin-system/src/main/java/org/nl/modules/generator/repository/GenConfigRepository.java similarity index 90% rename from nladmin-generator/src/main/java/org/nl/repository/GenConfigRepository.java rename to nladmin-system/src/main/java/org/nl/modules/generator/repository/GenConfigRepository.java index a1e44b1a2..c6afcef2a 100644 --- a/nladmin-generator/src/main/java/org/nl/repository/GenConfigRepository.java +++ b/nladmin-system/src/main/java/org/nl/modules/generator/repository/GenConfigRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.repository; +package org.nl.modules.generator.repository; -import org.nl.domain.GenConfig; +import org.nl.modules.generator.domain.GenConfig; import org.springframework.data.jpa.repository.JpaRepository; /** diff --git a/nladmin-generator/src/main/java/org/nl/rest/GenConfigController.java b/nladmin-system/src/main/java/org/nl/modules/generator/rest/GenConfigController.java similarity index 91% rename from nladmin-generator/src/main/java/org/nl/rest/GenConfigController.java rename to nladmin-system/src/main/java/org/nl/modules/generator/rest/GenConfigController.java index 3a222c0e1..75ee5b512 100644 --- a/nladmin-generator/src/main/java/org/nl/rest/GenConfigController.java +++ b/nladmin-system/src/main/java/org/nl/modules/generator/rest/GenConfigController.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.rest; +package org.nl.modules.generator.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.nl.domain.GenConfig; -import org.nl.service.GenConfigService; +import org.nl.modules.generator.domain.GenConfig; +import org.nl.modules.generator.service.GenConfigService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/nladmin-generator/src/main/java/org/nl/rest/GeneratorController.java b/nladmin-system/src/main/java/org/nl/modules/generator/rest/GeneratorController.java similarity index 93% rename from nladmin-generator/src/main/java/org/nl/rest/GeneratorController.java rename to nladmin-system/src/main/java/org/nl/modules/generator/rest/GeneratorController.java index 698d37ad0..10238435f 100644 --- a/nladmin-generator/src/main/java/org/nl/rest/GeneratorController.java +++ b/nladmin-system/src/main/java/org/nl/modules/generator/rest/GeneratorController.java @@ -13,20 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.rest; +package org.nl.modules.generator.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.nl.domain.ColumnInfo; -import org.nl.exception.BadRequestException; -import org.nl.service.GenConfigService; -import org.nl.service.GeneratorService; -import org.nl.utils.PageUtil; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.PageUtil; +import org.nl.modules.generator.domain.ColumnInfo; +import org.nl.modules.generator.service.GenConfigService; +import org.nl.modules.generator.service.GeneratorService; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/nladmin-generator/src/main/java/org/nl/service/GenConfigService.java b/nladmin-system/src/main/java/org/nl/modules/generator/service/GenConfigService.java similarity index 91% rename from nladmin-generator/src/main/java/org/nl/service/GenConfigService.java rename to nladmin-system/src/main/java/org/nl/modules/generator/service/GenConfigService.java index 8802a751c..43d9ab312 100644 --- a/nladmin-generator/src/main/java/org/nl/service/GenConfigService.java +++ b/nladmin-system/src/main/java/org/nl/modules/generator/service/GenConfigService.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.service; +package org.nl.modules.generator.service; -import org.nl.domain.GenConfig; +import org.nl.modules.generator.domain.GenConfig; /** * @author Zheng Jie diff --git a/nladmin-generator/src/main/java/org/nl/service/GeneratorService.java b/nladmin-system/src/main/java/org/nl/modules/generator/service/GeneratorService.java similarity index 94% rename from nladmin-generator/src/main/java/org/nl/service/GeneratorService.java rename to nladmin-system/src/main/java/org/nl/modules/generator/service/GeneratorService.java index 3b39c79a1..0e749f382 100644 --- a/nladmin-generator/src/main/java/org/nl/service/GeneratorService.java +++ b/nladmin-system/src/main/java/org/nl/modules/generator/service/GeneratorService.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.service; +package org.nl.modules.generator.service; -import org.nl.domain.GenConfig; -import org.nl.domain.ColumnInfo; +import org.nl.modules.generator.domain.ColumnInfo; +import org.nl.modules.generator.domain.GenConfig; import org.springframework.http.ResponseEntity; import org.springframework.scheduling.annotation.Async; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/nladmin-generator/src/main/java/org/nl/service/impl/GenConfigServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/generator/service/impl/GenConfigServiceImpl.java similarity index 90% rename from nladmin-generator/src/main/java/org/nl/service/impl/GenConfigServiceImpl.java rename to nladmin-system/src/main/java/org/nl/modules/generator/service/impl/GenConfigServiceImpl.java index 6983d9dff..179516408 100644 --- a/nladmin-generator/src/main/java/org/nl/service/impl/GenConfigServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/generator/service/impl/GenConfigServiceImpl.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.service.impl; +package org.nl.modules.generator.service.impl; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; -import org.nl.domain.GenConfig; -import org.nl.repository.GenConfigRepository; -import org.nl.service.GenConfigService; -import org.nl.utils.StringUtils; +import org.nl.modules.generator.domain.GenConfig; +import org.nl.modules.generator.repository.GenConfigRepository; +import org.nl.modules.generator.service.GenConfigService; import org.springframework.stereotype.Service; + import java.io.File; /** diff --git a/nladmin-generator/src/main/java/org/nl/service/impl/GeneratorServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/generator/service/impl/GeneratorServiceImpl.java similarity index 94% rename from nladmin-generator/src/main/java/org/nl/service/impl/GeneratorServiceImpl.java rename to nladmin-system/src/main/java/org/nl/modules/generator/service/impl/GeneratorServiceImpl.java index 1b6081a9a..3fea2a993 100644 --- a/nladmin-generator/src/main/java/org/nl/service/impl/GeneratorServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/generator/service/impl/GeneratorServiceImpl.java @@ -13,23 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.service.impl; +package org.nl.modules.generator.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.ZipUtil; import lombok.RequiredArgsConstructor; -import org.nl.domain.GenConfig; -import org.nl.domain.ColumnInfo; -import org.nl.domain.vo.TableInfo; -import org.nl.exception.BadRequestException; -import org.nl.repository.ColumnInfoRepository; -import org.nl.service.GeneratorService; -import org.nl.utils.FileUtil; -import org.nl.utils.GenUtil; -import org.nl.utils.PageUtil; -import org.nl.utils.StringUtils; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.FileUtil; +import org.nl.modules.common.utils.PageUtil; +import org.nl.modules.generator.domain.ColumnInfo; +import org.nl.modules.generator.domain.GenConfig; +import org.nl.modules.generator.domain.vo.TableInfo; +import org.nl.modules.generator.repository.ColumnInfoRepository; +import org.nl.modules.generator.service.GeneratorService; +import org.nl.modules.generator.utils.GenUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; diff --git a/nladmin-generator/src/main/java/org/nl/utils/ColUtil.java b/nladmin-system/src/main/java/org/nl/modules/generator/utils/ColUtil.java similarity index 86% rename from nladmin-generator/src/main/java/org/nl/utils/ColUtil.java rename to nladmin-system/src/main/java/org/nl/modules/generator/utils/ColUtil.java index 7407a07e4..ff5a97192 100644 --- a/nladmin-generator/src/main/java/org/nl/utils/ColUtil.java +++ b/nladmin-system/src/main/java/org/nl/modules/generator/utils/ColUtil.java @@ -13,9 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.utils; +package org.nl.modules.generator.utils; -import org.apache.commons.configuration.*; +import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.ConfigurationException; +import org.apache.commons.configuration.PropertiesConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/nladmin-generator/src/main/java/org/nl/utils/GenUtil.java b/nladmin-system/src/main/java/org/nl/modules/generator/utils/GenUtil.java similarity index 97% rename from nladmin-generator/src/main/java/org/nl/utils/GenUtil.java rename to nladmin-system/src/main/java/org/nl/modules/generator/utils/GenUtil.java index 85030ce7f..46bcf3bd2 100644 --- a/nladmin-generator/src/main/java/org/nl/utils/GenUtil.java +++ b/nladmin-system/src/main/java/org/nl/modules/generator/utils/GenUtil.java @@ -13,13 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.utils; +package org.nl.modules.generator.utils; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.template.*; import lombok.extern.slf4j.Slf4j; -import org.nl.domain.GenConfig; -import org.nl.domain.ColumnInfo; +import org.nl.modules.common.utils.FileUtil; +import org.nl.modules.common.utils.StringUtils; +import org.nl.modules.generator.domain.ColumnInfo; +import org.nl.modules.generator.domain.GenConfig; import org.springframework.util.ObjectUtils; import java.io.File; @@ -27,9 +29,13 @@ import java.io.FileWriter; import java.io.IOException; import java.io.Writer; import java.time.LocalDate; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.nl.modules.common.utils.FileUtil.SYS_TEM_DIR; -import static org.nl.utils.FileUtil.SYS_TEM_DIR; /** * 代码生成 diff --git a/nladmin-logging/src/main/java/org/nl/annotation/Log.java b/nladmin-system/src/main/java/org/nl/modules/logging/annotation/Log.java similarity index 95% rename from nladmin-logging/src/main/java/org/nl/annotation/Log.java rename to nladmin-system/src/main/java/org/nl/modules/logging/annotation/Log.java index cf660be48..e14ae508e 100644 --- a/nladmin-logging/src/main/java/org/nl/annotation/Log.java +++ b/nladmin-system/src/main/java/org/nl/modules/logging/annotation/Log.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.annotation; +package org.nl.modules.logging.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/nladmin-logging/src/main/java/org/nl/aspect/LogAspect.java b/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java similarity index 93% rename from nladmin-logging/src/main/java/org/nl/aspect/LogAspect.java rename to nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java index a9b5c2475..e4730e1d8 100644 --- a/nladmin-logging/src/main/java/org/nl/aspect/LogAspect.java +++ b/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.aspect; +package org.nl.modules.logging.aspect; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; @@ -25,11 +25,11 @@ import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; -import org.nl.domain.Log; -import org.nl.service.LogService; -import org.nl.utils.RequestHolder; -import org.nl.utils.SecurityUtils; -import org.nl.utils.StringUtils; +import org.nl.modules.common.utils.RequestHolder; +import org.nl.modules.common.utils.SecurityUtils; +import org.nl.modules.common.utils.StringUtils; +import org.nl.modules.logging.domain.Log; +import org.nl.modules.logging.service.LogService; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; @@ -62,7 +62,7 @@ public class LogAspect { /** * 配置切入点 */ - @Pointcut("@annotation(org.nl.annotation.Log)") + @Pointcut("@annotation(org.nl.modules.logging.annotation.Log)") public void logPointcut() { // 该方法无方法体,主要为了让同类中其他方法使用此切入点 } diff --git a/nladmin-logging/src/main/java/org/nl/domain/Log.java b/nladmin-system/src/main/java/org/nl/modules/logging/domain/Log.java similarity index 97% rename from nladmin-logging/src/main/java/org/nl/domain/Log.java rename to nladmin-system/src/main/java/org/nl/modules/logging/domain/Log.java index b80c0fe06..917df120a 100644 --- a/nladmin-logging/src/main/java/org/nl/domain/Log.java +++ b/nladmin-system/src/main/java/org/nl/modules/logging/domain/Log.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.domain; +package org.nl.modules.logging.domain; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.annotations.CreationTimestamp; + import javax.persistence.*; import java.io.Serializable; import java.sql.Timestamp; diff --git a/nladmin-logging/src/main/java/org/nl/repository/LogRepository.java b/nladmin-system/src/main/java/org/nl/modules/logging/repository/LogRepository.java similarity index 93% rename from nladmin-logging/src/main/java/org/nl/repository/LogRepository.java rename to nladmin-system/src/main/java/org/nl/modules/logging/repository/LogRepository.java index 8b50b0a63..fae4022bc 100644 --- a/nladmin-logging/src/main/java/org/nl/repository/LogRepository.java +++ b/nladmin-system/src/main/java/org/nl/modules/logging/repository/LogRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.repository; +package org.nl.modules.logging.repository; -import org.nl.domain.Log; +import org.nl.modules.logging.domain.Log; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; diff --git a/nladmin-logging/src/main/java/org/nl/rest/LogController.java b/nladmin-system/src/main/java/org/nl/modules/logging/rest/LogController.java similarity index 92% rename from nladmin-logging/src/main/java/org/nl/rest/LogController.java rename to nladmin-system/src/main/java/org/nl/modules/logging/rest/LogController.java index bc9612e7c..27e5d2d84 100644 --- a/nladmin-logging/src/main/java/org/nl/rest/LogController.java +++ b/nladmin-system/src/main/java/org/nl/modules/logging/rest/LogController.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.rest; +package org.nl.modules.logging.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.nl.annotation.Log; -import org.nl.service.LogService; -import org.nl.service.dto.LogQueryCriteria; -import org.nl.utils.SecurityUtils; +import org.nl.modules.common.utils.SecurityUtils; +import org.nl.modules.logging.annotation.Log; +import org.nl.modules.logging.service.LogService; +import org.nl.modules.logging.service.dto.LogQueryCriteria; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/nladmin-logging/src/main/java/org/nl/service/LogService.java b/nladmin-system/src/main/java/org/nl/modules/logging/service/LogService.java similarity index 92% rename from nladmin-logging/src/main/java/org/nl/service/LogService.java rename to nladmin-system/src/main/java/org/nl/modules/logging/service/LogService.java index 077cdc463..e9fadd072 100644 --- a/nladmin-logging/src/main/java/org/nl/service/LogService.java +++ b/nladmin-system/src/main/java/org/nl/modules/logging/service/LogService.java @@ -13,16 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.service; +package org.nl.modules.logging.service; -import org.nl.domain.Log; -import org.nl.service.dto.LogQueryCriteria; import org.aspectj.lang.ProceedingJoinPoint; +import org.nl.modules.logging.domain.Log; +import org.nl.modules.logging.service.dto.LogQueryCriteria; import org.springframework.data.domain.Pageable; import org.springframework.scheduling.annotation.Async; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; import java.util.List; /** diff --git a/nladmin-logging/src/main/java/org/nl/service/dto/LogErrorDTO.java b/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogErrorDTO.java similarity index 95% rename from nladmin-logging/src/main/java/org/nl/service/dto/LogErrorDTO.java rename to nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogErrorDTO.java index 0d8c858c7..5fea69952 100644 --- a/nladmin-logging/src/main/java/org/nl/service/dto/LogErrorDTO.java +++ b/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogErrorDTO.java @@ -13,9 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.service.dto; +package org.nl.modules.logging.service.dto; import lombok.Data; + import java.io.Serializable; import java.sql.Timestamp; diff --git a/nladmin-logging/src/main/java/org/nl/service/dto/LogQueryCriteria.java b/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogQueryCriteria.java similarity index 91% rename from nladmin-logging/src/main/java/org/nl/service/dto/LogQueryCriteria.java rename to nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogQueryCriteria.java index a88418cc4..8e3cadb05 100644 --- a/nladmin-logging/src/main/java/org/nl/service/dto/LogQueryCriteria.java +++ b/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogQueryCriteria.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.service.dto; +package org.nl.modules.logging.service.dto; import lombok.Data; -import org.nl.annotation.Query; +import org.nl.modules.common.annotation.Query; + import java.sql.Timestamp; import java.util.List; diff --git a/nladmin-logging/src/main/java/org/nl/service/dto/LogSmallDTO.java b/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogSmallDTO.java similarity index 95% rename from nladmin-logging/src/main/java/org/nl/service/dto/LogSmallDTO.java rename to nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogSmallDTO.java index e9c43bf3f..f1610130a 100644 --- a/nladmin-logging/src/main/java/org/nl/service/dto/LogSmallDTO.java +++ b/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogSmallDTO.java @@ -13,9 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.service.dto; +package org.nl.modules.logging.service.dto; import lombok.Data; + import java.io.Serializable; import java.sql.Timestamp; diff --git a/nladmin-logging/src/main/java/org/nl/service/impl/LogServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LogServiceImpl.java similarity index 87% rename from nladmin-logging/src/main/java/org/nl/service/impl/LogServiceImpl.java rename to nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LogServiceImpl.java index 4c96a9f46..197e98740 100644 --- a/nladmin-logging/src/main/java/org/nl/service/impl/LogServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LogServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.service.impl; +package org.nl.modules.logging.service.impl; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ObjectUtil; @@ -21,15 +21,18 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; -import org.nl.domain.Log; -import org.nl.repository.LogRepository; -import org.nl.service.LogService; -import org.nl.service.dto.LogQueryCriteria; -import org.nl.service.mapstruct.LogErrorMapper; -import org.nl.service.mapstruct.LogSmallMapper; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.reflect.MethodSignature; -import org.nl.utils.*; +import org.nl.modules.common.utils.PageUtil; +import org.nl.modules.common.utils.QueryHelp; +import org.nl.modules.common.utils.StringUtils; +import org.nl.modules.common.utils.ValidationUtil; +import org.nl.modules.logging.domain.Log; +import org.nl.modules.logging.repository.LogRepository; +import org.nl.modules.logging.service.LogService; +import org.nl.modules.logging.service.dto.LogQueryCriteria; +import org.nl.modules.logging.service.mapstruct.LogErrorMapper; +import org.nl.modules.logging.service.mapstruct.LogSmallMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.Marker; @@ -41,11 +44,12 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; import java.lang.reflect.Method; import java.lang.reflect.Parameter; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * @author Zheng Jie @@ -87,7 +91,7 @@ public class LogServiceImpl implements LogService { MethodSignature signature = (MethodSignature) joinPoint.getSignature(); Method method = signature.getMethod(); - org.nl.annotation.Log aopLog = method.getAnnotation(org.nl.annotation.Log.class); + org.nl.modules.logging.annotation.Log aopLog = method.getAnnotation(org.nl.modules.logging.annotation.Log.class); // 方法路径 String methodName = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()"; diff --git a/nladmin-logging/src/main/java/org/nl/service/mapstruct/LogErrorMapper.java b/nladmin-system/src/main/java/org/nl/modules/logging/service/mapstruct/LogErrorMapper.java similarity index 81% rename from nladmin-logging/src/main/java/org/nl/service/mapstruct/LogErrorMapper.java rename to nladmin-system/src/main/java/org/nl/modules/logging/service/mapstruct/LogErrorMapper.java index bb2e12c6a..6be8206b0 100644 --- a/nladmin-logging/src/main/java/org/nl/service/mapstruct/LogErrorMapper.java +++ b/nladmin-system/src/main/java/org/nl/modules/logging/service/mapstruct/LogErrorMapper.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.service.mapstruct; +package org.nl.modules.logging.service.mapstruct; -import org.nl.base.BaseMapper; -import org.nl.domain.Log; -import org.nl.service.dto.LogErrorDTO; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; +import org.nl.modules.common.base.BaseMapper; +import org.nl.modules.logging.domain.Log; +import org.nl.modules.logging.service.dto.LogErrorDTO; /** * @author Zheng Jie diff --git a/nladmin-logging/src/main/java/org/nl/service/mapstruct/LogSmallMapper.java b/nladmin-system/src/main/java/org/nl/modules/logging/service/mapstruct/LogSmallMapper.java similarity index 81% rename from nladmin-logging/src/main/java/org/nl/service/mapstruct/LogSmallMapper.java rename to nladmin-system/src/main/java/org/nl/modules/logging/service/mapstruct/LogSmallMapper.java index 3840bada4..64f0a3e6a 100644 --- a/nladmin-logging/src/main/java/org/nl/service/mapstruct/LogSmallMapper.java +++ b/nladmin-system/src/main/java/org/nl/modules/logging/service/mapstruct/LogSmallMapper.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.service.mapstruct; +package org.nl.modules.logging.service.mapstruct; -import org.nl.base.BaseMapper; -import org.nl.domain.Log; -import org.nl.service.dto.LogSmallDTO; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; +import org.nl.modules.common.base.BaseMapper; +import org.nl.modules.logging.domain.Log; +import org.nl.modules.logging.service.dto.LogSmallDTO; /** * @author Zheng Jie diff --git a/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageController.java b/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageController.java index 7c6ff7a67..ebd4d90a1 100644 --- a/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageController.java +++ b/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageController.java @@ -4,7 +4,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.annotation.Log; +import org.nl.modules.logging.annotation.Log; import org.nl.modules.logicflow.service.StageService; import org.nl.modules.logicflow.service.dto.StageDto; import org.springframework.data.domain.Pageable; diff --git a/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageImageController.java b/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageImageController.java index b61b0c8f1..cb193cfd0 100644 --- a/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageImageController.java +++ b/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageImageController.java @@ -4,7 +4,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.annotation.Log; +import org.nl.modules.logging.annotation.Log; import org.nl.modules.logicflow.service.StageImageService; import org.nl.modules.logicflow.service.dto.StageImageDto; import org.springframework.data.domain.Pageable; diff --git a/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageImageServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageImageServiceImpl.java index e4a531c88..e193fbd14 100644 --- a/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageImageServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageImageServiceImpl.java @@ -6,10 +6,10 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.exception.BadRequestException; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.logicflow.service.StageImageService; import org.nl.modules.logicflow.service.dto.StageImageDto; -import org.nl.utils.SecurityUtils; import org.nl.wql.core.bean.ResultBean; import org.nl.wql.core.bean.WQLObject; import org.nl.wql.util.WqlUtil; diff --git a/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java index fc046af99..938b07f0a 100644 --- a/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java @@ -6,10 +6,10 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.exception.BadRequestException; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.logicflow.service.StageService; import org.nl.modules.logicflow.service.dto.StageDto; -import org.nl.utils.SecurityUtils; import org.nl.wql.core.bean.ResultBean; import org.nl.wql.core.bean.WQLObject; import org.nl.wql.util.WqlUtil; diff --git a/nladmin-system/src/main/java/org/nl/modules/quartz/domain/QuartzJob.java b/nladmin-system/src/main/java/org/nl/modules/quartz/domain/QuartzJob.java index 995417b1c..ae1359d17 100644 --- a/nladmin-system/src/main/java/org/nl/modules/quartz/domain/QuartzJob.java +++ b/nladmin-system/src/main/java/org/nl/modules/quartz/domain/QuartzJob.java @@ -18,7 +18,7 @@ package org.nl.modules.quartz.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; -import org.nl.base.BaseEntity; +import org.nl.modules.common.base.BaseEntity; import javax.persistence.*; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/nladmin-system/src/main/java/org/nl/modules/quartz/rest/QuartzJobController.java b/nladmin-system/src/main/java/org/nl/modules/quartz/rest/QuartzJobController.java index 3ca26905a..0d4246b50 100644 --- a/nladmin-system/src/main/java/org/nl/modules/quartz/rest/QuartzJobController.java +++ b/nladmin-system/src/main/java/org/nl/modules/quartz/rest/QuartzJobController.java @@ -15,21 +15,22 @@ */ package org.nl.modules.quartz.rest; +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.annotation.Log; -import org.nl.exception.BadRequestException; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.logging.annotation.Log; import org.nl.modules.quartz.domain.QuartzJob; import org.nl.modules.quartz.service.QuartzJobService; import org.nl.modules.quartz.service.dto.JobQueryCriteria; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Set; diff --git a/nladmin-system/src/main/java/org/nl/modules/quartz/service/dto/JobQueryCriteria.java b/nladmin-system/src/main/java/org/nl/modules/quartz/service/dto/JobQueryCriteria.java index ba5953e52..6b2a8ed6c 100644 --- a/nladmin-system/src/main/java/org/nl/modules/quartz/service/dto/JobQueryCriteria.java +++ b/nladmin-system/src/main/java/org/nl/modules/quartz/service/dto/JobQueryCriteria.java @@ -16,7 +16,7 @@ package org.nl.modules.quartz.service.dto; import lombok.Data; -import org.nl.annotation.Query; +import org.nl.modules.common.annotation.Query; import java.sql.Timestamp; import java.util.List; diff --git a/nladmin-system/src/main/java/org/nl/modules/quartz/service/impl/QuartzJobServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/quartz/service/impl/QuartzJobServiceImpl.java index 25c5ae524..baebaecc9 100644 --- a/nladmin-system/src/main/java/org/nl/modules/quartz/service/impl/QuartzJobServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/quartz/service/impl/QuartzJobServiceImpl.java @@ -18,7 +18,8 @@ package org.nl.modules.quartz.service.impl; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; -import org.nl.exception.BadRequestException; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.*; import org.nl.modules.quartz.domain.QuartzJob; import org.nl.modules.quartz.domain.QuartzLog; import org.nl.modules.quartz.repository.QuartzJobRepository; @@ -26,7 +27,6 @@ import org.nl.modules.quartz.repository.QuartzLogRepository; import org.nl.modules.quartz.service.QuartzJobService; import org.nl.modules.quartz.service.dto.JobQueryCriteria; import org.nl.modules.quartz.utils.QuartzManage; -import org.nl.utils.*; import org.quartz.CronExpression; import org.springframework.data.domain.Pageable; import org.springframework.scheduling.annotation.Async; diff --git a/nladmin-system/src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java b/nladmin-system/src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java index a414afb5a..3cc8f6985 100644 --- a/nladmin-system/src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java +++ b/nladmin-system/src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java @@ -18,13 +18,13 @@ package org.nl.modules.quartz.utils; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; import org.nl.config.thread.ThreadPoolExecutorUtil; +import org.nl.modules.common.utils.RedisUtils; +import org.nl.modules.common.utils.ThrowableUtil; import org.nl.modules.quartz.domain.QuartzJob; import org.nl.modules.quartz.domain.QuartzLog; import org.nl.modules.quartz.repository.QuartzLogRepository; import org.nl.modules.quartz.service.QuartzJobService; -import org.nl.utils.RedisUtils; -import org.nl.utils.SpringContextHolder; -import org.nl.utils.ThrowableUtil; +import org.nl.wql.util.SpringContextHolder; import org.quartz.JobExecutionContext; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.quartz.QuartzJobBean; diff --git a/nladmin-system/src/main/java/org/nl/modules/quartz/utils/QuartzManage.java b/nladmin-system/src/main/java/org/nl/modules/quartz/utils/QuartzManage.java index ac560fe14..ac20ccf3c 100644 --- a/nladmin-system/src/main/java/org/nl/modules/quartz/utils/QuartzManage.java +++ b/nladmin-system/src/main/java/org/nl/modules/quartz/utils/QuartzManage.java @@ -16,13 +16,15 @@ package org.nl.modules.quartz.utils; import lombok.extern.slf4j.Slf4j; -import org.nl.exception.BadRequestException; +import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.quartz.domain.QuartzJob; import org.quartz.*; import org.quartz.impl.triggers.CronTriggerImpl; import org.springframework.stereotype.Component; + import javax.annotation.Resource; import java.util.Date; + import static org.quartz.TriggerBuilder.newTrigger; /** diff --git a/nladmin-system/src/main/java/org/nl/modules/quartz/utils/QuartzRunnable.java b/nladmin-system/src/main/java/org/nl/modules/quartz/utils/QuartzRunnable.java index 17b5ae335..f64c82e87 100644 --- a/nladmin-system/src/main/java/org/nl/modules/quartz/utils/QuartzRunnable.java +++ b/nladmin-system/src/main/java/org/nl/modules/quartz/utils/QuartzRunnable.java @@ -17,7 +17,7 @@ package org.nl.modules.quartz.utils; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; -import org.nl.utils.SpringContextHolder; +import org.nl.wql.util.SpringContextHolder; import org.springframework.util.ReflectionUtils; import java.lang.reflect.Method; diff --git a/nladmin-system/src/main/java/org/nl/modules/security/config/bean/LoginProperties.java b/nladmin-system/src/main/java/org/nl/modules/security/config/bean/LoginProperties.java index 749e42876..e436eaabe 100644 --- a/nladmin-system/src/main/java/org/nl/modules/security/config/bean/LoginProperties.java +++ b/nladmin-system/src/main/java/org/nl/modules/security/config/bean/LoginProperties.java @@ -19,7 +19,7 @@ import cn.hutool.core.util.StrUtil; import com.wf.captcha.*; import com.wf.captcha.base.Captcha; import lombok.Data; -import org.nl.exception.BadConfigurationException; +import org.nl.modules.common.exception.BadConfigurationException; import java.awt.*; import java.util.Objects; diff --git a/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java b/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java index d6ab389cc..88c54d708 100644 --- a/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java +++ b/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java @@ -25,11 +25,15 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.annotation.rest.AnonymousDeleteMapping; -import org.nl.annotation.rest.AnonymousGetMapping; -import org.nl.annotation.rest.AnonymousPostMapping; -import org.nl.config.RsaProperties; -import org.nl.exception.BadRequestException; +import org.nl.modules.common.annotation.rest.AnonymousDeleteMapping; +import org.nl.modules.common.annotation.rest.AnonymousGetMapping; +import org.nl.modules.common.annotation.rest.AnonymousPostMapping; +import org.nl.modules.common.config.RsaProperties; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.RedisUtils; +import org.nl.modules.common.utils.RsaUtils; +import org.nl.modules.common.utils.SecurityUtils; +import org.nl.modules.common.utils.dto.CurrentUser; import org.nl.modules.security.config.bean.LoginCodeEnum; import org.nl.modules.security.config.bean.LoginProperties; import org.nl.modules.security.service.OnlineUserService; @@ -37,10 +41,6 @@ import org.nl.modules.security.service.dto.AuthUserDto; import org.nl.modules.system.service.RoleService; import org.nl.modules.system.service.UserService; import org.nl.modules.system.service.dto.UserDto; -import org.nl.utils.RedisUtils; -import org.nl.utils.RsaUtils; -import org.nl.utils.SecurityUtils; -import org.nl.utils.dto.CurrentUser; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/nladmin-system/src/main/java/org/nl/modules/security/rest/OnlineController.java b/nladmin-system/src/main/java/org/nl/modules/security/rest/OnlineController.java index 0358bdcbb..e5b183944 100644 --- a/nladmin-system/src/main/java/org/nl/modules/security/rest/OnlineController.java +++ b/nladmin-system/src/main/java/org/nl/modules/security/rest/OnlineController.java @@ -18,12 +18,13 @@ package org.nl.modules.security.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.nl.modules.common.utils.EncryptUtils; import org.nl.modules.security.service.OnlineUserService; -import org.nl.utils.EncryptUtils; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Set; diff --git a/nladmin-system/src/main/java/org/nl/modules/security/satoken/SaTokenConfigure.java b/nladmin-system/src/main/java/org/nl/modules/security/satoken/SaTokenConfigure.java index f141ca3e3..ee1423c3e 100644 --- a/nladmin-system/src/main/java/org/nl/modules/security/satoken/SaTokenConfigure.java +++ b/nladmin-system/src/main/java/org/nl/modules/security/satoken/SaTokenConfigure.java @@ -1,7 +1,10 @@ package org.nl.modules.security.satoken; -import cn.dev33.satoken.interceptor.SaInterceptor; +import cn.dev33.satoken.context.SaHolder; +import cn.dev33.satoken.interceptor.SaAnnotationInterceptor; +import cn.dev33.satoken.interceptor.SaRouteInterceptor; import cn.dev33.satoken.jwt.StpLogicJwtForSimple; +import cn.dev33.satoken.router.SaRouter; import cn.dev33.satoken.stp.StpLogic; import cn.dev33.satoken.stp.StpUtil; import lombok.RequiredArgsConstructor; @@ -35,9 +38,34 @@ public class SaTokenConfigure implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { // 注册 Sa-Token 拦截器，打开注解式鉴权功能 - registry.addInterceptor(new SaInterceptor(handle -> StpUtil.checkLogin())) - .addPathPatterns("/**") - .excludePathPatterns(securityProperties.getExcludes()); // 白名单 +// registry.addInterceptor(new SaInterceptor(handle -> StpUtil.checkLogin())) +// .addPathPatterns("/**") +// .excludePathPatterns(securityProperties.getExcludes()); // 白名单 + registry.addInterceptor(new SaRouteInterceptor((request, response, handler) -> { + System.out.println(SaHolder.getRequest().getRequestPath()); + // 登录验证 -- 排除多个路径 + SaRouter + // 获取所有的 + .match("/**") + // 排除下不需要拦截的 + .notMatch(securityProperties.getExcludes()) + // 对未排除的路径进行检查 + .check(() -> { + // 检查是否登录 是否有token + StpUtil.checkLogin(); + + // 有效率影响 用于临时测试 + // if (log.isDebugEnabled()) { + // log.debug("剩余有效时间: {}", StpUtil.getTokenTimeout()); + // log.debug("临时有效时间: {}", StpUtil.getTokenActivityTimeout()); + // } + + }); + })).addPathPatterns("/**"); + registry.addInterceptor(new SaAnnotationInterceptor()).addPathPatterns("/**"); + + + } /** diff --git a/nladmin-system/src/main/java/org/nl/modules/security/satoken/StpInterfaceImpl.java b/nladmin-system/src/main/java/org/nl/modules/security/satoken/StpInterfaceImpl.java index ee240c796..883256ca5 100644 --- a/nladmin-system/src/main/java/org/nl/modules/security/satoken/StpInterfaceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/security/satoken/StpInterfaceImpl.java @@ -1,7 +1,7 @@ package org.nl.modules.security.satoken; import cn.dev33.satoken.stp.StpInterface; -import org.nl.utils.SecurityUtils; +import org.nl.modules.common.utils.SecurityUtils; import org.springframework.stereotype.Component; import java.util.List; diff --git a/nladmin-system/src/main/java/org/nl/modules/security/satoken/utils/FlushSessionUtil.java b/nladmin-system/src/main/java/org/nl/modules/security/satoken/utils/FlushSessionUtil.java index 9e23cae61..29a2917cf 100644 --- a/nladmin-system/src/main/java/org/nl/modules/security/satoken/utils/FlushSessionUtil.java +++ b/nladmin-system/src/main/java/org/nl/modules/security/satoken/utils/FlushSessionUtil.java @@ -2,8 +2,8 @@ package org.nl.modules.security.satoken.utils; import cn.dev33.satoken.stp.StpUtil; import lombok.RequiredArgsConstructor; +import org.nl.modules.common.utils.dto.CurrentUser; import org.nl.modules.system.service.dto.UserDto; -import org.nl.utils.dto.CurrentUser; import org.springframework.stereotype.Component; import java.util.List; diff --git a/nladmin-system/src/main/java/org/nl/modules/security/service/OnlineUserService.java b/nladmin-system/src/main/java/org/nl/modules/security/service/OnlineUserService.java index b4441e8fc..0687fa613 100644 --- a/nladmin-system/src/main/java/org/nl/modules/security/service/OnlineUserService.java +++ b/nladmin-system/src/main/java/org/nl/modules/security/service/OnlineUserService.java @@ -17,9 +17,9 @@ package org.nl.modules.security.service; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; +import org.nl.modules.common.utils.*; import org.nl.modules.security.service.dto.OnlineUserDto; import org.nl.modules.system.service.dto.UserDto; -import org.nl.utils.*; import org.springframework.data.domain.Pageable; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/domain/Dept.java b/nladmin-system/src/main/java/org/nl/modules/system/domain/Dept.java index 46568acfb..5c5695721 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/domain/Dept.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/domain/Dept.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; -import org.nl.base.BaseEntity; +import org.nl.modules.common.base.BaseEntity; import javax.persistence.*; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/domain/Dict.java b/nladmin-system/src/main/java/org/nl/modules/system/domain/Dict.java index 978063a22..a1a4e29a8 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/domain/Dict.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/domain/Dict.java @@ -18,7 +18,8 @@ package org.nl.modules.system.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; -import org.nl.base.BaseEntity; +import org.nl.modules.common.base.BaseEntity; + import javax.persistence.*; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/domain/DictDetail.java b/nladmin-system/src/main/java/org/nl/modules/system/domain/DictDetail.java index cf1946262..e56d1d867 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/domain/DictDetail.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/domain/DictDetail.java @@ -18,7 +18,8 @@ package org.nl.modules.system.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; -import org.nl.base.BaseEntity; +import org.nl.modules.common.base.BaseEntity; + import javax.persistence.*; import javax.validation.constraints.NotNull; import java.io.Serializable; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/domain/Job.java b/nladmin-system/src/main/java/org/nl/modules/system/domain/Job.java index caa98f54d..248d04bbe 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/domain/Job.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/domain/Job.java @@ -18,10 +18,8 @@ package org.nl.modules.system.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; -import org.nl.base.BaseEntity; +import org.nl.modules.common.base.BaseEntity; import javax.persistence.*; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/domain/Menu.java b/nladmin-system/src/main/java/org/nl/modules/system/domain/Menu.java index 7caca6ab2..c7510e6a3 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/domain/Menu.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/domain/Menu.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; -import org.nl.base.BaseEntity; +import org.nl.modules.common.base.BaseEntity; import javax.persistence.*; import javax.validation.constraints.NotNull; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/domain/Param.java b/nladmin-system/src/main/java/org/nl/modules/system/domain/Param.java index 48f6be5f1..39d79b844 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/domain/Param.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/domain/Param.java @@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.nl.base.BaseEntity; +import org.nl.modules.common.base.BaseEntity; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/domain/Role.java b/nladmin-system/src/main/java/org/nl/modules/system/domain/Role.java index b17c5d60b..da649e224 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/domain/Role.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/domain/Role.java @@ -19,8 +19,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; -import org.nl.base.BaseEntity; -import org.nl.utils.enums.DataScopeEnum; +import org.nl.modules.common.base.BaseEntity; +import org.nl.modules.common.utils.enums.DataScopeEnum; import javax.persistence.*; import javax.validation.constraints.NotBlank; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/domain/User.java b/nladmin-system/src/main/java/org/nl/modules/system/domain/User.java index 54d45a0f6..fd6372988 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/domain/User.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/domain/User.java @@ -20,7 +20,7 @@ import lombok.Getter; import lombok.Setter; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; -import org.nl.base.BaseEntity; +import org.nl.modules.common.base.BaseEntity; import javax.persistence.*; import javax.validation.constraints.Email; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/rest/AutoRunController.java b/nladmin-system/src/main/java/org/nl/modules/system/rest/AutoRunController.java index b4eb1bcd1..5a1c7b3b0 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/rest/AutoRunController.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/rest/AutoRunController.java @@ -3,10 +3,10 @@ package org.nl.modules.system.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.nl.annotation.Log; +import org.nl.modules.common.utils.PageUtil; +import org.nl.modules.logging.annotation.Log; import org.nl.start.auto.run.AutoRunService; import org.nl.start.auto.run.ThreadDto; -import org.nl.utils.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/rest/CodeDetailController.java b/nladmin-system/src/main/java/org/nl/modules/system/rest/CodeDetailController.java index b2e51032d..973770d10 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/rest/CodeDetailController.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/rest/CodeDetailController.java @@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.nl.annotation.Log; +import org.nl.modules.logging.annotation.Log; import org.nl.modules.system.service.CodeDetailService; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/rest/DeptController.java b/nladmin-system/src/main/java/org/nl/modules/system/rest/DeptController.java index eb39e17f2..838441fe5 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/rest/DeptController.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/rest/DeptController.java @@ -15,23 +15,24 @@ */ package org.nl.modules.system.rest; +import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.collection.CollectionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.nl.annotation.Log; -import org.nl.exception.BadRequestException; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.PageUtil; +import org.nl.modules.logging.annotation.Log; import org.nl.modules.system.domain.Dept; import org.nl.modules.system.service.DeptService; import org.nl.modules.system.service.dto.DeptDto; import org.nl.modules.system.service.dto.DeptQueryCriteria; -import org.nl.utils.PageUtil; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; + import javax.servlet.http.HttpServletResponse; import java.util.*; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/rest/DictController.java b/nladmin-system/src/main/java/org/nl/modules/system/rest/DictController.java index 5665a6d85..e605eaa72 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/rest/DictController.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/rest/DictController.java @@ -15,18 +15,18 @@ */ package org.nl.modules.system.rest; +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.nl.annotation.Log; -import org.nl.exception.BadRequestException; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.logging.annotation.Log; import org.nl.modules.system.domain.Dict; import org.nl.modules.system.service.DictService; import org.nl.modules.system.service.dto.DictQueryCriteria; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/rest/DictDetailController.java b/nladmin-system/src/main/java/org/nl/modules/system/rest/DictDetailController.java index 64eb5aa29..f81d986f5 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/rest/DictDetailController.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/rest/DictDetailController.java @@ -19,8 +19,8 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.nl.annotation.Log; -import org.nl.exception.BadRequestException; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.logging.annotation.Log; import org.nl.modules.system.domain.Dict; import org.nl.modules.system.domain.DictDetail; import org.nl.modules.system.repository.DictRepository; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/rest/GenCodeController.java b/nladmin-system/src/main/java/org/nl/modules/system/rest/GenCodeController.java index 1d3dbff6a..853fa30c8 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/rest/GenCodeController.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/rest/GenCodeController.java @@ -4,7 +4,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import com.alibaba.fastjson.JSONObject; -import org.nl.annotation.Log; +import org.nl.modules.logging.annotation.Log; import org.nl.modules.system.service.GenCodeService; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/rest/GridController.java b/nladmin-system/src/main/java/org/nl/modules/system/rest/GridController.java index 1fe847cfa..4b7c1647e 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/rest/GridController.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/rest/GridController.java @@ -4,7 +4,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.annotation.Log; +import org.nl.modules.logging.annotation.Log; import org.nl.modules.system.service.GridService; import org.nl.modules.system.service.dto.GridDto; import org.springframework.data.domain.Pageable; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/rest/GridFieldController.java b/nladmin-system/src/main/java/org/nl/modules/system/rest/GridFieldController.java index 963bf3413..88c8665b2 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/rest/GridFieldController.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/rest/GridFieldController.java @@ -5,7 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.annotation.Log; +import org.nl.modules.logging.annotation.Log; import org.nl.modules.system.service.GridFieldService; import org.nl.modules.system.service.dto.GridFieldDto; import org.springframework.data.domain.Pageable; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/rest/JobController.java b/nladmin-system/src/main/java/org/nl/modules/system/rest/JobController.java index 70be4b8ee..a86625792 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/rest/JobController.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/rest/JobController.java @@ -15,21 +15,22 @@ */ package org.nl.modules.system.rest; +import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaMode; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.nl.annotation.Log; -import org.nl.exception.BadRequestException; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.logging.annotation.Log; import org.nl.modules.system.domain.Job; import org.nl.modules.system.service.JobService; import org.nl.modules.system.service.dto.JobQueryCriteria; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Set; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/rest/LimitController.java b/nladmin-system/src/main/java/org/nl/modules/system/rest/LimitController.java index ffee4d384..7c8cbe1fe 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/rest/LimitController.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/rest/LimitController.java @@ -17,8 +17,8 @@ package org.nl.modules.system.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.nl.annotation.Limit; -import org.nl.annotation.rest.AnonymousGetMapping; +import org.nl.modules.common.annotation.Limit; +import org.nl.modules.common.annotation.rest.AnonymousGetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/rest/MenuController.java b/nladmin-system/src/main/java/org/nl/modules/system/rest/MenuController.java index 139b40acd..2421084a9 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/rest/MenuController.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/rest/MenuController.java @@ -22,14 +22,14 @@ import cn.hutool.core.collection.CollectionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.nl.annotation.Log; -import org.nl.exception.BadRequestException; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.PageUtil; +import org.nl.modules.logging.annotation.Log; import org.nl.modules.system.domain.Menu; import org.nl.modules.system.service.MenuService; import org.nl.modules.system.service.dto.MenuDto; import org.nl.modules.system.service.dto.MenuQueryCriteria; import org.nl.modules.system.service.mapstruct.MenuMapper; -import org.nl.utils.PageUtil; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/rest/ParamController.java b/nladmin-system/src/main/java/org/nl/modules/system/rest/ParamController.java index c662c6ac0..cb650ea52 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/rest/ParamController.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/rest/ParamController.java @@ -1,4 +1,3 @@ - package org.nl.modules.system.rest; @@ -6,7 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.annotation.Log; +import org.nl.modules.logging.annotation.Log; import org.nl.modules.system.service.ParamService; import org.nl.modules.system.service.dto.ParamDto; import org.springframework.data.domain.Pageable; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/rest/RedisController.java b/nladmin-system/src/main/java/org/nl/modules/system/rest/RedisController.java index 1b4ca8c9c..18fc4beba 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/rest/RedisController.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/rest/RedisController.java @@ -4,7 +4,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.annotation.Log; +import org.nl.modules.logging.annotation.Log; import org.nl.modules.system.service.RedisService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/rest/RoleController.java b/nladmin-system/src/main/java/org/nl/modules/system/rest/RoleController.java index dfaa10aa6..1e2088a7c 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/rest/RoleController.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/rest/RoleController.java @@ -22,8 +22,8 @@ import cn.hutool.core.lang.Dict; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.nl.annotation.Log; -import org.nl.exception.BadRequestException; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.logging.annotation.Log; import org.nl.modules.system.domain.Role; import org.nl.modules.system.service.RoleService; import org.nl.modules.system.service.dto.RoleDto; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java b/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java index c97a737be..95e2b7427 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java @@ -22,9 +22,12 @@ import cn.hutool.core.collection.CollectionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.nl.annotation.Log; -import org.nl.config.RsaProperties; -import org.nl.exception.BadRequestException; +import org.nl.modules.common.config.RsaProperties; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.PageUtil; +import org.nl.modules.common.utils.RsaUtils; +import org.nl.modules.common.utils.SecurityUtils; +import org.nl.modules.logging.annotation.Log; import org.nl.modules.system.domain.User; import org.nl.modules.system.domain.vo.UserPassVo; import org.nl.modules.system.service.DataService; @@ -34,9 +37,6 @@ import org.nl.modules.system.service.UserService; import org.nl.modules.system.service.dto.RoleSmallDto; import org.nl.modules.system.service.dto.UserDto; import org.nl.modules.system.service.dto.UserQueryCriteria; -import org.nl.utils.PageUtil; -import org.nl.utils.RsaUtils; -import org.nl.utils.SecurityUtils; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/DeptDto.java b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/DeptDto.java index 8bb43bbeb..96969f56c 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/DeptDto.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/DeptDto.java @@ -18,7 +18,8 @@ package org.nl.modules.system.service.dto; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Getter; import lombok.Setter; -import org.nl.base.BaseDTO; +import org.nl.modules.common.base.BaseDTO; + import java.io.Serializable; import java.util.List; import java.util.Objects; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/DeptQueryCriteria.java b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/DeptQueryCriteria.java index 447aeb0c6..603af60a5 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/DeptQueryCriteria.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/DeptQueryCriteria.java @@ -16,8 +16,9 @@ package org.nl.modules.system.service.dto; import lombok.Data; -import org.nl.annotation.DataPermission; -import org.nl.annotation.Query; +import org.nl.modules.common.annotation.DataPermission; +import org.nl.modules.common.annotation.Query; + import java.sql.Timestamp; import java.util.List; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/DictDetailDto.java b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/DictDetailDto.java index aec4380a2..44b85a4ee 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/DictDetailDto.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/DictDetailDto.java @@ -17,7 +17,8 @@ package org.nl.modules.system.service.dto; import lombok.Getter; import lombok.Setter; -import org.nl.base.BaseDTO; +import org.nl.modules.common.base.BaseDTO; + import java.io.Serializable; /** diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/DictDetailQueryCriteria.java b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/DictDetailQueryCriteria.java index b540afb51..ae75372fa 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/DictDetailQueryCriteria.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/DictDetailQueryCriteria.java @@ -16,7 +16,7 @@ package org.nl.modules.system.service.dto; import lombok.Data; -import org.nl.annotation.Query; +import org.nl.modules.common.annotation.Query; /** * @author Zheng Jie diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/DictDto.java b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/DictDto.java index 9dcd068a6..5eb3a8425 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/DictDto.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/DictDto.java @@ -17,7 +17,8 @@ package org.nl.modules.system.service.dto; import lombok.Getter; import lombok.Setter; -import org.nl.base.BaseDTO; +import org.nl.modules.common.base.BaseDTO; + import java.io.Serializable; import java.util.List; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/DictQueryCriteria.java b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/DictQueryCriteria.java index 4e28c3260..410b72568 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/DictQueryCriteria.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/DictQueryCriteria.java @@ -16,7 +16,7 @@ package org.nl.modules.system.service.dto; import lombok.Data; -import org.nl.annotation.Query; +import org.nl.modules.common.annotation.Query; /** * @author Zheng Jie diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/JobDto.java b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/JobDto.java index 9a86a9444..cd6f1174e 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/JobDto.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/JobDto.java @@ -18,7 +18,7 @@ package org.nl.modules.system.service.dto; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.nl.base.BaseDTO; +import org.nl.modules.common.base.BaseDTO; import java.io.Serializable; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/JobQueryCriteria.java b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/JobQueryCriteria.java index 42f8b0124..9b9dc469b 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/JobQueryCriteria.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/JobQueryCriteria.java @@ -17,7 +17,8 @@ package org.nl.modules.system.service.dto; import lombok.Data; import lombok.NoArgsConstructor; -import org.nl.annotation.Query; +import org.nl.modules.common.annotation.Query; + import java.sql.Timestamp; import java.util.List; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/MenuDto.java b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/MenuDto.java index e079b16f7..0911324b4 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/MenuDto.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/MenuDto.java @@ -17,7 +17,7 @@ package org.nl.modules.system.service.dto; import lombok.Getter; import lombok.Setter; -import org.nl.base.BaseDTO; +import org.nl.modules.common.base.BaseDTO; import java.io.Serializable; import java.util.List; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/MenuQueryCriteria.java b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/MenuQueryCriteria.java index 30aefee28..b7b9209f6 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/MenuQueryCriteria.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/MenuQueryCriteria.java @@ -16,7 +16,8 @@ package org.nl.modules.system.service.dto; import lombok.Data; -import org.nl.annotation.Query; +import org.nl.modules.common.annotation.Query; + import java.sql.Timestamp; import java.util.List; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/RoleDto.java b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/RoleDto.java index a3049756e..d92488320 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/RoleDto.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/RoleDto.java @@ -17,7 +17,8 @@ package org.nl.modules.system.service.dto; import lombok.Getter; import lombok.Setter; -import org.nl.base.BaseDTO; +import org.nl.modules.common.base.BaseDTO; + import java.io.Serializable; import java.util.Objects; import java.util.Set; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/RoleQueryCriteria.java b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/RoleQueryCriteria.java index bf41ff1b8..9df73bf12 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/RoleQueryCriteria.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/RoleQueryCriteria.java @@ -16,7 +16,7 @@ package org.nl.modules.system.service.dto; import lombok.Data; -import org.nl.annotation.Query; +import org.nl.modules.common.annotation.Query; import java.sql.Timestamp; import java.util.List; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/UserDto.java b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/UserDto.java index 4e4621063..710e65577 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/UserDto.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/UserDto.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Getter; import lombok.Setter; -import org.nl.base.BaseDTO; +import org.nl.modules.common.base.BaseDTO; import java.io.Serializable; import java.util.Date; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/UserQueryCriteria.java b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/UserQueryCriteria.java index 2086cf2fd..70d81bc4f 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/dto/UserQueryCriteria.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/dto/UserQueryCriteria.java @@ -16,7 +16,8 @@ package org.nl.modules.system.service.dto; import lombok.Data; -import org.nl.annotation.Query; +import org.nl.modules.common.annotation.Query; + import java.io.Serializable; import java.sql.Timestamp; import java.util.HashSet; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/CodeDetailServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/CodeDetailServiceImpl.java index 48255c335..937d2a317 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/CodeDetailServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/CodeDetailServiceImpl.java @@ -4,8 +4,8 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; +import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.system.service.CodeDetailService; -import org.nl.utils.SecurityUtils; import org.nl.wql.core.bean.ResultBean; import org.nl.wql.core.bean.WQLObject; import org.nl.wql.util.WqlUtil; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DataServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DataServiceImpl.java index aef439df4..24e4d3f95 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DataServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DataServiceImpl.java @@ -17,16 +17,17 @@ package org.nl.modules.system.service.impl; import cn.hutool.core.util.ObjectUtil; import lombok.RequiredArgsConstructor; +import org.nl.modules.common.utils.enums.DataScopeEnum; import org.nl.modules.system.domain.Dept; import org.nl.modules.system.service.DataService; import org.nl.modules.system.service.DeptService; import org.nl.modules.system.service.RoleService; import org.nl.modules.system.service.dto.RoleSmallDto; import org.nl.modules.system.service.dto.UserDto; -import org.nl.utils.enums.DataScopeEnum; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; + import java.util.*; /** diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java index 2a626a28d..c2f48d970 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java @@ -22,7 +22,8 @@ import cn.hutool.db.Db; import cn.hutool.db.Entity; import com.alibaba.fastjson.JSONArray; import lombok.RequiredArgsConstructor; -import org.nl.exception.BadRequestException; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.*; import org.nl.modules.system.domain.Dept; import org.nl.modules.system.domain.User; import org.nl.modules.system.repository.DeptRepository; @@ -32,8 +33,8 @@ import org.nl.modules.system.service.DeptService; import org.nl.modules.system.service.dto.DeptDto; import org.nl.modules.system.service.dto.DeptQueryCriteria; import org.nl.modules.system.service.mapstruct.DeptMapper; -import org.nl.utils.*; import org.nl.wql.core.bean.WQLObject; +import org.nl.wql.util.SpringContextHolder; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.Cacheable; import org.springframework.data.domain.Sort; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java index 21833edff..e60fa8e13 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java @@ -16,17 +16,17 @@ package org.nl.modules.system.service.impl; import lombok.RequiredArgsConstructor; +import org.nl.modules.common.utils.PageUtil; +import org.nl.modules.common.utils.QueryHelp; +import org.nl.modules.common.utils.RedisUtils; +import org.nl.modules.common.utils.ValidationUtil; import org.nl.modules.system.domain.Dict; import org.nl.modules.system.domain.DictDetail; -import org.nl.modules.system.repository.DictRepository; -import org.nl.modules.system.service.dto.DictDetailQueryCriteria; -import org.nl.utils.PageUtil; -import org.nl.utils.QueryHelp; -import org.nl.utils.RedisUtils; -import org.nl.utils.ValidationUtil; import org.nl.modules.system.repository.DictDetailRepository; +import org.nl.modules.system.repository.DictRepository; import org.nl.modules.system.service.DictDetailService; import org.nl.modules.system.service.dto.DictDetailDto; +import org.nl.modules.system.service.dto.DictDetailQueryCriteria; import org.nl.modules.system.service.mapstruct.DictDetailMapper; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.Cacheable; @@ -34,6 +34,7 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import java.util.List; import java.util.Map; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DictServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DictServiceImpl.java index 903f0294f..4b938b44f 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DictServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DictServiceImpl.java @@ -17,6 +17,7 @@ package org.nl.modules.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import lombok.RequiredArgsConstructor; +import org.nl.modules.common.utils.*; import org.nl.modules.system.domain.Dict; import org.nl.modules.system.repository.DictRepository; import org.nl.modules.system.service.DictService; @@ -24,7 +25,6 @@ import org.nl.modules.system.service.dto.DictDetailDto; import org.nl.modules.system.service.dto.DictDto; import org.nl.modules.system.service.dto.DictQueryCriteria; import org.nl.modules.system.service.mapstruct.DictMapper; -import org.nl.utils.*; import org.springframework.cache.annotation.CacheConfig; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java index 56233947e..37b7ceb75 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java @@ -6,9 +6,9 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; -import org.nl.exception.BadRequestException; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.system.service.GenCodeService; -import org.nl.utils.SecurityUtils; import org.nl.wql.core.bean.ResultBean; import org.nl.wql.core.bean.WQLObject; import org.nl.wql.util.WqlUtil; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridFieldServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridFieldServiceImpl.java index 0f7600083..8bae7ac23 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridFieldServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridFieldServiceImpl.java @@ -7,10 +7,10 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.exception.BadRequestException; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.system.service.GridFieldService; import org.nl.modules.system.service.dto.GridFieldDto; -import org.nl.utils.SecurityUtils; import org.nl.wql.WQL; import org.nl.wql.core.bean.WQLObject; import org.nl.wql.util.WqlUtil; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridServiceImpl.java index b811dfe04..81147f2f7 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GridServiceImpl.java @@ -6,10 +6,10 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.exception.BadRequestException; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.system.service.GridService; import org.nl.modules.system.service.dto.GridDto; -import org.nl.utils.SecurityUtils; import org.nl.wql.core.bean.ResultBean; import org.nl.wql.core.bean.WQLObject; import org.nl.wql.util.WqlUtil; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/JobServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/JobServiceImpl.java index fcab2cb39..09247651b 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/JobServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/JobServiceImpl.java @@ -16,17 +16,16 @@ package org.nl.modules.system.service.impl; import lombok.RequiredArgsConstructor; -import org.nl.exception.BadRequestException; -import org.nl.exception.EntityExistException; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.exception.EntityExistException; +import org.nl.modules.common.utils.*; import org.nl.modules.system.domain.Job; -import org.nl.modules.system.repository.UserRepository; -import org.nl.modules.system.service.dto.JobQueryCriteria; - import org.nl.modules.system.repository.JobRepository; +import org.nl.modules.system.repository.UserRepository; import org.nl.modules.system.service.JobService; import org.nl.modules.system.service.dto.JobDto; +import org.nl.modules.system.service.dto.JobQueryCriteria; import org.nl.modules.system.service.mapstruct.JobMapper; -import org.nl.utils.*; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; @@ -34,6 +33,7 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.*; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/MenuServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/MenuServiceImpl.java index d095286bb..4fda2a6ba 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/MenuServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/MenuServiceImpl.java @@ -18,8 +18,12 @@ package org.nl.modules.system.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; -import org.nl.exception.BadRequestException; -import org.nl.exception.EntityExistException; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.exception.EntityExistException; +import org.nl.modules.common.utils.FileUtil; +import org.nl.modules.common.utils.QueryHelp; +import org.nl.modules.common.utils.RedisUtils; +import org.nl.modules.common.utils.ValidationUtil; import org.nl.modules.system.domain.Menu; import org.nl.modules.system.domain.Role; import org.nl.modules.system.domain.User; @@ -33,10 +37,6 @@ import org.nl.modules.system.service.dto.MenuDto; import org.nl.modules.system.service.dto.MenuQueryCriteria; import org.nl.modules.system.service.dto.RoleSmallDto; import org.nl.modules.system.service.mapstruct.MenuMapper; -import org.nl.utils.FileUtil; -import org.nl.utils.QueryHelp; -import org.nl.utils.RedisUtils; -import org.nl.utils.ValidationUtil; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.Cacheable; import org.springframework.data.domain.Sort; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/MonitorServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/MonitorServiceImpl.java index 9d03fedef..1ab7a9f2e 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/MonitorServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/MonitorServiceImpl.java @@ -17,10 +17,10 @@ package org.nl.modules.system.service.impl; import cn.hutool.core.date.BetweenFormatter; import cn.hutool.core.date.DateUtil; +import org.nl.modules.common.utils.ElAdminConstant; +import org.nl.modules.common.utils.FileUtil; +import org.nl.modules.common.utils.StringUtils; import org.nl.modules.system.service.MonitorService; -import org.nl.utils.ElAdminConstant; -import org.nl.utils.FileUtil; -import org.nl.utils.StringUtils; import org.springframework.stereotype.Service; import oshi.SystemInfo; import oshi.hardware.CentralProcessor; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/ParamServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/ParamServiceImpl.java index 4bbfab01e..49b2f1785 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/ParamServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/ParamServiceImpl.java @@ -8,11 +8,11 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.exception.BadRequestException; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.FileUtil; +import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.system.service.ParamService; import org.nl.modules.system.service.dto.ParamDto; -import org.nl.utils.FileUtil; -import org.nl.utils.SecurityUtils; import org.nl.wql.core.bean.ResultBean; import org.nl.wql.core.bean.WQLObject; import org.nl.wql.util.WqlUtil; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/RoleServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/RoleServiceImpl.java index 22e335927..db05c018a 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/RoleServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/RoleServiceImpl.java @@ -20,8 +20,9 @@ import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; -import org.nl.exception.BadRequestException; -import org.nl.exception.EntityExistException; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.exception.EntityExistException; +import org.nl.modules.common.utils.*; import org.nl.modules.system.domain.Role; import org.nl.modules.system.domain.User; import org.nl.modules.system.repository.RoleRepository; @@ -33,7 +34,6 @@ import org.nl.modules.system.service.dto.RoleSmallDto; import org.nl.modules.system.service.dto.UserDto; import org.nl.modules.system.service.mapstruct.RoleMapper; import org.nl.modules.system.service.mapstruct.RoleSmallMapper; -import org.nl.utils.*; import org.nl.wql.WQL; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.Cacheable; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java index 5bbbc2354..60667b2dd 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java @@ -17,9 +17,10 @@ package org.nl.modules.system.service.impl; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; -import org.nl.config.FileProperties; -import org.nl.exception.EntityExistException; -import org.nl.exception.EntityNotFoundException; +import org.nl.modules.common.config.FileProperties; +import org.nl.modules.common.exception.EntityExistException; +import org.nl.modules.common.exception.EntityNotFoundException; +import org.nl.modules.common.utils.*; import org.nl.modules.security.satoken.utils.FlushSessionUtil; import org.nl.modules.security.service.OnlineUserService; import org.nl.modules.system.domain.User; @@ -31,7 +32,6 @@ import org.nl.modules.system.service.dto.RoleSmallDto; import org.nl.modules.system.service.dto.UserDto; import org.nl.modules.system.service.dto.UserQueryCriteria; import org.nl.modules.system.service.mapstruct.UserMapper; -import org.nl.utils.*; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.Cacheable; import org.springframework.data.domain.Page; diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/DeptMapper.java b/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/DeptMapper.java index 2d91a1e87..f59b53d2a 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/DeptMapper.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/DeptMapper.java @@ -15,11 +15,11 @@ */ package org.nl.modules.system.service.mapstruct; -import org.nl.base.BaseMapper; -import org.nl.modules.system.domain.Dept; -import org.nl.modules.system.service.dto.DeptDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; +import org.nl.modules.common.base.BaseMapper; +import org.nl.modules.system.domain.Dept; +import org.nl.modules.system.service.dto.DeptDto; /** * @author Zheng Jie diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/DeptSmallMapper.java b/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/DeptSmallMapper.java index 4f4a45a48..443be1445 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/DeptSmallMapper.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/DeptSmallMapper.java @@ -15,11 +15,11 @@ */ package org.nl.modules.system.service.mapstruct; -import org.nl.base.BaseMapper; -import org.nl.modules.system.domain.Dept; -import org.nl.modules.system.service.dto.DeptSmallDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; +import org.nl.modules.common.base.BaseMapper; +import org.nl.modules.system.domain.Dept; +import org.nl.modules.system.service.dto.DeptSmallDto; /** * @author Zheng Jie diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/DictDetailMapper.java b/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/DictDetailMapper.java index 5fcc4f9b5..cbab093f9 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/DictDetailMapper.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/DictDetailMapper.java @@ -15,11 +15,11 @@ */ package org.nl.modules.system.service.mapstruct; -import org.nl.base.BaseMapper; -import org.nl.modules.system.domain.DictDetail; -import org.nl.modules.system.service.dto.DictDetailDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; +import org.nl.modules.common.base.BaseMapper; +import org.nl.modules.system.domain.DictDetail; +import org.nl.modules.system.service.dto.DictDetailDto; /** * @author Zheng Jie diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/DictMapper.java b/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/DictMapper.java index eebf1130b..03f167f10 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/DictMapper.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/DictMapper.java @@ -15,11 +15,12 @@ */ package org.nl.modules.system.service.mapstruct; -import org.nl.base.BaseMapper; -import org.nl.modules.system.domain.Dict; -import org.nl.modules.system.service.dto.DictDto; + import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; +import org.nl.modules.common.base.BaseMapper; +import org.nl.modules.system.domain.Dict; +import org.nl.modules.system.service.dto.DictDto; /** * @author Zheng Jie diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/DictSmallMapper.java b/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/DictSmallMapper.java index aa0a7399f..65432fbb0 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/DictSmallMapper.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/DictSmallMapper.java @@ -15,11 +15,11 @@ */ package org.nl.modules.system.service.mapstruct; -import org.nl.base.BaseMapper; -import org.nl.modules.system.domain.Dict; -import org.nl.modules.system.service.dto.DictSmallDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; +import org.nl.modules.common.base.BaseMapper; +import org.nl.modules.system.domain.Dict; +import org.nl.modules.system.service.dto.DictSmallDto; /** * @author Zheng Jie diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/JobMapper.java b/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/JobMapper.java index 23a513fcc..aeea1114b 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/JobMapper.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/JobMapper.java @@ -15,11 +15,11 @@ */ package org.nl.modules.system.service.mapstruct; -import org.nl.base.BaseMapper; -import org.nl.modules.system.domain.Job; -import org.nl.modules.system.service.dto.JobDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; +import org.nl.modules.common.base.BaseMapper; +import org.nl.modules.system.domain.Job; +import org.nl.modules.system.service.dto.JobDto; /** * @author Zheng Jie diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/JobSmallMapper.java b/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/JobSmallMapper.java index 299edd11b..0bed4b265 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/JobSmallMapper.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/JobSmallMapper.java @@ -15,11 +15,11 @@ */ package org.nl.modules.system.service.mapstruct; -import org.nl.base.BaseMapper; -import org.nl.modules.system.domain.Job; -import org.nl.modules.system.service.dto.JobSmallDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; +import org.nl.modules.common.base.BaseMapper; +import org.nl.modules.system.domain.Job; +import org.nl.modules.system.service.dto.JobSmallDto; /** * @author Zheng Jie diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/MenuMapper.java b/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/MenuMapper.java index 671b392f0..7827d46e3 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/MenuMapper.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/MenuMapper.java @@ -15,11 +15,11 @@ */ package org.nl.modules.system.service.mapstruct; -import org.nl.base.BaseMapper; -import org.nl.modules.system.domain.Menu; -import org.nl.modules.system.service.dto.MenuDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; +import org.nl.modules.common.base.BaseMapper; +import org.nl.modules.system.domain.Menu; +import org.nl.modules.system.service.dto.MenuDto; /** * @author Zheng Jie diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/RoleMapper.java b/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/RoleMapper.java index 372007532..ced4c664d 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/RoleMapper.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/RoleMapper.java @@ -15,11 +15,11 @@ */ package org.nl.modules.system.service.mapstruct; -import org.nl.base.BaseMapper; -import org.nl.modules.system.domain.Role; -import org.nl.modules.system.service.dto.RoleDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; +import org.nl.modules.common.base.BaseMapper; +import org.nl.modules.system.domain.Role; +import org.nl.modules.system.service.dto.RoleDto; /** * @author Zheng Jie diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/RoleSmallMapper.java b/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/RoleSmallMapper.java index 08ef037c1..25dba93ed 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/RoleSmallMapper.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/RoleSmallMapper.java @@ -15,11 +15,11 @@ */ package org.nl.modules.system.service.mapstruct; -import org.nl.base.BaseMapper; -import org.nl.modules.system.domain.Role; -import org.nl.modules.system.service.dto.RoleSmallDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; +import org.nl.modules.common.base.BaseMapper; +import org.nl.modules.system.domain.Role; +import org.nl.modules.system.service.dto.RoleSmallDto; /** * @author Zheng Jie diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/UserMapper.java b/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/UserMapper.java index 6da024fc9..82af1f5e3 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/UserMapper.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/mapstruct/UserMapper.java @@ -15,11 +15,11 @@ */ package org.nl.modules.system.service.mapstruct; -import org.nl.base.BaseMapper; -import org.nl.modules.system.domain.User; -import org.nl.modules.system.service.dto.UserDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; +import org.nl.modules.common.base.BaseMapper; +import org.nl.modules.system.domain.User; +import org.nl.modules.system.service.dto.UserDto; /** * @author Zheng Jie diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/vo/IdempotentRedisDAO.java b/nladmin-system/src/main/java/org/nl/modules/system/service/vo/IdempotentRedisDAO.java deleted file mode 100644 index 41ea9c562..000000000 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/vo/IdempotentRedisDAO.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.nl.modules.system.service.vo; - -import lombok.AllArgsConstructor; -import org.nl.modules.system.service.entity.RedisKeyDefine; -import org.springframework.data.redis.core.StringRedisTemplate; - -import java.util.concurrent.TimeUnit; - -import static org.nl.modules.system.service.entity.RedisKeyDefine.KeyTypeEnum.STRING; - -/** - * @Author: lyd - * @Description: 幂等操作 - * @Date: 2022-08-04 - */ -//@AllArgsConstructor -//public class IdempotentRedisDAO { -// -// private static final RedisKeyDefine IDEMPOTENT = new RedisKeyDefine("幂等操作", -// "idempotent:%s", // 参数为 uuid -// STRING, String.class, RedisKeyDefine.TimeoutTypeEnum.DYNAMIC); -// -// private final StringRedisTemplate redisTemplate; -// -// public Boolean setIfAbsent(String key, long timeout, TimeUnit timeUnit) { -// String redisKey = formatKey(key); -// return redisTemplate.opsForValue().setIfAbsent(redisKey, "", timeout, timeUnit); -// } -// -// private static String formatKey(String key) { -// return String.format(IDEMPOTENT.getKeyTemplate(), key); -// } -// -//} - diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/vo/YudaoIdempotentConfiguration.java b/nladmin-system/src/main/java/org/nl/modules/system/service/vo/YudaoIdempotentConfiguration.java deleted file mode 100644 index 7681d11df..000000000 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/vo/YudaoIdempotentConfiguration.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.nl.modules.system.service.vo; - -import org.nl.config.RedisConfig; -import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.core.StringRedisTemplate; - -/** - * @Author: lyd - * @Description: 测试的Redistemplate模板 - * @Date: 2022-08-04 - */ -//@Configuration(proxyBeanMethods = false) -//@AutoConfigureAfter(RedisConfig.class) -//public class YudaoIdempotentConfiguration { -// @Bean -// public IdempotentRedisDAO idempotentRedisDAO(StringRedisTemplate stringRedisTemplate) { -// return new IdempotentRedisDAO(stringRedisTemplate); -// } -//} diff --git a/nladmin-tools/src/main/java/org/nl/config/MultipartConfig.java b/nladmin-system/src/main/java/org/nl/modules/tools/config/MultipartConfig.java similarity index 97% rename from nladmin-tools/src/main/java/org/nl/config/MultipartConfig.java rename to nladmin-system/src/main/java/org/nl/modules/tools/config/MultipartConfig.java index 2e3ad45cb..ec352f61e 100644 --- a/nladmin-tools/src/main/java/org/nl/config/MultipartConfig.java +++ b/nladmin-system/src/main/java/org/nl/modules/tools/config/MultipartConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.config; +package org.nl.modules.tools.config; import org.springframework.boot.web.servlet.MultipartConfigFactory; import org.springframework.context.annotation.Bean; diff --git a/nladmin-tools/src/main/java/org/nl/domain/LocalStorage.java b/nladmin-system/src/main/java/org/nl/modules/tools/domain/LocalStorage.java similarity index 92% rename from nladmin-tools/src/main/java/org/nl/domain/LocalStorage.java rename to nladmin-system/src/main/java/org/nl/modules/tools/domain/LocalStorage.java index 4e3b099b4..b9e535ec1 100644 --- a/nladmin-tools/src/main/java/org/nl/domain/LocalStorage.java +++ b/nladmin-system/src/main/java/org/nl/modules/tools/domain/LocalStorage.java @@ -13,13 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.domain; +package org.nl.modules.tools.domain; -import io.swagger.annotations.ApiModelProperty; -import lombok.*; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import org.nl.base.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.nl.modules.common.base.BaseEntity; import javax.persistence.*; import java.io.Serializable; diff --git a/nladmin-tools/src/main/java/org/nl/repository/LocalStorageRepository.java b/nladmin-system/src/main/java/org/nl/modules/tools/repository/LocalStorageRepository.java similarity index 90% rename from nladmin-tools/src/main/java/org/nl/repository/LocalStorageRepository.java rename to nladmin-system/src/main/java/org/nl/modules/tools/repository/LocalStorageRepository.java index 018ed7eb3..3278bdcce 100644 --- a/nladmin-tools/src/main/java/org/nl/repository/LocalStorageRepository.java +++ b/nladmin-system/src/main/java/org/nl/modules/tools/repository/LocalStorageRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.repository; +package org.nl.modules.tools.repository; -import org.nl.domain.LocalStorage; +import org.nl.modules.tools.domain.LocalStorage; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/nladmin-tools/src/main/java/org/nl/rest/LocalStorageController.java b/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java similarity index 90% rename from nladmin-tools/src/main/java/org/nl/rest/LocalStorageController.java rename to nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java index 6c38935e3..8d7d93625 100644 --- a/nladmin-tools/src/main/java/org/nl/rest/LocalStorageController.java +++ b/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.rest; +package org.nl.modules.tools.rest; import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.nl.annotation.Log; -import org.nl.domain.LocalStorage; -import org.nl.exception.BadRequestException; -import org.nl.service.LocalStorageService; -import org.nl.service.dto.LocalStorageQueryCriteria; -import org.nl.utils.FileUtil; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.FileUtil; +import org.nl.modules.logging.annotation.Log; +import org.nl.modules.tools.domain.LocalStorage; +import org.nl.modules.tools.service.LocalStorageService; +import org.nl.modules.tools.service.dto.LocalStorageQueryCriteria; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/nladmin-tools/src/main/java/org/nl/service/LocalStorageService.java b/nladmin-system/src/main/java/org/nl/modules/tools/service/LocalStorageService.java similarity index 90% rename from nladmin-tools/src/main/java/org/nl/service/LocalStorageService.java rename to nladmin-system/src/main/java/org/nl/modules/tools/service/LocalStorageService.java index 072047799..63ee0aeba 100644 --- a/nladmin-tools/src/main/java/org/nl/service/LocalStorageService.java +++ b/nladmin-system/src/main/java/org/nl/modules/tools/service/LocalStorageService.java @@ -13,13 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.service; +package org.nl.modules.tools.service; -import org.nl.domain.LocalStorage; -import org.nl.service.dto.LocalStorageDto; -import org.nl.service.dto.LocalStorageQueryCriteria; + +import org.nl.modules.tools.domain.LocalStorage; +import org.nl.modules.tools.service.dto.LocalStorageDto; +import org.nl.modules.tools.service.dto.LocalStorageQueryCriteria; import org.springframework.data.domain.Pageable; import org.springframework.web.multipart.MultipartFile; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; diff --git a/nladmin-tools/src/main/java/org/nl/service/dto/LocalStorageDto.java b/nladmin-system/src/main/java/org/nl/modules/tools/service/dto/LocalStorageDto.java similarity index 91% rename from nladmin-tools/src/main/java/org/nl/service/dto/LocalStorageDto.java rename to nladmin-system/src/main/java/org/nl/modules/tools/service/dto/LocalStorageDto.java index 6fcd17e1d..264a284f0 100644 --- a/nladmin-tools/src/main/java/org/nl/service/dto/LocalStorageDto.java +++ b/nladmin-system/src/main/java/org/nl/modules/tools/service/dto/LocalStorageDto.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.service.dto; +package org.nl.modules.tools.service.dto; import lombok.Getter; import lombok.Setter; -import org.nl.base.BaseDTO; +import org.nl.modules.common.base.BaseDTO; import java.io.Serializable; diff --git a/nladmin-tools/src/main/java/org/nl/service/dto/LocalStorageQueryCriteria.java b/nladmin-system/src/main/java/org/nl/modules/tools/service/dto/LocalStorageQueryCriteria.java similarity index 91% rename from nladmin-tools/src/main/java/org/nl/service/dto/LocalStorageQueryCriteria.java rename to nladmin-system/src/main/java/org/nl/modules/tools/service/dto/LocalStorageQueryCriteria.java index 8217681a6..00cc53072 100644 --- a/nladmin-tools/src/main/java/org/nl/service/dto/LocalStorageQueryCriteria.java +++ b/nladmin-system/src/main/java/org/nl/modules/tools/service/dto/LocalStorageQueryCriteria.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.service.dto; +package org.nl.modules.tools.service.dto; import lombok.Data; +import org.nl.modules.common.annotation.Query; + import java.sql.Timestamp; import java.util.List; -import org.nl.annotation.Query; /** * @author Zheng Jie diff --git a/nladmin-tools/src/main/java/org/nl/service/impl/LocalStorageServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java similarity index 87% rename from nladmin-tools/src/main/java/org/nl/service/impl/LocalStorageServiceImpl.java rename to nladmin-system/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java index 93078aff0..fdb1cb450 100644 --- a/nladmin-tools/src/main/java/org/nl/service/impl/LocalStorageServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java @@ -13,32 +13,36 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.service.impl; +package org.nl.modules.tools.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; -import org.nl.config.FileProperties; -import org.nl.domain.LocalStorage; -import org.nl.service.dto.LocalStorageDto; -import org.nl.service.dto.LocalStorageQueryCriteria; -import org.nl.service.mapstruct.LocalStorageMapper; -import org.nl.exception.BadRequestException; -import org.nl.repository.LocalStorageRepository; -import org.nl.service.LocalStorageService; -import org.nl.utils.*; +import org.nl.modules.common.config.FileProperties; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.FileUtil; +import org.nl.modules.common.utils.PageUtil; +import org.nl.modules.common.utils.QueryHelp; +import org.nl.modules.common.utils.ValidationUtil; +import org.nl.modules.tools.domain.LocalStorage; +import org.nl.modules.tools.repository.LocalStorageRepository; +import org.nl.modules.tools.service.LocalStorageService; +import org.nl.modules.tools.service.dto.LocalStorageDto; +import org.nl.modules.tools.service.dto.LocalStorageQueryCriteria; +import org.nl.modules.tools.service.mapstruct.LocalStorageMapper; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletResponse; /** * @author Zheng Jie diff --git a/nladmin-tools/src/main/java/org/nl/service/mapstruct/LocalStorageMapper.java b/nladmin-system/src/main/java/org/nl/modules/tools/service/mapstruct/LocalStorageMapper.java similarity index 81% rename from nladmin-tools/src/main/java/org/nl/service/mapstruct/LocalStorageMapper.java rename to nladmin-system/src/main/java/org/nl/modules/tools/service/mapstruct/LocalStorageMapper.java index 0874a60f0..f1b3b6984 100644 --- a/nladmin-tools/src/main/java/org/nl/service/mapstruct/LocalStorageMapper.java +++ b/nladmin-system/src/main/java/org/nl/modules/tools/service/mapstruct/LocalStorageMapper.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.service.mapstruct; +package org.nl.modules.tools.service.mapstruct; + -import org.nl.base.BaseMapper; -import org.nl.service.dto.LocalStorageDto; -import org.nl.domain.LocalStorage; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; +import org.nl.modules.common.base.BaseMapper; +import org.nl.modules.tools.domain.LocalStorage; +import org.nl.modules.tools.service.dto.LocalStorageDto; /** * @author Zheng Jie diff --git a/nladmin-system/src/main/java/org/nl/start/CodeRuledetail.java b/nladmin-system/src/main/java/org/nl/start/CodeRuledetail.java index 130982eef..f90944786 100644 --- a/nladmin-system/src/main/java/org/nl/start/CodeRuledetail.java +++ b/nladmin-system/src/main/java/org/nl/start/CodeRuledetail.java @@ -1,16 +1,20 @@ package org.nl.start; -import lombok.Data; import cn.hutool.core.bean.BeanUtil; -import io.swagger.annotations.ApiModelProperty; import cn.hutool.core.bean.copier.CopyOptions; -import org.nl.base.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.nl.modules.common.base.BaseEntity; -import javax.persistence.*; -import javax.validation.constraints.*; -import java.math.BigDecimal; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.math.BigDecimal; /** * @description / diff --git a/nladmin-system/src/main/java/org/nl/start/Init.java b/nladmin-system/src/main/java/org/nl/start/Init.java index 728bc2d31..62570b1d2 100644 --- a/nladmin-system/src/main/java/org/nl/start/Init.java +++ b/nladmin-system/src/main/java/org/nl/start/Init.java @@ -11,8 +11,8 @@ import org.nl.modules.quartz.utils.QuartzManage; import org.nl.modules.system.service.impl.ParamServiceImpl; import org.nl.start.auto.initial.ApplicationAutoInitialExecuter; import org.nl.start.auto.initial.WebAutoInitialExecuter; -import org.nl.utils.SpringContextHolder; import org.nl.wql.WQLCore; +import org.nl.wql.util.SpringContextHolder; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; diff --git a/nladmin-system/src/main/java/org/nl/start/auto/run/AutoRunServiceImpl.java b/nladmin-system/src/main/java/org/nl/start/auto/run/AutoRunServiceImpl.java index 4140e974a..02b8e5442 100644 --- a/nladmin-system/src/main/java/org/nl/start/auto/run/AutoRunServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/start/auto/run/AutoRunServiceImpl.java @@ -4,8 +4,8 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; -import org.nl.exception.WDKException; import org.nl.start.auto.initial.ApplicationAutoInitial; +import org.nl.wql.exception.WDKException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/nladmin-tools/pom.xml b/nladmin-tools/pom.xml deleted file mode 100644 index c335aff7b..000000000 --- a/nladmin-tools/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - nladmin - org.nl - 2.6 - - 4.0.0 - - nladmin-tools - 工具模块 - - - 1.4.7 - [7.2.0, 7.2.99] - 4.9.153.ALL - - - - - - org.nl - nladmin-logging - 2.6 - - - - - javax.mail - mail - ${mail.version} - - - - - com.qiniu - qiniu-java-sdk - ${qiniu.version} - - - - - com.alipay.sdk - alipay-sdk-java - ${alipay.version} - - - - - - - - - nexus - - nexus - http://121.40.234.130:8081/repository/maven-releases/ - - - - diff --git a/nladmin-wql/pom.xml b/nladmin-wql/pom.xml index 0c5eee660..aca79f26d 100644 --- a/nladmin-wql/pom.xml +++ b/nladmin-wql/pom.xml @@ -20,18 +20,23 @@ 2.4 jdk15 --> - com.hynnet jxl 2.6.12.1 - - org.nl - nladmin-logging - 2.6 - compile - + + + + + + + + + + + + commons-beanutils commons-beanutils-core diff --git a/nladmin-wql/src/main/java/org/nl/wql/WQLCore.java b/nladmin-wql/src/main/java/org/nl/wql/WQLCore.java index 15341a3e6..b2701763f 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/WQLCore.java +++ b/nladmin-wql/src/main/java/org/nl/wql/WQLCore.java @@ -6,11 +6,11 @@ import com.alibaba.fastjson.JSONObject; import jxl.Sheet; import jxl.Workbook; import lombok.extern.slf4j.Slf4j; -import org.nl.utils.SpringContextHolder; import org.nl.wql.core.bean.*; import org.nl.wql.core.db.DBConnBean; import org.nl.wql.core.engine.WQLEngine; import org.nl.wql.core.engine.object.WO; +import org.nl.wql.util.SpringContextHolder; import org.nl.wql.util.WqlUtil; import org.springframework.core.io.Resource; import org.springframework.core.io.support.ResourcePatternResolver; diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLData.java b/nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLData.java index 2a2c168c3..34a17061f 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLData.java +++ b/nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLData.java @@ -1,17 +1,17 @@ package org.nl.wql.core.bean; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; - import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.apache.commons.beanutils.BasicDynaBean; import org.apache.commons.beanutils.DynaProperty; -import org.nl.exception.WDKException; +import org.nl.wql.exception.WDKException; import org.nl.wql.util.WqlUtil; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; + public class WQLData { diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLObject.java b/nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLObject.java index 6b81efdcf..9a1e73755 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLObject.java +++ b/nladmin-wql/src/main/java/org/nl/wql/core/bean/WQLObject.java @@ -5,11 +5,11 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.apache.commons.beanutils.BasicDynaBean; -import org.nl.exception.WDKException; import org.nl.wql.WQLCore; import org.nl.wql.core.content.BaseContext; import org.nl.wql.core.engine.WQLFun; import org.nl.wql.core.engine.object.WO; +import org.nl.wql.exception.WDKException; import org.nl.wql.util.WqlUtil; import java.io.Serializable; diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/db/DBConnection.java b/nladmin-wql/src/main/java/org/nl/wql/core/db/DBConnection.java index 2f0f55b85..56399cce3 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/db/DBConnection.java +++ b/nladmin-wql/src/main/java/org/nl/wql/core/db/DBConnection.java @@ -1,14 +1,12 @@ package org.nl.wql.core.db; -import java.sql.Connection; - -import javax.sql.DataSource; - import lombok.extern.slf4j.Slf4j; -import org.nl.utils.SpringContextHolder; +import org.nl.wql.WQLCore; +import org.nl.wql.util.SpringContextHolder; import org.springframework.jdbc.datasource.DataSourceUtils; -import org.nl.wql.WQLCore; +import javax.sql.DataSource; +import java.sql.Connection; @Slf4j public class DBConnection { diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/db/DBPoolSpring.java b/nladmin-wql/src/main/java/org/nl/wql/core/db/DBPoolSpring.java index f9d94f9bf..816853699 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/db/DBPoolSpring.java +++ b/nladmin-wql/src/main/java/org/nl/wql/core/db/DBPoolSpring.java @@ -1,8 +1,8 @@ package org.nl.wql.core.db; import lombok.extern.slf4j.Slf4j; -import org.nl.utils.SpringContextHolder; import org.nl.wql.WQLCore; +import org.nl.wql.util.SpringContextHolder; import org.springframework.jdbc.datasource.DataSourceUtils; import javax.naming.Context; diff --git a/nladmin-wql/src/main/java/org/nl/wql/core/engine/object/WO.java b/nladmin-wql/src/main/java/org/nl/wql/core/engine/object/WO.java index cac1cde5e..ae3862e59 100644 --- a/nladmin-wql/src/main/java/org/nl/wql/core/engine/object/WO.java +++ b/nladmin-wql/src/main/java/org/nl/wql/core/engine/object/WO.java @@ -16,8 +16,6 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; -import org.nl.exception.WDKException; -import org.nl.utils.SpringContextHolder; import org.nl.wql.WQLCore; import org.nl.wql.core.DataType; import org.nl.wql.core.bean.ErrorBean; @@ -28,6 +26,8 @@ import org.nl.wql.core.content.HttpContext; import org.nl.wql.core.db.DBConnBean; import org.nl.wql.core.db.DBConnection; import org.nl.wql.core.engine.Syntax; +import org.nl.wql.exception.WDKException; +import org.nl.wql.util.SpringContextHolder; import org.nl.wql.util.WqlUtil; import javax.servlet.http.HttpServletRequest; @@ -35,7 +35,10 @@ import java.io.Serializable; import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; @Slf4j public class WO implements Serializable, Cloneable { diff --git a/nladmin-wql/src/main/java/org/nl/wql/exception/WDKException.java b/nladmin-wql/src/main/java/org/nl/wql/exception/WDKException.java new file mode 100644 index 000000000..20a677328 --- /dev/null +++ b/nladmin-wql/src/main/java/org/nl/wql/exception/WDKException.java @@ -0,0 +1,54 @@ +package org.nl.wql.exception; + +public class WDKException extends RuntimeException { + private static final long serialVersionUID = 9059634125483898385L; + private String code; + private String desc; + private String message = ""; + + public WDKException() { + } + + public WDKException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { + super(message, cause); + this.message = message; + } + + public WDKException(String message, Throwable cause) { + super(message, cause); + this.message = message; + } + + public WDKException(String message) { + super(message); + this.message = message; + } + + public WDKException(Throwable cause) { + super(cause); + } + + public String getCode() { + return this.code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getDesc() { + return this.desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } + + public String getMessage() { + return this.message; + } + + public void setMessage(String message) { + this.message = message; + } +} \ No newline at end of file diff --git a/nladmin-common/src/main/java/org/nl/utils/CallBack.java b/nladmin-wql/src/main/java/org/nl/wql/util/CallBack.java similarity index 97% rename from nladmin-common/src/main/java/org/nl/utils/CallBack.java rename to nladmin-wql/src/main/java/org/nl/wql/util/CallBack.java index dbd992e79..f0d5c0636 100644 --- a/nladmin-common/src/main/java/org/nl/utils/CallBack.java +++ b/nladmin-wql/src/main/java/org/nl/wql/util/CallBack.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.nl.utils; +package org.nl.wql.util; /** * @author: liaojinlong diff --git a/nladmin-common/src/main/java/org/nl/utils/SpringContextHolder.java b/nladmin-wql/src/main/java/org/nl/wql/util/SpringContextHolder.java similarity index 99% rename from nladmin-common/src/main/java/org/nl/utils/SpringContextHolder.java rename to nladmin-wql/src/main/java/org/nl/wql/util/SpringContextHolder.java index 0d9a2e570..2694c411c 100644 --- a/nladmin-common/src/main/java/org/nl/utils/SpringContextHolder.java +++ b/nladmin-wql/src/main/java/org/nl/wql/util/SpringContextHolder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.utils; +package org.nl.wql.util; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeansException; diff --git a/pom.xml b/pom.xml index 0219a4994..5638fb830 100644 --- a/pom.xml +++ b/pom.xml @@ -11,11 +11,7 @@ - nladmin-common - nladmin-logging nladmin-system - nladmin-tools - nladmin-generator nladmin-wql @@ -39,9 +35,16 @@ 2.5.0 1.3.1.Final 1.31.0 + 5.7.14 + + + cn.hutool + hutool-all + ${hutool.version} + org.springframework.boot