This commit is contained in:
六如
2024-12-22 23:09:46 +08:00
parent 02fb5a9e85
commit 403e8111f4
1239 changed files with 4764 additions and 702 deletions

0
.gitignore vendored Normal file → Executable file
View File

0
Dockerfile Normal file → Executable file
View File

0
LICENSE Normal file → Executable file
View File

0
README.md Normal file → Executable file
View File

0
asset/arc.jpg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 72 KiB

After

Width:  |  Height:  |  Size: 72 KiB

49
build-admin.sh Executable file
View File

@@ -0,0 +1,49 @@
# 构建admin, 结果输出在dist/sop-admin目录
# 获取当前路径并赋值给变量 current_path
current_path=$(pwd)
# 打印变量的值,以验证赋值是否成功
echo "当前路径是: $current_path"
# 构建目录
dist_dir="dist"
# 服务端文件夹名称
# 执行文件名称
app_name="sop-admin"
version="5.0"
build_folder="${app_name}-${version}"
# 输出目录
target_dir="$dist_dir/${build_folder}"
server_source=sop-admin/sop-admin-backend/admin-boot
# admin前端路径
front_source=sop-admin/sop-admin-frontend
# ------ 构建前端 ------
echo "开始构建sop-admin前端..."
cd $front_source
sh build.sh
cd $current_path
# ------ 构建后端 ------
echo "开始构建sop-admin服务端..."
mvn clean package -pl $server_source -am -DskipTests
# ------ 复制文件 ------
if [ ! -d "$target_dir" ]; then
mkdir -p $target_dir
fi
rm -rf ${target_dir}/*
# 复制前端资源
echo "复制前端文件到$target_dir"
cp -r ${front_source}/dist ./$target_dir
# 复制服务端资源
cp -r ${server_source}/target/*.jar $target_dir
echo "服务端构建完毕,构建结果在${target_dir}文件夹下"

37
build-gateway.sh Normal file
View File

@@ -0,0 +1,37 @@
# 构建网关
# 获取当前路径并赋值给变量 current_path
current_path=$(pwd)
# 打印变量的值,以验证赋值是否成功
echo "当前路径是: $current_path"
# 构建目录
dist_dir="dist"
# 服务端文件夹名称
# 执行文件名称
app_name="sop-gateway"
version="5.0"
build_folder="${app_name}-${version}"
# 输出目录
target_dir="$dist_dir/${build_folder}"
server_source=sop-gateway
# ------ 构建后端 ------
echo "开始构建sop-gateway..."
mvn clean package -pl $server_source -am -DskipTests
# ------ 复制文件 ------
if [ ! -d "$target_dir" ]; then
mkdir -p $target_dir
fi
rm -rf ${target_dir}/*
# 复制服务端资源
cp -r ${server_source}/target/*.jar $target_dir
echo "服务端构建完毕,构建结果在${target_dir}文件夹下"

49
build-website.sh Executable file
View File

@@ -0,0 +1,49 @@
# 构建admin, 结果输出在dist/sop-admin目录
# 获取当前路径并赋值给变量 current_path
current_path=$(pwd)
# 打印变量的值,以验证赋值是否成功
echo "当前路径是: $current_path"
# 构建目录
dist_dir="dist"
# 服务端文件夹名称
# 执行文件名称
app_name="sop-website"
version="5.0"
build_folder="${app_name}-${version}"
# 输出目录
target_dir="$dist_dir/${build_folder}"
server_source=sop-website/sop-website-backend/website-boot
# admin前端路径
front_source=sop-website/sop-website-frontend
# ------ 构建前端 ------
echo "开始构建sop-website前端..."
cd $front_source
sh build.sh
cd $current_path
# ------ 构建后端 ------
echo "开始构建sop-website服务端..."
mvn clean package -pl $server_source -am -DskipTests
# ------ 复制文件 ------
if [ ! -d "$target_dir" ]; then
mkdir -p $target_dir
fi
rm -rf ${target_dir}/*
# 复制前端资源
echo "复制前端文件到$target_dir"
cp -r ${front_source}/dist ./$target_dir
# 复制服务端资源
cp -r ${server_source}/target/*.jar $target_dir
echo "服务端构建完毕,构建结果在${target_dir}文件夹下"

0
changelog.md Normal file → Executable file
View File

0
checkstyle.xml Normal file → Executable file
View File

0
docker-build.sh Normal file → Executable file
View File

0
docker-entrypoint.sh Normal file → Executable file
View File

0
sop-admin/pom.xml Normal file → Executable file
View File

0
sop-admin/readme.md Normal file → Executable file
View File

View File

@@ -9,7 +9,7 @@
<version>5.0.0-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>backend-boot</artifactId> <artifactId>admin-boot</artifactId>
<properties> <properties>
<maven.compiler.source>8</maven.compiler.source> <maven.compiler.source>8</maven.compiler.source>
@@ -20,12 +20,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.gitee.sop</groupId> <groupId>com.gitee.sop</groupId>
<artifactId>backend-web</artifactId> <artifactId>admin-web</artifactId>
<version>5.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.gitee.sop</groupId>
<artifactId>website-web</artifactId>
<version>5.0.0-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -59,6 +54,13 @@
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
</dependency> </dependency>
<!-- test -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<!-- provided --> <!-- provided -->
<!-- 仅在开发中使用 --> <!-- 仅在开发中使用 -->

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend; package com.gitee.sop.admin;
import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
@@ -6,10 +6,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication @SpringBootApplication
@EnableDubbo @EnableDubbo
public class SopAdminBackendApplication { public class SopAdminApplication {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(SopAdminBackendApplication.class, args); SpringApplication.run(SopAdminApplication.class, args);
} }
} }

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.config; package com.gitee.sop.admin.config;
import lombok.Data; import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;

View File

@@ -1,10 +1,10 @@
package com.gitee.sop.adminbackend.config; package com.gitee.sop.admin.config;
import com.gitee.sop.adminbackend.common.context.SpringContext; import com.gitee.sop.admin.common.context.SpringContext;
import com.gitee.sop.adminbackend.common.util.SystemUtil; import com.gitee.sop.admin.common.util.SystemUtil;
import com.gitee.sop.adminbackend.interceptor.LoginInterceptor; import com.gitee.sop.admin.interceptor.LoginInterceptor;
import com.gitee.sop.adminbackend.service.sys.UserCacheService; import com.gitee.sop.admin.service.sys.UserCacheService;
import com.gitee.sop.adminbackend.service.sys.impl.LocalUserCacheService; import com.gitee.sop.admin.service.sys.impl.LocalUserCacheService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@@ -28,7 +28,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Slf4j @Slf4j
public class SopAdminConfiguration implements ApplicationContextAware, WebMvcConfigurer { public class SopAdminConfiguration implements ApplicationContextAware, WebMvcConfigurer {
@Value("${torna.front-location:}") @Value("${front-location:}")
private String frontLocation; private String frontLocation;
@Override @Override
@@ -50,8 +50,9 @@ public class SopAdminConfiguration implements ApplicationContextAware, WebMvcCon
@Override @Override
public void addInterceptors(InterceptorRegistry registry) { public void addInterceptors(InterceptorRegistry registry) {
String[] excludes = { String[] excludes = {
"/", "/error",
// 排除前端资源 // 排除前端资源
"/", "/*.html", "/*.ico", "/static/**" "/*.html", "/*.ico", "/*.png", "/*.json", "/static/**", "/assets/**"
}; };
registry.addInterceptor(new LoginInterceptor()) registry.addInterceptor(new LoginInterceptor())
.excludePathPatterns(excludes); .excludePathPatterns(excludes);
@@ -96,7 +97,10 @@ public class SopAdminConfiguration implements ApplicationContextAware, WebMvcCon
String location = "file:" + frontRoot; String location = "file:" + frontRoot;
registry.addResourceHandler("/index.html").addResourceLocations(location + "/index.html"); registry.addResourceHandler("/index.html").addResourceLocations(location + "/index.html");
registry.addResourceHandler("/favicon.ico").addResourceLocations(location + "/favicon.ico"); registry.addResourceHandler("/favicon.ico").addResourceLocations(location + "/favicon.ico");
registry.addResourceHandler("/logo.png").addResourceLocations(location + "/logo.png");
registry.addResourceHandler("/platform-config.json").addResourceLocations(location + "/platform-config.json");
registry.addResourceHandler("/static/**").addResourceLocations(location + "/static/"); registry.addResourceHandler("/static/**").addResourceLocations(location + "/static/");
registry.addResourceHandler("/assets/**").addResourceLocations(location + "/assets/");
} }
} }

View File

@@ -1,11 +1,11 @@
package com.gitee.sop.adminbackend.interceptor; package com.gitee.sop.admin.interceptor;
import com.gitee.sop.adminbackend.common.annotation.NoToken; import com.gitee.sop.admin.common.annotation.NoToken;
import com.gitee.sop.adminbackend.common.enums.StatusEnum; import com.gitee.sop.admin.common.enums.StatusEnum;
import com.gitee.sop.adminbackend.common.user.User; import com.gitee.sop.admin.common.user.User;
import com.gitee.sop.adminbackend.common.context.UserContext; import com.gitee.sop.admin.common.context.UserContext;
import com.gitee.sop.adminbackend.common.exception.LoginFailureException; import com.gitee.sop.admin.common.exception.LoginFailureException;
import com.gitee.sop.adminbackend.common.util.RequestUtil; import com.gitee.sop.admin.common.util.RequestUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.web.method.HandlerMethod; import org.springframework.web.method.HandlerMethod;

View File

@@ -1,7 +1,9 @@
server.port=8082 server.port=8082
spring.profiles.active=dev spring.profiles.active=dev
spring.application.name=sop-admin-backend spring.application.name=sop-admin
index.path=/
####### admin config ####### ####### admin config #######
# user cache # user cache
@@ -33,14 +35,14 @@ spring.datasource.password=${mysql.password}
####### mybatis config ####### ####### mybatis config #######
mybatis.fill.com.gitee.fastmybatis.core.support.LocalDateTimeFillInsert=add_time mybatis.fill.com.gitee.fastmybatis.core.support.LocalDateTimeFillInsert=add_time
mybatis.fill.com.gitee.fastmybatis.core.support.LocalDateTimeFillUpdate=update_time mybatis.fill.com.gitee.fastmybatis.core.support.LocalDateTimeFillUpdate=update_time
mybatis.fill.com.gitee.sop.adminbackend.common.fill.AddByFill= mybatis.fill.com.gitee.sop.admin.common.fill.AddByFill=
mybatis.fill.com.gitee.sop.adminbackend.common.fill.UpdateByFill= mybatis.fill.com.gitee.sop.admin.common.fill.UpdateByFill=
# mybatis config file # mybatis config file
mybatis.config-location=classpath:mybatis/mybatisConfig.xml mybatis.config-location=classpath:mybatis/mybatisConfig.xml
mybatis.mapper-locations=classpath:mybatis/mapper/*.xml mybatis.mapper-locations=classpath:mybatis/mapper/*.xml
# print SQL # print SQL
logging.level.com.gitee.sop.adminbackend.dao=error logging.level.com.gitee.sop.admin.dao=error
logging.level.com.gitee.fastmybatis=info logging.level.com.gitee.fastmybatis=info
mybatis.print-sql=false mybatis.print-sql=false

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend; package com.gitee.sop.admin;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;

View File

@@ -1,11 +1,11 @@
package com.gitee.sop.adminbackend.service; package com.gitee.sop.admin.service;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.gitee.sop.adminbackend.BaseTest; import com.gitee.sop.admin.BaseTest;
import com.gitee.sop.adminbackend.service.sys.login.LoginService; import com.gitee.sop.admin.service.sys.login.LoginService;
import com.gitee.sop.adminbackend.service.sys.login.dto.LoginDTO; import com.gitee.sop.admin.service.sys.login.dto.LoginDTO;
import com.gitee.sop.adminbackend.service.sys.login.dto.LoginUser; import com.gitee.sop.admin.service.sys.login.dto.LoginUser;
import com.gitee.sop.adminbackend.service.sys.login.enums.RegTypeEnum; import com.gitee.sop.admin.service.sys.login.enums.RegTypeEnum;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.codec.digest.DigestUtils;

View File

@@ -1,13 +1,12 @@
package com.gitee.sop.adminbackend.service; package com.gitee.sop.admin.service;
import com.gitee.sop.adminbackend.BaseTest; import com.gitee.sop.admin.BaseTest;
import com.gitee.sop.adminbackend.dao.entity.SysAdminUser; import com.gitee.sop.admin.dao.entity.SysUser;
import com.gitee.sop.adminbackend.service.sys.SysUserService; import com.gitee.sop.admin.service.sys.SysUserService;
import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.codec.digest.DigestUtils;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.security.crypto.bcrypt.BCrypt;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.crypto.bcrypt.BCrypt;
/** /**
@@ -29,8 +28,8 @@ public class PasswordTest extends BaseTest {
String encodedPassword = BCrypt.hashpw(defPassword, BCrypt.gensalt()); String encodedPassword = BCrypt.hashpw(defPassword, BCrypt.gensalt());
System.out.println("数据库保存:" + encodedPassword); System.out.println("数据库保存:" + encodedPassword);
sysAdminUserService.query() sysAdminUserService.query()
.eq(SysAdminUser::getUsername, username) .eq(SysUser::getUsername, username)
.set(SysAdminUser::getPassword, encodedPassword) .set(SysUser::getPassword, encodedPassword)
.update(); .update();
} }

View File

@@ -9,7 +9,7 @@
<version>5.0.0-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>backend-common</artifactId> <artifactId>admin-common</artifactId>
<properties> <properties>
<maven.compiler.source>8</maven.compiler.source> <maven.compiler.source>8</maven.compiler.source>
@@ -38,7 +38,6 @@
<dependency> <dependency>
<groupId>com.alibaba.fastjson2</groupId> <groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId> <artifactId>fastjson2</artifactId>
<version>2.0.52</version>
</dependency> </dependency>
<dependency> <dependency>

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.annotation; package com.gitee.sop.admin.common.annotation;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;

View File

@@ -1,7 +1,7 @@
package com.gitee.sop.adminbackend.common.config; package com.gitee.sop.admin.common.config;
import com.gitee.sop.adminbackend.common.context.SpringContext; import com.gitee.sop.admin.common.context.SpringContext;
import com.gitee.sop.adminbackend.common.enums.ConfigKeyEnum; import com.gitee.sop.admin.common.enums.ConfigKeyEnum;
import java.util.function.Supplier; import java.util.function.Supplier;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.config; package com.gitee.sop.admin.common.config;
public interface IConfig { public interface IConfig {

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.constants; package com.gitee.sop.admin.common.constants;
import java.util.Objects; import java.util.Objects;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.context; package com.gitee.sop.admin.common.context;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;

View File

@@ -1,15 +1,15 @@
package com.gitee.sop.adminbackend.common.context; package com.gitee.sop.admin.common.context;
import com.auth0.jwt.interfaces.Claim; import com.auth0.jwt.interfaces.Claim;
import com.gitee.sop.adminbackend.common.manager.UserCacheManager; import com.gitee.sop.admin.common.manager.UserCacheManager;
import com.gitee.sop.adminbackend.common.user.User; import com.gitee.sop.admin.common.user.User;
import com.gitee.sop.adminbackend.common.config.Configs; import com.gitee.sop.admin.common.config.Configs;
import com.gitee.sop.adminbackend.common.enums.ConfigKeyEnum; import com.gitee.sop.admin.common.enums.ConfigKeyEnum;
import com.gitee.sop.adminbackend.common.exception.ErrorTokenException; import com.gitee.sop.admin.common.exception.ErrorTokenException;
import com.gitee.sop.adminbackend.common.exception.JwtErrorException; import com.gitee.sop.admin.common.exception.JwtErrorException;
import com.gitee.sop.adminbackend.common.exception.JwtExpiredException; import com.gitee.sop.admin.common.exception.JwtExpiredException;
import com.gitee.sop.adminbackend.common.exception.LoginFailureException; import com.gitee.sop.admin.common.exception.LoginFailureException;
import com.gitee.sop.adminbackend.common.util.JwtUtil; import com.gitee.sop.admin.common.util.JwtUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.math.NumberUtils; import org.apache.commons.lang3.math.NumberUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.dto; package com.gitee.sop.admin.common.dto;
import lombok.Data; import lombok.Data;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.dto; package com.gitee.sop.admin.common.dto;
import lombok.Data; import lombok.Data;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.dto; package com.gitee.sop.admin.common.dto;
import lombok.Data; import lombok.Data;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.dto; package com.gitee.sop.admin.common.dto;
import lombok.Data; import lombok.Data;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.dto; package com.gitee.sop.admin.common.dto;
import lombok.Data; import lombok.Data;

View File

@@ -1,6 +1,6 @@
package com.gitee.sop.adminbackend.common.enums; package com.gitee.sop.admin.common.enums;
import com.gitee.sop.adminbackend.common.config.Configs; import com.gitee.sop.admin.common.config.Configs;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.enums; package com.gitee.sop.admin.common.enums;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.enums; package com.gitee.sop.admin.common.enums;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.enums; package com.gitee.sop.admin.common.enums;
import java.io.Serializable; import java.io.Serializable;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.enums; package com.gitee.sop.admin.common.enums;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.enums; package com.gitee.sop.admin.common.enums;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.enums; package com.gitee.sop.admin.common.enums;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.enums; package com.gitee.sop.admin.common.enums;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.exception; package com.gitee.sop.admin.common.exception;
/** /**
* @author tanghc * @author tanghc

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.exception; package com.gitee.sop.admin.common.exception;
/** /**
* @author tanghc * @author tanghc

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.exception; package com.gitee.sop.admin.common.exception;
/** /**
* @author tanghc * @author tanghc

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.exception; package com.gitee.sop.admin.common.exception;
/** /**
* @author tanghc * @author tanghc

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.exception; package com.gitee.sop.admin.common.exception;
/** /**
* @author tanghc * @author tanghc

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.exception; package com.gitee.sop.admin.common.exception;
/** /**
* @author tanghc * @author tanghc

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.exception; package com.gitee.sop.admin.common.exception;
/** /**
* @author tanghc * @author tanghc

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.exception; package com.gitee.sop.admin.common.exception;
/** /**
* @author tanghc * @author tanghc

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.exception; package com.gitee.sop.admin.common.exception;
/** /**
* @author tanghc * @author tanghc

View File

@@ -1,9 +1,9 @@
package com.gitee.sop.adminbackend.common.fill; package com.gitee.sop.admin.common.fill;
import com.gitee.fastmybatis.core.handler.BaseFill; import com.gitee.fastmybatis.core.handler.BaseFill;
import com.gitee.fastmybatis.core.handler.FillType; import com.gitee.fastmybatis.core.handler.FillType;
import com.gitee.sop.adminbackend.common.context.UserContext; import com.gitee.sop.admin.common.context.UserContext;
import com.gitee.sop.adminbackend.common.user.User; import com.gitee.sop.admin.common.user.User;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.Objects; import java.util.Objects;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.fill; package com.gitee.sop.admin.common.fill;
import com.gitee.fastmybatis.core.handler.FillType; import com.gitee.fastmybatis.core.handler.FillType;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.jackson; package com.gitee.sop.admin.common.jackson;
import lombok.Data; import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.jackson; package com.gitee.sop.admin.common.jackson;
import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.deser.std.DateDeserializers; import com.fasterxml.jackson.databind.deser.std.DateDeserializers;

View File

@@ -1,11 +1,11 @@
package com.gitee.sop.adminbackend.common.jackson.convert.annotation; package com.gitee.sop.admin.common.jackson.convert.annotation;
import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.gitee.sop.adminbackend.common.jackson.convert.serde.BoolDeserializer; import com.gitee.sop.admin.common.jackson.convert.serde.BoolDeserializer;
import com.gitee.sop.adminbackend.common.jackson.convert.serde.BoolSerializer; import com.gitee.sop.admin.common.jackson.convert.serde.BoolSerializer;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.jackson.convert.serde; package com.gitee.sop.admin.common.jackson.convert.serde;
import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.DeserializationContext;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.jackson.convert.serde; package com.gitee.sop.admin.common.jackson.convert.serde;
import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.JsonSerializer;

View File

@@ -1,6 +1,6 @@
package com.gitee.sop.adminbackend.common.manager; package com.gitee.sop.admin.common.manager;
import com.gitee.sop.adminbackend.common.user.User; import com.gitee.sop.admin.common.user.User;
/** /**
* @author 六如 * @author 六如

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.req; package com.gitee.sop.admin.common.req;
import lombok.Data; import lombok.Data;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.req; package com.gitee.sop.admin.common.req;
import lombok.Data; import lombok.Data;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.req; package com.gitee.sop.admin.common.req;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.req; package com.gitee.sop.admin.common.req;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.resp; package com.gitee.sop.admin.common.resp;
import lombok.Data; import lombok.Data;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.resp; package com.gitee.sop.admin.common.resp;
import lombok.Data; import lombok.Data;

View File

@@ -1,10 +1,10 @@
package com.gitee.sop.adminbackend.common.support; package com.gitee.sop.admin.common.support;
import com.gitee.fastmybatis.core.mapper.BaseMapper; import com.gitee.fastmybatis.core.mapper.BaseMapper;
import com.gitee.fastmybatis.core.query.LambdaQuery; import com.gitee.fastmybatis.core.query.LambdaQuery;
import com.gitee.fastmybatis.core.support.LambdaService; import com.gitee.fastmybatis.core.support.LambdaService;
import com.gitee.sop.adminbackend.common.context.UserContext; import com.gitee.sop.admin.common.context.UserContext;
import com.gitee.sop.adminbackend.common.util.DateUtil; import com.gitee.sop.admin.common.util.DateUtil;
import java.time.LocalDateTime; import java.time.LocalDateTime;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.user; package com.gitee.sop.admin.common.user;
/** /**
* 登录用户信息 * 登录用户信息

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.util; package com.gitee.sop.admin.common.util;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.gitee.fastmybatis.core.PageInfo; import com.gitee.fastmybatis.core.PageInfo;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.util; package com.gitee.sop.admin.common.util;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.util; package com.gitee.sop.admin.common.util;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.util.DigestUtils; import org.springframework.util.DigestUtils;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.util; package com.gitee.sop.admin.common.util;
import java.util.UUID; import java.util.UUID;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.util; package com.gitee.sop.admin.common.util;
import com.auth0.jwt.JWT; import com.auth0.jwt.JWT;
import com.auth0.jwt.JWTCreator; import com.auth0.jwt.JWTCreator;
@@ -7,9 +7,9 @@ import com.auth0.jwt.algorithms.Algorithm;
import com.auth0.jwt.exceptions.TokenExpiredException; import com.auth0.jwt.exceptions.TokenExpiredException;
import com.auth0.jwt.interfaces.Claim; import com.auth0.jwt.interfaces.Claim;
import com.auth0.jwt.interfaces.DecodedJWT; import com.auth0.jwt.interfaces.DecodedJWT;
import com.gitee.sop.adminbackend.common.exception.JwtCreateException; import com.gitee.sop.admin.common.exception.JwtCreateException;
import com.gitee.sop.adminbackend.common.exception.JwtErrorException; import com.gitee.sop.admin.common.exception.JwtErrorException;
import com.gitee.sop.adminbackend.common.exception.JwtExpiredException; import com.gitee.sop.admin.common.exception.JwtExpiredException;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import java.time.LocalDateTime; import java.time.LocalDateTime;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.util; package com.gitee.sop.admin.common.util;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.util; package com.gitee.sop.admin.common.util;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.util; package com.gitee.sop.admin.common.util;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.common.util; package com.gitee.sop.admin.common.util;
import org.springframework.boot.system.ApplicationHome; import org.springframework.boot.system.ApplicationHome;

View File

@@ -1,6 +1,6 @@
package com.gitee.sop.adminbackend.common; package com.gitee.sop.admin.common;
import com.gitee.sop.adminbackend.common.util.RSATool; import com.gitee.sop.admin.common.util.RSATool;
import org.junit.Test; import org.junit.Test;
/** /**

View File

@@ -9,7 +9,7 @@
<version>5.0.0-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>backend-dao</artifactId> <artifactId>admin-dao</artifactId>
<properties> <properties>
<maven.compiler.source>8</maven.compiler.source> <maven.compiler.source>8</maven.compiler.source>

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.dao.entity; package com.gitee.sop.admin.dao.entity;
import com.gitee.fastmybatis.annotation.Pk; import com.gitee.fastmybatis.annotation.Pk;
import com.gitee.fastmybatis.annotation.PkStrategy; import com.gitee.fastmybatis.annotation.PkStrategy;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.dao.entity; package com.gitee.sop.admin.dao.entity;
import java.time.LocalDateTime; import java.time.LocalDateTime;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.dao.entity; package com.gitee.sop.admin.dao.entity;
import java.time.LocalDateTime; import java.time.LocalDateTime;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.dao.entity; package com.gitee.sop.admin.dao.entity;
import java.time.LocalDateTime; import java.time.LocalDateTime;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.dao.entity; package com.gitee.sop.admin.dao.entity;
import com.gitee.fastmybatis.annotation.Pk; import com.gitee.fastmybatis.annotation.Pk;
import com.gitee.fastmybatis.annotation.PkStrategy; import com.gitee.fastmybatis.annotation.PkStrategy;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.dao.entity; package com.gitee.sop.admin.dao.entity;
import com.gitee.fastmybatis.annotation.Pk; import com.gitee.fastmybatis.annotation.Pk;
import com.gitee.fastmybatis.annotation.PkStrategy; import com.gitee.fastmybatis.annotation.PkStrategy;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.dao.entity; package com.gitee.sop.admin.dao.entity;
import com.gitee.fastmybatis.annotation.Pk; import com.gitee.fastmybatis.annotation.Pk;
import com.gitee.fastmybatis.annotation.PkStrategy; import com.gitee.fastmybatis.annotation.PkStrategy;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.dao.entity; package com.gitee.sop.admin.dao.entity;
import com.gitee.fastmybatis.annotation.Pk; import com.gitee.fastmybatis.annotation.Pk;
import com.gitee.fastmybatis.annotation.PkStrategy; import com.gitee.fastmybatis.annotation.PkStrategy;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.dao.entity; package com.gitee.sop.admin.dao.entity;
import com.gitee.fastmybatis.annotation.Pk; import com.gitee.fastmybatis.annotation.Pk;
import com.gitee.fastmybatis.annotation.PkStrategy; import com.gitee.fastmybatis.annotation.PkStrategy;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.dao.entity; package com.gitee.sop.admin.dao.entity;
import com.gitee.fastmybatis.annotation.Pk; import com.gitee.fastmybatis.annotation.Pk;
import com.gitee.fastmybatis.annotation.PkStrategy; import com.gitee.fastmybatis.annotation.PkStrategy;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.dao.entity; package com.gitee.sop.admin.dao.entity;
import com.gitee.fastmybatis.annotation.Pk; import com.gitee.fastmybatis.annotation.Pk;
import com.gitee.fastmybatis.annotation.PkStrategy; import com.gitee.fastmybatis.annotation.PkStrategy;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.dao.entity; package com.gitee.sop.admin.dao.entity;
import java.time.LocalDateTime; import java.time.LocalDateTime;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.dao.entity; package com.gitee.sop.admin.dao.entity;
import java.time.LocalDateTime; import java.time.LocalDateTime;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.dao.entity; package com.gitee.sop.admin.dao.entity;
import java.time.LocalDateTime; import java.time.LocalDateTime;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.dao.entity; package com.gitee.sop.admin.dao.entity;
import java.time.LocalDateTime; import java.time.LocalDateTime;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.dao.entity; package com.gitee.sop.admin.dao.entity;
import java.time.LocalDateTime; import java.time.LocalDateTime;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.dao.entity; package com.gitee.sop.admin.dao.entity;
import java.time.LocalDateTime; import java.time.LocalDateTime;

View File

@@ -1,4 +1,4 @@
package com.gitee.sop.adminbackend.dao.entity; package com.gitee.sop.admin.dao.entity;
import java.time.LocalDateTime; import java.time.LocalDateTime;

View File

@@ -1,8 +1,8 @@
package com.gitee.sop.adminbackend.dao.mapper; package com.gitee.sop.admin.dao.mapper;
import com.gitee.fastmybatis.core.mapper.BaseMapper; import com.gitee.fastmybatis.core.mapper.BaseMapper;
import com.gitee.sop.adminbackend.dao.entity.ApiInfo; import com.gitee.sop.admin.dao.entity.ApiInfo;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/** /**

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