root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

模块整改

Browse Source
This commit is contained in:
lyd
2022-09-23 17:11:09 +08:00
parent 9adb01e9c3
commit 67ff316bdf
190 changed files with 630 additions and 898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
nladmin-common/pom.xml
View File

@@ -1,44 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>nladmin</artifactId>
<groupId>org.nl</groupId>
<version>2.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>
<hutool.version>5.7.14</hutool.version>
</properties>
<!--hutool 5.3.4-->
<artifactId>nladmin-common</artifactId>
<name>公共模块</name>
<dependencies>
<!--工具包-->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>${hutool.version}</version>
</dependency>
</dependencies>
<distributionManagement>
<!--正式版本-->
<repository>
<!-- nexus服务器中用户名：在settings.xml中<server>的id-->
<id>nexus</id>
<!-- 这个名称自己定义 -->
<name>nexus</name>
<url>http://121.40.234.130:8081/repository/maven-releases/</url>
</repository>
<!--快照
<snapshotRepository>
<id>nexus-snapshots</id>
<name>Snapshots repository</name>
<url>http://192.168.1.105/repository/yang/</url>
</snapshotRepository>-->
</distributionManagement>
</project>

54
nladmin-common/src/main/java/org/nl/exception/WDKException.java
View File

@@ -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;
}
}

26
nladmin-common/src/test/java/org/nl/utils/DateUtilsTest.java
View File

@@ -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));
}
}

31
nladmin-common/src/test/java/org/nl/utils/EncryptUtilsTest.java
View File

@@ -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();
}
}
}

36
nladmin-common/src/test/java/org/nl/utils/FileUtilTest.java
View File

@@ -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));
}
}

44
nladmin-common/src/test/java/org/nl/utils/StringUtilsTest.java
View File

@@ -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()));
}
}*/

56
nladmin-generator/pom.xml
View File

@@ -1,56 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>nladmin</artifactId>
<groupId>org.nl</groupId>
<version>2.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>nladmin-generator</artifactId>
<name>代码生成模块</name>
<properties>
<configuration.version>1.9</configuration.version>
</properties>
<dependencies>
<dependency>
<groupId>org.nl</groupId>
<artifactId>nladmin-common</artifactId>
<version>2.6</version>
</dependency>
<!--模板引擎-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-freemarker</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/commons-configuration/commons-configuration -->
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>${configuration.version}</version>
</dependency>
</dependencies>
<distributionManagement>
<!--正式版本-->
<repository>
<!-- nexus服务器中用户名：在settings.xml中<server>的id-->
<id>nexus</id>
<!-- 这个名称自己定义 -->
<name>nexus</name>
<url>http://121.40.234.130:8081/repository/maven-releases/</url>
</repository>
<!--快照
<snapshotRepository>
<id>nexus-snapshots</id>
<name>Snapshots repository</name>
<url>http://192.168.1.105/repository/yang/</url>
</snapshotRepository>-->
</distributionManagement>
</project>

22
nladmin-logging/pom.xml
View File

@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>nladmin</artifactId>
<groupId>org.nl</groupId>
<version>2.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>nladmin-logging</artifactId>
<name>日志模块</name>
<dependencies>
<dependency>
<groupId>org.nl</groupId>
<artifactId>nladmin-common</artifactId>
<version>2.6</version>
</dependency>
</dependencies>
</project>

67
nladmin-system/pom.xml
View File

@@ -16,10 +16,41 @@
<jjwt.version>0.11.1</jjwt.version>
<!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 -->
<jna.version>5.5.0</jna.version>
<configuration.version>1.9</configuration.version>
</properties>
<dependencies>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.9.2</version>
</dependency>
<!--接口限流-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>29.0-jre</version>
</dependency>
<!--模板引擎-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-freemarker</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/commons-configuration/commons-configuration -->
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>${configuration.version}</version>
</dependency>
<!-- ****************** -->
<dependency>
<groupId>com.alicp.jetcache</groupId>
<artifactId>jetcache-starter-redis</artifactId>
@@ -38,28 +69,9 @@
<version>11.2.0.4</version>
</dependency>
<!-- 代码生成模块 -->
<dependency>
<groupId>org.nl</groupId>
<artifactId>nladmin-generator</artifactId>
<version>2.6</version>
<exclusions>
<exclusion>
<groupId>org.nl</groupId>
<artifactId>nladmin-common</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- https://www.jianshu.com/p/e40d111c7bfc?utm_source=oschina-app 热部署 https://zhuanlan.zhihu.com/p/63381268-->
<!-- tools 模块包含了 common 和 logging 模块 -->
<dependency>
<groupId>org.nl</groupId>
<artifactId>nladmin-tools</artifactId>
<version>2.6</version>
</dependency>
<!-- Spring boot websocket -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -109,6 +121,23 @@
</dependency>
</dependencies>
<distributionManagement>
<!--正式版本-->
<repository>
<!-- nexus服务器中用户名：在settings.xml中<server>的id-->
<id>nexus</id>
<!-- 这个名称自己定义 -->
<name>nexus</name>
<url>http://121.40.234.130:8081/repository/maven-releases/</url>
</repository>
<!--快照
<snapshotRepository>
<id>nexus-snapshots</id>
<name>Snapshots repository</name>
<url>http://192.168.1.105/repository/yang/</url>
</snapshotRepository>-->
</distributionManagement>
<!-- 打包 -->
<build>
<plugins>

4
nladmin-system/src/main/java/org/nl/AppRun.java
View File

@@ -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;

1
nladmin-system/src/main/java/org/nl/config/ConfigurerAdapter.java
View File

@@ -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;

3
nladmin-system/src/main/java/org/nl/config/thread/ThreadPoolExecutorUtil.java
View File

@@ -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;

0
nladmin-common/src/main/java/org/nl/annotation/AnonymousAccess.java → nladmin-system/src/main/java/org/nl/modules/common/annotation/AnonymousAccess.java
View File

2
nladmin-common/src/main/java/org/nl/annotation/DataPermission.java → nladmin-system/src/main/java/org/nl/modules/common/annotation/DataPermission.java
View File

@@ -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;

4
nladmin-common/src/main/java/org/nl/annotation/Limit.java → nladmin-system/src/main/java/org/nl/modules/common/annotation/Limit.java
View File

@@ -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;

2
nladmin-common/src/main/java/org/nl/annotation/Query.java → nladmin-system/src/main/java/org/nl/modules/common/annotation/Query.java
View File

@@ -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;

11
nladmin-common/src/main/java/org/nl/annotation/rest/AnonymousDeleteMapping.java → nladmin-system/src/main/java/org/nl/modules/common/annotation/rest/AnonymousDeleteMapping.java
View File

@@ -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.

10
nladmin-common/src/main/java/org/nl/annotation/rest/AnonymousGetMapping.java → nladmin-system/src/main/java/org/nl/modules/common/annotation/rest/AnonymousGetMapping.java
View File

@@ -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.

10
nladmin-common/src/main/java/org/nl/annotation/rest/AnonymousPatchMapping.java → nladmin-system/src/main/java/org/nl/modules/common/annotation/rest/AnonymousPatchMapping.java
View File

@@ -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.

10
nladmin-common/src/main/java/org/nl/annotation/rest/AnonymousPostMapping.java → nladmin-system/src/main/java/org/nl/modules/common/annotation/rest/AnonymousPostMapping.java
View File

@@ -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.

10
nladmin-common/src/main/java/org/nl/annotation/rest/AnonymousPutMapping.java → nladmin-system/src/main/java/org/nl/modules/common/annotation/rest/AnonymousPutMapping.java
View File

@@ -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.

14
nladmin-common/src/main/java/org/nl/aspect/LimitAspect.java → nladmin-system/src/main/java/org/nl/modules/common/aspect/LimitAspect.java
View File

@@ -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;";
}
}

2
nladmin-common/src/main/java/org/nl/aspect/LimitType.java → nladmin-system/src/main/java/org/nl/modules/common/aspect/LimitType.java
View File

@@ -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;
/**
* 限流枚举

3
nladmin-common/src/main/java/org/nl/base/BaseDTO.java → nladmin-system/src/main/java/org/nl/modules/common/base/BaseDTO.java
View File

@@ -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;

5
nladmin-common/src/main/java/org/nl/base/BaseEntity.java → nladmin-system/src/main/java/org/nl/modules/common/base/BaseEntity.java
View File

@@ -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;
/**

2
nladmin-common/src/main/java/org/nl/base/BaseMapper.java → nladmin-system/src/main/java/org/nl/modules/common/base/BaseMapper.java
View File

@@ -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;

2
nladmin-common/src/main/java/org/nl/config/AuditorConfig.java → nladmin-system/src/main/java/org/nl/modules/common/config/AuditorConfig.java
View File

@@ -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;

2
nladmin-common/src/main/java/org/nl/config/ElAdminProperties.java → nladmin-system/src/main/java/org/nl/modules/common/config/ElAdminProperties.java
View File

@@ -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;

2
nladmin-common/src/main/java/org/nl/config/ElPermissionConfig.java → nladmin-system/src/main/java/org/nl/modules/common/config/ElPermissionConfig.java
View File

@@ -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;

4
nladmin-common/src/main/java/org/nl/config/FileProperties.java → nladmin-system/src/main/java/org/nl/modules/common/config/FileProperties.java
View File

@@ -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;

3
nladmin-common/src/main/java/org/nl/config/RedisConfig.java → nladmin-system/src/main/java/org/nl/modules/common/config/RedisConfig.java
View File

@@ -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;

2
nladmin-common/src/main/java/org/nl/config/RsaProperties.java → nladmin-system/src/main/java/org/nl/modules/common/config/RsaProperties.java
View File

@@ -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;

2
nladmin-common/src/main/java/org/nl/config/SwaggerConfig.java → nladmin-system/src/main/java/org/nl/modules/common/config/SwaggerConfig.java
View File

@@ -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;

2
nladmin-common/src/main/java/org/nl/exception/BadConfigurationException.java → nladmin-system/src/main/java/org/nl/modules/common/exception/BadConfigurationException.java
View File

@@ -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;
/**
* 统一关于错误配置信息 异常

3
nladmin-common/src/main/java/org/nl/exception/BadRequestException.java → nladmin-system/src/main/java/org/nl/modules/common/exception/BadRequestException.java
View File

@@ -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;
/**

2
nladmin-common/src/main/java/org/nl/exception/EntityExistException.java → nladmin-system/src/main/java/org/nl/modules/common/exception/EntityExistException.java
View File

@@ -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;

2
nladmin-common/src/main/java/org/nl/exception/EntityNotFoundException.java → nladmin-system/src/main/java/org/nl/modules/common/exception/EntityNotFoundException.java
View File

@@ -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;

3
nladmin-common/src/main/java/org/nl/exception/handler/ApiError.java → nladmin-system/src/main/java/org/nl/modules/common/exception/handler/ApiError.java
View File

@@ -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;
/**

10
nladmin-common/src/main/java/org/nl/exception/handler/GlobalExceptionHandler.java → nladmin-system/src/main/java/org/nl/modules/common/exception/handler/GlobalExceptionHandler.java
View File

@@ -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;

2
nladmin-common/src/main/java/org/nl/utils/CacheKey.java → nladmin-system/src/main/java/org/nl/modules/common/utils/CacheKey.java
View File

@@ -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

2
nladmin-common/src/main/java/org/nl/utils/DateUtil.java → nladmin-system/src/main/java/org/nl/modules/common/utils/DateUtil.java
View File

@@ -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;

2
nladmin-common/src/main/java/org/nl/utils/ElAdminConstant.java → nladmin-system/src/main/java/org/nl/modules/common/utils/ElAdminConstant.java
View File

@@ -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;
/**
* 常用静态常量

2
nladmin-common/src/main/java/org/nl/utils/EncryptUtils.java → nladmin-system/src/main/java/org/nl/modules/common/utils/EncryptUtils.java
View File

@@ -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;

4
nladmin-common/src/main/java/org/nl/utils/FileUtil.java → nladmin-system/src/main/java/org/nl/modules/common/utils/FileUtil.java
View File

@@ -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;

8
nladmin-common/src/main/java/org/nl/utils/PageUtil.java → nladmin-system/src/main/java/org/nl/modules/common/utils/PageUtil.java
View File

@@ -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;
/**
* 分页工具

12
nladmin-common/src/main/java/org/nl/utils/QueryHelp.java → nladmin-system/src/main/java/org/nl/modules/common/utils/QueryHelp.java
View File

@@ -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

7
nladmin-common/src/main/java/org/nl/utils/RedisUtils.java → nladmin-system/src/main/java/org/nl/modules/common/utils/RedisUtils.java
View File

@@ -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.*;

3
nladmin-common/src/main/java/org/nl/utils/RequestHolder.java → nladmin-system/src/main/java/org/nl/modules/common/utils/RequestHolder.java
View File

@@ -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;

3
nladmin-common/src/main/java/org/nl/utils/RsaUtils.java → nladmin-system/src/main/java/org/nl/modules/common/utils/RsaUtils.java
View File

@@ -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;

4
nladmin-common/src/main/java/org/nl/utils/SecurityUtils.java → nladmin-system/src/main/java/org/nl/modules/common/utils/SecurityUtils.java
View File

@@ -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;

5
nladmin-common/src/main/java/org/nl/utils/StringUtils.java → nladmin-system/src/main/java/org/nl/modules/common/utils/StringUtils.java
View File

@@ -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;

2
nladmin-common/src/main/java/org/nl/utils/ThrowableUtil.java → nladmin-system/src/main/java/org/nl/modules/common/utils/ThrowableUtil.java
View File

@@ -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;

3
nladmin-common/src/main/java/org/nl/utils/TranslatorUtil.java → nladmin-system/src/main/java/org/nl/modules/common/utils/TranslatorUtil.java
View File

@@ -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;

4
nladmin-common/src/main/java/org/nl/utils/ValidationUtil.java → nladmin-system/src/main/java/org/nl/modules/common/utils/ValidationUtil.java
View File

@@ -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;
/**
* 验证工具

2
nladmin-common/src/main/java/org/nl/utils/dto/CurrentUser.java → nladmin-system/src/main/java/org/nl/modules/common/utils/dto/CurrentUser.java
View File

@@ -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;

2
nladmin-common/src/main/java/org/nl/utils/enums/CodeBiEnum.java → nladmin-system/src/main/java/org/nl/modules/common/utils/enums/CodeBiEnum.java
View File

@@ -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;

2
nladmin-common/src/main/java/org/nl/utils/enums/CodeEnum.java → nladmin-system/src/main/java/org/nl/modules/common/utils/enums/CodeEnum.java
View File

@@ -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;

2
nladmin-common/src/main/java/org/nl/utils/enums/DataScopeEnum.java → nladmin-system/src/main/java/org/nl/modules/common/utils/enums/DataScopeEnum.java
View File

@@ -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;

2
nladmin-common/src/main/java/org/nl/utils/enums/RequestMethodEnum.java → nladmin-system/src/main/java/org/nl/modules/common/utils/enums/RequestMethodEnum.java
View File

@@ -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;

4
nladmin-generator/src/main/java/org/nl/domain/ColumnInfo.java → nladmin-system/src/main/java/org/nl/modules/generator/domain/ColumnInfo.java
View File

@@ -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;

3
nladmin-generator/src/main/java/org/nl/domain/GenConfig.java → nladmin-system/src/main/java/org/nl/modules/generator/domain/GenConfig.java
View File

@@ -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;

2
nladmin-generator/src/main/java/org/nl/domain/vo/TableInfo.java → nladmin-system/src/main/java/org/nl/modules/generator/domain/vo/TableInfo.java
View File

@@ -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;

5
nladmin-generator/src/main/java/org/nl/repository/ColumnInfoRepository.java → nladmin-system/src/main/java/org/nl/modules/generator/repository/ColumnInfoRepository.java
View File

@@ -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;
/**

4
nladmin-generator/src/main/java/org/nl/repository/GenConfigRepository.java → nladmin-system/src/main/java/org/nl/modules/generator/repository/GenConfigRepository.java
View File

@@ -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;
/**

6
nladmin-generator/src/main/java/org/nl/rest/GenConfigController.java → nladmin-system/src/main/java/org/nl/modules/generator/rest/GenConfigController.java
View File

@@ -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;

13
nladmin-generator/src/main/java/org/nl/rest/GeneratorController.java → nladmin-system/src/main/java/org/nl/modules/generator/rest/GeneratorController.java
View File

@@ -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;

4
nladmin-generator/src/main/java/org/nl/service/GenConfigService.java → nladmin-system/src/main/java/org/nl/modules/generator/service/GenConfigService.java
View File

@@ -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

7
nladmin-generator/src/main/java/org/nl/service/GeneratorService.java → nladmin-system/src/main/java/org/nl/modules/generator/service/GeneratorService.java
View File

@@ -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;

10
nladmin-generator/src/main/java/org/nl/service/impl/GenConfigServiceImpl.java → nladmin-system/src/main/java/org/nl/modules/generator/service/impl/GenConfigServiceImpl.java
View File

@@ -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;
/**

21
nladmin-generator/src/main/java/org/nl/service/impl/GeneratorServiceImpl.java → nladmin-system/src/main/java/org/nl/modules/generator/service/impl/GeneratorServiceImpl.java
View File

@@ -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;

6
nladmin-generator/src/main/java/org/nl/utils/ColUtil.java → nladmin-system/src/main/java/org/nl/modules/generator/utils/ColUtil.java
View File

@@ -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;

16
nladmin-generator/src/main/java/org/nl/utils/GenUtil.java → nladmin-system/src/main/java/org/nl/modules/generator/utils/GenUtil.java
View File

@@ -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;
/**
* 代码生成

2
nladmin-logging/src/main/java/org/nl/annotation/Log.java → nladmin-system/src/main/java/org/nl/modules/logging/annotation/Log.java
View File

@@ -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;

14
nladmin-logging/src/main/java/org/nl/aspect/LogAspect.java → nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java
View File

@@ -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() {
// 该方法无方法体,主要为了让同类中其他方法使用此切入点
}

3
nladmin-logging/src/main/java/org/nl/domain/Log.java → nladmin-system/src/main/java/org/nl/modules/logging/domain/Log.java
View File

@@ -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;

4
nladmin-logging/src/main/java/org/nl/repository/LogRepository.java → nladmin-system/src/main/java/org/nl/modules/logging/repository/LogRepository.java
View File

@@ -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;

10
nladmin-logging/src/main/java/org/nl/rest/LogController.java → nladmin-system/src/main/java/org/nl/modules/logging/rest/LogController.java
View File

@@ -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;

8
nladmin-logging/src/main/java/org/nl/service/LogService.java → nladmin-system/src/main/java/org/nl/modules/logging/service/LogService.java
View File

@@ -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;
/**

3
nladmin-logging/src/main/java/org/nl/service/dto/LogErrorDTO.java → nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogErrorDTO.java
View File

@@ -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;

5
nladmin-logging/src/main/java/org/nl/service/dto/LogQueryCriteria.java → nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogQueryCriteria.java
View File

@@ -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;

3
nladmin-logging/src/main/java/org/nl/service/dto/LogSmallDTO.java → nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogSmallDTO.java
View File

@@ -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;

28
nladmin-logging/src/main/java/org/nl/service/impl/LogServiceImpl.java → nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LogServiceImpl.java
View File

@@ -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() + "()";

8
nladmin-logging/src/main/java/org/nl/service/mapstruct/LogErrorMapper.java → nladmin-system/src/main/java/org/nl/modules/logging/service/mapstruct/LogErrorMapper.java
View File

@@ -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

8
nladmin-logging/src/main/java/org/nl/service/mapstruct/LogSmallMapper.java → nladmin-system/src/main/java/org/nl/modules/logging/service/mapstruct/LogSmallMapper.java
View File

@@ -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

2
nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageController.java
View File

@@ -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;

2
nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageImageController.java
View File

@@ -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;

4
nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageImageServiceImpl.java
View File

@@ -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;

4
nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java
View File

@@ -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;

2
nladmin-system/src/main/java/org/nl/modules/quartz/domain/QuartzJob.java
View File

@@ -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;

7
nladmin-system/src/main/java/org/nl/modules/quartz/rest/QuartzJobController.java
View File

@@ -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;

2
nladmin-system/src/main/java/org/nl/modules/quartz/service/dto/JobQueryCriteria.java
View File

@@ -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;

4
nladmin-system/src/main/java/org/nl/modules/quartz/service/impl/QuartzJobServiceImpl.java
View File

@@ -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;

6
nladmin-system/src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java
View File

@@ -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;

4
nladmin-system/src/main/java/org/nl/modules/quartz/utils/QuartzManage.java
View File

@@ -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;
/**

2
nladmin-system/src/main/java/org/nl/modules/quartz/utils/QuartzRunnable.java
View File

@@ -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;

2
nladmin-system/src/main/java/org/nl/modules/security/config/bean/LoginProperties.java
View File

@@ -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;

18
nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java
View File

@@ -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;

3
nladmin-system/src/main/java/org/nl/modules/security/rest/OnlineController.java
View File

@@ -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;

36
nladmin-system/src/main/java/org/nl/modules/security/satoken/SaTokenConfigure.java
View File

@@ -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("/**");
}
/**

2
nladmin-system/src/main/java/org/nl/modules/security/satoken/StpInterfaceImpl.java
View File

@@ -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;

Some files were not shown because too many files have changed in this diff Show More