diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/Dockerfile b/Dockerfile old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/asset/arc.jpg b/asset/arc.jpg old mode 100644 new mode 100755 diff --git a/build-admin.sh b/build-admin.sh new file mode 100755 index 00000000..a11191ec --- /dev/null +++ b/build-admin.sh @@ -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}文件夹下" diff --git a/build-gateway.sh b/build-gateway.sh new file mode 100644 index 00000000..0aed5357 --- /dev/null +++ b/build-gateway.sh @@ -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}文件夹下" diff --git a/build-website.sh b/build-website.sh new file mode 100755 index 00000000..bd69b2c5 --- /dev/null +++ b/build-website.sh @@ -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}文件夹下" diff --git a/changelog.md b/changelog.md old mode 100644 new mode 100755 diff --git a/checkstyle.xml b/checkstyle.xml old mode 100644 new mode 100755 diff --git a/docker-build.sh b/docker-build.sh old mode 100644 new mode 100755 diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/sop-admin/pom.xml b/sop-admin/pom.xml old mode 100644 new mode 100755 diff --git a/sop-admin/readme.md b/sop-admin/readme.md old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-backend/backend-boot/pom.xml b/sop-admin/sop-admin-backend/admin-boot/pom.xml old mode 100644 new mode 100755 similarity index 94% rename from sop-admin/sop-admin-backend/backend-boot/pom.xml rename to sop-admin/sop-admin-backend/admin-boot/pom.xml index 0935fe3f..74c09825 --- a/sop-admin/sop-admin-backend/backend-boot/pom.xml +++ b/sop-admin/sop-admin-backend/admin-boot/pom.xml @@ -9,7 +9,7 @@ 5.0.0-SNAPSHOT - backend-boot + admin-boot 8 @@ -20,12 +20,7 @@ com.gitee.sop - backend-web - 5.0.0-SNAPSHOT - - - com.gitee.sop - website-web + admin-web 5.0.0-SNAPSHOT @@ -59,6 +54,13 @@ mysql-connector-java + + + org.springframework.boot + spring-boot-starter-test + test + + diff --git a/sop-admin/sop-admin-backend/backend-boot/src/main/java/com/gitee/sop/adminbackend/SopAdminBackendApplication.java b/sop-admin/sop-admin-backend/admin-boot/src/main/java/com/gitee/sop/admin/SopAdminApplication.java old mode 100644 new mode 100755 similarity index 65% rename from sop-admin/sop-admin-backend/backend-boot/src/main/java/com/gitee/sop/adminbackend/SopAdminBackendApplication.java rename to sop-admin/sop-admin-backend/admin-boot/src/main/java/com/gitee/sop/admin/SopAdminApplication.java index 3947e1be..616417d3 --- a/sop-admin/sop-admin-backend/backend-boot/src/main/java/com/gitee/sop/adminbackend/SopAdminBackendApplication.java +++ b/sop-admin/sop-admin-backend/admin-boot/src/main/java/com/gitee/sop/admin/SopAdminApplication.java @@ -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.springframework.boot.SpringApplication; @@ -6,10 +6,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication @EnableDubbo -public class SopAdminBackendApplication { +public class SopAdminApplication { public static void main(String[] args) { - SpringApplication.run(SopAdminBackendApplication.class, args); + SpringApplication.run(SopAdminApplication.class, args); } } diff --git a/sop-admin/sop-admin-backend/backend-boot/src/main/java/com/gitee/sop/adminbackend/config/AdminConfig.java b/sop-admin/sop-admin-backend/admin-boot/src/main/java/com/gitee/sop/admin/config/AdminConfig.java old mode 100644 new mode 100755 similarity index 87% rename from sop-admin/sop-admin-backend/backend-boot/src/main/java/com/gitee/sop/adminbackend/config/AdminConfig.java rename to sop-admin/sop-admin-backend/admin-boot/src/main/java/com/gitee/sop/admin/config/AdminConfig.java index b009d4d1..552bca33 --- a/sop-admin/sop-admin-backend/backend-boot/src/main/java/com/gitee/sop/adminbackend/config/AdminConfig.java +++ b/sop-admin/sop-admin-backend/admin-boot/src/main/java/com/gitee/sop/admin/config/AdminConfig.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.config; +package com.gitee.sop.admin.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/sop-admin/sop-admin-backend/backend-boot/src/main/java/com/gitee/sop/adminbackend/config/SopAdminConfiguration.java b/sop-admin/sop-admin-backend/admin-boot/src/main/java/com/gitee/sop/admin/config/SopAdminConfiguration.java old mode 100644 new mode 100755 similarity index 82% rename from sop-admin/sop-admin-backend/backend-boot/src/main/java/com/gitee/sop/adminbackend/config/SopAdminConfiguration.java rename to sop-admin/sop-admin-backend/admin-boot/src/main/java/com/gitee/sop/admin/config/SopAdminConfiguration.java index ed92f4ae..c0a85998 --- a/sop-admin/sop-admin-backend/backend-boot/src/main/java/com/gitee/sop/adminbackend/config/SopAdminConfiguration.java +++ b/sop-admin/sop-admin-backend/admin-boot/src/main/java/com/gitee/sop/admin/config/SopAdminConfiguration.java @@ -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.adminbackend.common.util.SystemUtil; -import com.gitee.sop.adminbackend.interceptor.LoginInterceptor; -import com.gitee.sop.adminbackend.service.sys.UserCacheService; -import com.gitee.sop.adminbackend.service.sys.impl.LocalUserCacheService; +import com.gitee.sop.admin.common.context.SpringContext; +import com.gitee.sop.admin.common.util.SystemUtil; +import com.gitee.sop.admin.interceptor.LoginInterceptor; +import com.gitee.sop.admin.service.sys.UserCacheService; +import com.gitee.sop.admin.service.sys.impl.LocalUserCacheService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Value; @@ -28,7 +28,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @Slf4j public class SopAdminConfiguration implements ApplicationContextAware, WebMvcConfigurer { - @Value("${torna.front-location:}") + @Value("${front-location:}") private String frontLocation; @Override @@ -50,8 +50,9 @@ public class SopAdminConfiguration implements ApplicationContextAware, WebMvcCon @Override public void addInterceptors(InterceptorRegistry registry) { String[] excludes = { + "/", "/error", // 排除前端资源 - "/", "/*.html", "/*.ico", "/static/**" + "/*.html", "/*.ico", "/*.png", "/*.json", "/static/**", "/assets/**" }; registry.addInterceptor(new LoginInterceptor()) .excludePathPatterns(excludes); @@ -96,7 +97,10 @@ public class SopAdminConfiguration implements ApplicationContextAware, WebMvcCon String location = "file:" + frontRoot; registry.addResourceHandler("/index.html").addResourceLocations(location + "/index.html"); 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("/assets/**").addResourceLocations(location + "/assets/"); } } diff --git a/sop-admin/sop-admin-backend/backend-boot/src/main/java/com/gitee/sop/adminbackend/interceptor/LoginInterceptor.java b/sop-admin/sop-admin-backend/admin-boot/src/main/java/com/gitee/sop/admin/interceptor/LoginInterceptor.java old mode 100644 new mode 100755 similarity index 76% rename from sop-admin/sop-admin-backend/backend-boot/src/main/java/com/gitee/sop/adminbackend/interceptor/LoginInterceptor.java rename to sop-admin/sop-admin-backend/admin-boot/src/main/java/com/gitee/sop/admin/interceptor/LoginInterceptor.java index e17117e7..4c5beb9a --- a/sop-admin/sop-admin-backend/backend-boot/src/main/java/com/gitee/sop/adminbackend/interceptor/LoginInterceptor.java +++ b/sop-admin/sop-admin-backend/admin-boot/src/main/java/com/gitee/sop/admin/interceptor/LoginInterceptor.java @@ -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.adminbackend.common.enums.StatusEnum; -import com.gitee.sop.adminbackend.common.user.User; -import com.gitee.sop.adminbackend.common.context.UserContext; -import com.gitee.sop.adminbackend.common.exception.LoginFailureException; -import com.gitee.sop.adminbackend.common.util.RequestUtil; +import com.gitee.sop.admin.common.annotation.NoToken; +import com.gitee.sop.admin.common.enums.StatusEnum; +import com.gitee.sop.admin.common.user.User; +import com.gitee.sop.admin.common.context.UserContext; +import com.gitee.sop.admin.common.exception.LoginFailureException; +import com.gitee.sop.admin.common.util.RequestUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.web.method.HandlerMethod; diff --git a/sop-admin/sop-admin-backend/backend-boot/src/main/resources/application-dev.properties b/sop-admin/sop-admin-backend/admin-boot/src/main/resources/application-dev.properties old mode 100644 new mode 100755 similarity index 100% rename from sop-admin/sop-admin-backend/backend-boot/src/main/resources/application-dev.properties rename to sop-admin/sop-admin-backend/admin-boot/src/main/resources/application-dev.properties diff --git a/sop-admin/sop-admin-backend/backend-boot/src/main/resources/application-test.properties b/sop-admin/sop-admin-backend/admin-boot/src/main/resources/application-test.properties old mode 100644 new mode 100755 similarity index 100% rename from sop-admin/sop-admin-backend/backend-boot/src/main/resources/application-test.properties rename to sop-admin/sop-admin-backend/admin-boot/src/main/resources/application-test.properties diff --git a/sop-admin/sop-admin-backend/backend-boot/src/main/resources/application.properties b/sop-admin/sop-admin-backend/admin-boot/src/main/resources/application.properties old mode 100644 new mode 100755 similarity index 87% rename from sop-admin/sop-admin-backend/backend-boot/src/main/resources/application.properties rename to sop-admin/sop-admin-backend/admin-boot/src/main/resources/application.properties index 1835f3a1..dfa98f82 --- a/sop-admin/sop-admin-backend/backend-boot/src/main/resources/application.properties +++ b/sop-admin/sop-admin-backend/admin-boot/src/main/resources/application.properties @@ -1,7 +1,9 @@ server.port=8082 spring.profiles.active=dev -spring.application.name=sop-admin-backend +spring.application.name=sop-admin + +index.path=/ ####### admin config ####### # user cache @@ -33,14 +35,14 @@ spring.datasource.password=${mysql.password} ####### mybatis config ####### mybatis.fill.com.gitee.fastmybatis.core.support.LocalDateTimeFillInsert=add_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.adminbackend.common.fill.UpdateByFill= +mybatis.fill.com.gitee.sop.admin.common.fill.AddByFill= +mybatis.fill.com.gitee.sop.admin.common.fill.UpdateByFill= # mybatis config file mybatis.config-location=classpath:mybatis/mybatisConfig.xml mybatis.mapper-locations=classpath:mybatis/mapper/*.xml # print SQL -logging.level.com.gitee.sop.adminbackend.dao=error +logging.level.com.gitee.sop.admin.dao=error logging.level.com.gitee.fastmybatis=info mybatis.print-sql=false diff --git a/sop-admin/sop-admin-backend/backend-boot/src/test/java/com/gitee/sop/adminbackend/BaseTest.java b/sop-admin/sop-admin-backend/admin-boot/src/test/java/com/gitee/sop/admin/BaseTest.java old mode 100644 new mode 100755 similarity index 83% rename from sop-admin/sop-admin-backend/backend-boot/src/test/java/com/gitee/sop/adminbackend/BaseTest.java rename to sop-admin/sop-admin-backend/admin-boot/src/test/java/com/gitee/sop/admin/BaseTest.java index dd8dfeea..d5994028 --- a/sop-admin/sop-admin-backend/backend-boot/src/test/java/com/gitee/sop/adminbackend/BaseTest.java +++ b/sop-admin/sop-admin-backend/admin-boot/src/test/java/com/gitee/sop/admin/BaseTest.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend; +package com.gitee.sop.admin; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/sop-admin/sop-admin-backend/backend-boot/src/test/java/com/gitee/sop/adminbackend/service/LoginServiceTest.java b/sop-admin/sop-admin-backend/admin-boot/src/test/java/com/gitee/sop/admin/service/LoginServiceTest.java old mode 100644 new mode 100755 similarity index 74% rename from sop-admin/sop-admin-backend/backend-boot/src/test/java/com/gitee/sop/adminbackend/service/LoginServiceTest.java rename to sop-admin/sop-admin-backend/admin-boot/src/test/java/com/gitee/sop/admin/service/LoginServiceTest.java index 0210221e..d03e397f --- a/sop-admin/sop-admin-backend/backend-boot/src/test/java/com/gitee/sop/adminbackend/service/LoginServiceTest.java +++ b/sop-admin/sop-admin-backend/admin-boot/src/test/java/com/gitee/sop/admin/service/LoginServiceTest.java @@ -1,11 +1,11 @@ -package com.gitee.sop.adminbackend.service; +package com.gitee.sop.admin.service; import com.alibaba.fastjson2.JSON; -import com.gitee.sop.adminbackend.BaseTest; -import com.gitee.sop.adminbackend.service.sys.login.LoginService; -import com.gitee.sop.adminbackend.service.sys.login.dto.LoginDTO; -import com.gitee.sop.adminbackend.service.sys.login.dto.LoginUser; -import com.gitee.sop.adminbackend.service.sys.login.enums.RegTypeEnum; +import com.gitee.sop.admin.BaseTest; +import com.gitee.sop.admin.service.sys.login.LoginService; +import com.gitee.sop.admin.service.sys.login.dto.LoginDTO; +import com.gitee.sop.admin.service.sys.login.dto.LoginUser; +import com.gitee.sop.admin.service.sys.login.enums.RegTypeEnum; import org.springframework.beans.factory.annotation.Autowired; import org.apache.commons.codec.digest.DigestUtils; diff --git a/sop-admin/sop-admin-backend/backend-boot/src/test/java/com/gitee/sop/adminbackend/service/PasswordTest.java b/sop-admin/sop-admin-backend/admin-boot/src/test/java/com/gitee/sop/admin/service/PasswordTest.java old mode 100644 new mode 100755 similarity index 69% rename from sop-admin/sop-admin-backend/backend-boot/src/test/java/com/gitee/sop/adminbackend/service/PasswordTest.java rename to sop-admin/sop-admin-backend/admin-boot/src/test/java/com/gitee/sop/admin/service/PasswordTest.java index 775e89b5..65d26cf4 --- a/sop-admin/sop-admin-backend/backend-boot/src/test/java/com/gitee/sop/adminbackend/service/PasswordTest.java +++ b/sop-admin/sop-admin-backend/admin-boot/src/test/java/com/gitee/sop/admin/service/PasswordTest.java @@ -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.adminbackend.dao.entity.SysAdminUser; -import com.gitee.sop.adminbackend.service.sys.SysUserService; +import com.gitee.sop.admin.BaseTest; +import com.gitee.sop.admin.dao.entity.SysUser; +import com.gitee.sop.admin.service.sys.SysUserService; import org.apache.commons.codec.digest.DigestUtils; import org.junit.jupiter.api.Test; -import org.springframework.security.crypto.bcrypt.BCrypt; - 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()); System.out.println("数据库保存:" + encodedPassword); sysAdminUserService.query() - .eq(SysAdminUser::getUsername, username) - .set(SysAdminUser::getPassword, encodedPassword) + .eq(SysUser::getUsername, username) + .set(SysUser::getPassword, encodedPassword) .update(); } diff --git a/sop-admin/sop-admin-backend/backend-common/pom.xml b/sop-admin/sop-admin-backend/admin-common/pom.xml old mode 100644 new mode 100755 similarity index 97% rename from sop-admin/sop-admin-backend/backend-common/pom.xml rename to sop-admin/sop-admin-backend/admin-common/pom.xml index 242d72c4..5baa8277 --- a/sop-admin/sop-admin-backend/backend-common/pom.xml +++ b/sop-admin/sop-admin-backend/admin-common/pom.xml @@ -9,7 +9,7 @@ 5.0.0-SNAPSHOT - backend-common + admin-common 8 @@ -38,7 +38,6 @@ com.alibaba.fastjson2 fastjson2 - 2.0.52 diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/annotation/NoToken.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/annotation/NoToken.java old mode 100644 new mode 100755 similarity index 87% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/annotation/NoToken.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/annotation/NoToken.java index 5647c9e2..12f46067 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/annotation/NoToken.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/annotation/NoToken.java @@ -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.ElementType; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/config/Configs.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/config/Configs.java old mode 100644 new mode 100755 similarity index 85% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/config/Configs.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/config/Configs.java index 3dc3dddb..e361911e --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/config/Configs.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/config/Configs.java @@ -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.adminbackend.common.enums.ConfigKeyEnum; +import com.gitee.sop.admin.common.context.SpringContext; +import com.gitee.sop.admin.common.enums.ConfigKeyEnum; import java.util.function.Supplier; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/config/IConfig.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/config/IConfig.java old mode 100644 new mode 100755 similarity index 70% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/config/IConfig.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/config/IConfig.java index 2809bce9..82322890 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/config/IConfig.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/config/IConfig.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.config; +package com.gitee.sop.admin.common.config; public interface IConfig { diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/constants/YesOrNo.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/constants/YesOrNo.java old mode 100644 new mode 100755 similarity index 87% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/constants/YesOrNo.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/constants/YesOrNo.java index 674273cd..058c0a5c --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/constants/YesOrNo.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/constants/YesOrNo.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.constants; +package com.gitee.sop.admin.common.constants; import java.util.Objects; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/context/SpringContext.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/context/SpringContext.java old mode 100644 new mode 100755 similarity index 92% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/context/SpringContext.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/context/SpringContext.java index bd36675e..d59c896d --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/context/SpringContext.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/context/SpringContext.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.context; +package com.gitee.sop.admin.common.context; import org.springframework.context.ApplicationContext; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/context/UserContext.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/context/UserContext.java old mode 100644 new mode 100755 similarity index 84% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/context/UserContext.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/context/UserContext.java index 816d4d6e..aa67e2f1 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/context/UserContext.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/context/UserContext.java @@ -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.gitee.sop.adminbackend.common.manager.UserCacheManager; -import com.gitee.sop.adminbackend.common.user.User; -import com.gitee.sop.adminbackend.common.config.Configs; -import com.gitee.sop.adminbackend.common.enums.ConfigKeyEnum; -import com.gitee.sop.adminbackend.common.exception.ErrorTokenException; -import com.gitee.sop.adminbackend.common.exception.JwtErrorException; -import com.gitee.sop.adminbackend.common.exception.JwtExpiredException; -import com.gitee.sop.adminbackend.common.exception.LoginFailureException; -import com.gitee.sop.adminbackend.common.util.JwtUtil; +import com.gitee.sop.admin.common.manager.UserCacheManager; +import com.gitee.sop.admin.common.user.User; +import com.gitee.sop.admin.common.config.Configs; +import com.gitee.sop.admin.common.enums.ConfigKeyEnum; +import com.gitee.sop.admin.common.exception.ErrorTokenException; +import com.gitee.sop.admin.common.exception.JwtErrorException; +import com.gitee.sop.admin.common.exception.JwtExpiredException; +import com.gitee.sop.admin.common.exception.LoginFailureException; +import com.gitee.sop.admin.common.util.JwtUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.math.NumberUtils; import org.springframework.util.StringUtils; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/dto/IdDTO.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/dto/IdDTO.java old mode 100644 new mode 100755 similarity index 79% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/dto/IdDTO.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/dto/IdDTO.java index 05cd9976..944562ec --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/dto/IdDTO.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/dto/IdDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.dto; +package com.gitee.sop.admin.common.dto; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/dto/IdsDTO.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/dto/IdsDTO.java old mode 100644 new mode 100755 similarity index 73% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/dto/IdsDTO.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/dto/IdsDTO.java index 487b3a07..f3e2816f --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/dto/IdsDTO.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/dto/IdsDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.dto; +package com.gitee.sop.admin.common.dto; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/dto/StatusUpdateBatchDTO.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/dto/StatusUpdateBatchDTO.java old mode 100644 new mode 100755 similarity index 82% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/dto/StatusUpdateBatchDTO.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/dto/StatusUpdateBatchDTO.java index 15406099..d12eecc1 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/dto/StatusUpdateBatchDTO.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/dto/StatusUpdateBatchDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.dto; +package com.gitee.sop.admin.common.dto; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/dto/StatusUpdateDTO.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/dto/StatusUpdateDTO.java old mode 100644 new mode 100755 similarity index 82% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/dto/StatusUpdateDTO.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/dto/StatusUpdateDTO.java index 33d3e93b..d71e9a0a --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/dto/StatusUpdateDTO.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/dto/StatusUpdateDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.dto; +package com.gitee.sop.admin.common.dto; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/dto/UserDTO.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/dto/UserDTO.java old mode 100644 new mode 100755 similarity index 88% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/dto/UserDTO.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/dto/UserDTO.java index c849cb12..b27578a3 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/dto/UserDTO.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/dto/UserDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.dto; +package com.gitee.sop.admin.common.dto; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/enums/ConfigKeyEnum.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/ConfigKeyEnum.java old mode 100644 new mode 100755 similarity index 86% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/enums/ConfigKeyEnum.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/ConfigKeyEnum.java index 763b6dbf..541e3866 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/enums/ConfigKeyEnum.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/ConfigKeyEnum.java @@ -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.Getter; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/enums/DocSourceTypeEnum.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/DocSourceTypeEnum.java old mode 100644 new mode 100755 similarity index 86% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/enums/DocSourceTypeEnum.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/DocSourceTypeEnum.java index 5bd3da6f..87df0b6f --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/enums/DocSourceTypeEnum.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/DocSourceTypeEnum.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.enums; +package com.gitee.sop.admin.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/enums/DocTypeEnum.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/DocTypeEnum.java old mode 100644 new mode 100755 similarity index 88% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/enums/DocTypeEnum.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/DocTypeEnum.java index 562d993f..06b63d65 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/enums/DocTypeEnum.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/DocTypeEnum.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.enums; +package com.gitee.sop.admin.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/enums/IEnum.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/IEnum.java old mode 100644 new mode 100755 similarity index 87% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/enums/IEnum.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/IEnum.java index 15afcbb5..cadc9410 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/enums/IEnum.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/IEnum.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.enums; +package com.gitee.sop.admin.common.enums; import java.io.Serializable; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/enums/IntEnum.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/IntEnum.java old mode 100644 new mode 100755 similarity index 92% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/enums/IntEnum.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/IntEnum.java index 47e7e864..668259bd --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/enums/IntEnum.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/IntEnum.java @@ -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.Optional; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/enums/MenuTypeEnum.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/MenuTypeEnum.java old mode 100644 new mode 100755 similarity index 87% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/enums/MenuTypeEnum.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/MenuTypeEnum.java index de35d987..5e160839 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/enums/MenuTypeEnum.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/MenuTypeEnum.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.enums; +package com.gitee.sop.admin.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/enums/StatusEnum.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/StatusEnum.java old mode 100644 new mode 100755 similarity index 92% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/enums/StatusEnum.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/StatusEnum.java index ea3b0b65..2b4f0527 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/enums/StatusEnum.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/StatusEnum.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.enums; +package com.gitee.sop.admin.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/enums/StringEnum.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/StringEnum.java old mode 100644 new mode 100755 similarity index 92% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/enums/StringEnum.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/StringEnum.java index 942fe1d2..73952750 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/enums/StringEnum.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/StringEnum.java @@ -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.Optional; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/BizException.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/BizException.java old mode 100644 new mode 100755 similarity index 74% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/BizException.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/BizException.java index 8fa63f6c..33242a91 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/BizException.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/BizException.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.exception; +package com.gitee.sop.admin.common.exception; /** * @author tanghc diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/ErrorCode.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/ErrorCode.java old mode 100644 new mode 100755 similarity index 91% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/ErrorCode.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/ErrorCode.java index b6bd18a1..2e862850 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/ErrorCode.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/ErrorCode.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.exception; +package com.gitee.sop.admin.common.exception; /** * @author tanghc diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/ErrorTokenException.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/ErrorTokenException.java old mode 100644 new mode 100755 similarity index 60% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/ErrorTokenException.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/ErrorTokenException.java index 2f4c6a32..88b629b8 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/ErrorTokenException.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/ErrorTokenException.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.exception; +package com.gitee.sop.admin.common.exception; /** * @author tanghc diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/ExceptionCode.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/ExceptionCode.java old mode 100644 new mode 100755 similarity index 62% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/ExceptionCode.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/ExceptionCode.java index 1c56bf15..a14e64f3 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/ExceptionCode.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/ExceptionCode.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.exception; +package com.gitee.sop.admin.common.exception; /** * @author tanghc diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/JwtCreateException.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/JwtCreateException.java old mode 100644 new mode 100755 similarity index 79% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/JwtCreateException.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/JwtCreateException.java index 3f9ea65e..f067027c --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/JwtCreateException.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/JwtCreateException.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.exception; +package com.gitee.sop.admin.common.exception; /** * @author tanghc diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/JwtErrorException.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/JwtErrorException.java old mode 100644 new mode 100755 similarity index 76% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/JwtErrorException.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/JwtErrorException.java index 81f76057..232d4a82 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/JwtErrorException.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/JwtErrorException.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.exception; +package com.gitee.sop.admin.common.exception; /** * @author tanghc diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/JwtExpiredException.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/JwtExpiredException.java old mode 100644 new mode 100755 similarity index 75% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/JwtExpiredException.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/JwtExpiredException.java index 684f861c..2d1d5c84 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/JwtExpiredException.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/JwtExpiredException.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.exception; +package com.gitee.sop.admin.common.exception; /** * @author tanghc diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/LoginFailureException.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/LoginFailureException.java old mode 100644 new mode 100755 similarity index 86% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/LoginFailureException.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/LoginFailureException.java index 50cc75f8..724e02bf --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/LoginFailureException.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/LoginFailureException.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.exception; +package com.gitee.sop.admin.common.exception; /** * @author tanghc diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/SetPasswordException.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/SetPasswordException.java old mode 100644 new mode 100755 similarity index 79% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/SetPasswordException.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/SetPasswordException.java index a2680cb1..956e1cb7 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/exception/SetPasswordException.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/exception/SetPasswordException.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.exception; +package com.gitee.sop.admin.common.exception; /** * @author tanghc diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/fill/AddByFill.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/fill/AddByFill.java old mode 100644 new mode 100755 similarity index 87% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/fill/AddByFill.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/fill/AddByFill.java index 5ae8c308..5250dae1 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/fill/AddByFill.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/fill/AddByFill.java @@ -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.FillType; -import com.gitee.sop.adminbackend.common.context.UserContext; -import com.gitee.sop.adminbackend.common.user.User; +import com.gitee.sop.admin.common.context.UserContext; +import com.gitee.sop.admin.common.user.User; import java.lang.reflect.Field; import java.util.Objects; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/fill/UpdateByFill.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/fill/UpdateByFill.java old mode 100644 new mode 100755 similarity index 89% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/fill/UpdateByFill.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/fill/UpdateByFill.java index fab24f71..014caf32 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/fill/UpdateByFill.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/fill/UpdateByFill.java @@ -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; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/jackson/DateConverterProperties.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/jackson/DateConverterProperties.java old mode 100644 new mode 100755 similarity index 93% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/jackson/DateConverterProperties.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/jackson/DateConverterProperties.java index 735909ba..f15f604c --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/jackson/DateConverterProperties.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/jackson/DateConverterProperties.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.jackson; +package com.gitee.sop.admin.common.jackson; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/jackson/JacksonDateConverterConfig.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/jackson/JacksonDateConverterConfig.java old mode 100644 new mode 100755 similarity index 99% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/jackson/JacksonDateConverterConfig.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/jackson/JacksonDateConverterConfig.java index 379045b6..ed965cc1 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/jackson/JacksonDateConverterConfig.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/jackson/JacksonDateConverterConfig.java @@ -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.deser.std.DateDeserializers; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/jackson/convert/annotation/Bool.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/jackson/convert/annotation/Bool.java old mode 100644 new mode 100755 similarity index 74% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/jackson/convert/annotation/Bool.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/jackson/convert/annotation/Bool.java index a2b3d545..1b771bc5 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/jackson/convert/annotation/Bool.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/jackson/convert/annotation/Bool.java @@ -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.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.gitee.sop.adminbackend.common.jackson.convert.serde.BoolDeserializer; -import com.gitee.sop.adminbackend.common.jackson.convert.serde.BoolSerializer; +import com.gitee.sop.admin.common.jackson.convert.serde.BoolDeserializer; +import com.gitee.sop.admin.common.jackson.convert.serde.BoolSerializer; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/jackson/convert/serde/BoolDeserializer.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/jackson/convert/serde/BoolDeserializer.java old mode 100644 new mode 100755 similarity index 93% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/jackson/convert/serde/BoolDeserializer.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/jackson/convert/serde/BoolDeserializer.java index b80bf62d..fa796e78 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/jackson/convert/serde/BoolDeserializer.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/jackson/convert/serde/BoolDeserializer.java @@ -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.databind.DeserializationContext; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/jackson/convert/serde/BoolSerializer.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/jackson/convert/serde/BoolSerializer.java old mode 100644 new mode 100755 similarity index 93% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/jackson/convert/serde/BoolSerializer.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/jackson/convert/serde/BoolSerializer.java index c1b96dc3..dcfa5d91 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/jackson/convert/serde/BoolSerializer.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/jackson/convert/serde/BoolSerializer.java @@ -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.databind.JsonSerializer; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/manager/UserCacheManager.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/manager/UserCacheManager.java old mode 100644 new mode 100755 similarity index 74% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/manager/UserCacheManager.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/manager/UserCacheManager.java index ccaf4db3..e0d980ff --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/manager/UserCacheManager.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/manager/UserCacheManager.java @@ -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 六如 diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/req/IdParam.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/req/IdParam.java old mode 100644 new mode 100755 similarity index 79% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/req/IdParam.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/req/IdParam.java index 51bd2732..8f4c38f2 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/req/IdParam.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/req/IdParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.req; +package com.gitee.sop.admin.common.req; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/req/IdsParam.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/req/IdsParam.java old mode 100644 new mode 100755 similarity index 82% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/req/IdsParam.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/req/IdsParam.java index 7a6ca87e..68c8465e --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/req/IdsParam.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/req/IdsParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.req; +package com.gitee.sop.admin.common.req; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/req/StatusUpdateBatchParam.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/req/StatusUpdateBatchParam.java old mode 100644 new mode 100755 similarity index 86% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/req/StatusUpdateBatchParam.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/req/StatusUpdateBatchParam.java index 32d19411..5003daa7 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/req/StatusUpdateBatchParam.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/req/StatusUpdateBatchParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.req; +package com.gitee.sop.admin.common.req; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/req/StatusUpdateParam.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/req/StatusUpdateParam.java old mode 100644 new mode 100755 similarity index 86% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/req/StatusUpdateParam.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/req/StatusUpdateParam.java index ce16e32f..5ea9fb42 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/req/StatusUpdateParam.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/req/StatusUpdateParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.req; +package com.gitee.sop.admin.common.req; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/resp/Result.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/resp/Result.java old mode 100644 new mode 100755 similarity index 95% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/resp/Result.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/resp/Result.java index 9c4e75d1..5a16d167 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/resp/Result.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/resp/Result.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.resp; +package com.gitee.sop.admin.common.resp; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/resp/UserVO.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/resp/UserVO.java old mode 100644 new mode 100755 similarity index 79% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/resp/UserVO.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/resp/UserVO.java index a049c1bc..a779ca81 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/resp/UserVO.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/resp/UserVO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.resp; +package com.gitee.sop.admin.common.resp; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/support/ServiceSupport.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/support/ServiceSupport.java old mode 100644 new mode 100755 similarity index 89% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/support/ServiceSupport.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/support/ServiceSupport.java index e87af50f..2b563caa --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/support/ServiceSupport.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/support/ServiceSupport.java @@ -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.query.LambdaQuery; import com.gitee.fastmybatis.core.support.LambdaService; -import com.gitee.sop.adminbackend.common.context.UserContext; -import com.gitee.sop.adminbackend.common.util.DateUtil; +import com.gitee.sop.admin.common.context.UserContext; +import com.gitee.sop.admin.common.util.DateUtil; import java.time.LocalDateTime; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/user/User.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/user/User.java old mode 100644 new mode 100755 similarity index 91% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/user/User.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/user/User.java index 97ab1ee6..732f00f0 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/user/User.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/user/User.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.user; +package com.gitee.sop.admin.common.user; /** * 登录用户信息 diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/CopyUtil.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/CopyUtil.java old mode 100644 new mode 100755 similarity index 99% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/CopyUtil.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/CopyUtil.java index edd1dce8..c6bc688f --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/CopyUtil.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/CopyUtil.java @@ -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.gitee.fastmybatis.core.PageInfo; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/DateUtil.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/DateUtil.java old mode 100644 new mode 100755 similarity index 92% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/DateUtil.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/DateUtil.java index b0a0590f..76a10ea1 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/DateUtil.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/DateUtil.java @@ -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.format.DateTimeFormatter; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/GenerateUtil.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/GenerateUtil.java old mode 100644 new mode 100755 similarity index 90% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/GenerateUtil.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/GenerateUtil.java index c90bb0e7..e9a0fd5e --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/GenerateUtil.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/GenerateUtil.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.util; +package com.gitee.sop.admin.common.util; import lombok.extern.slf4j.Slf4j; import org.springframework.util.DigestUtils; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/IdGen.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/IdGen.java old mode 100644 new mode 100755 similarity index 99% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/IdGen.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/IdGen.java index 298f0d8d..3c594e8f --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/IdGen.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/IdGen.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.util; +package com.gitee.sop.admin.common.util; import java.util.UUID; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/JwtUtil.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/JwtUtil.java old mode 100644 new mode 100755 similarity index 91% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/JwtUtil.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/JwtUtil.java index f88ef2ce..c0346fe7 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/JwtUtil.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/JwtUtil.java @@ -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.JWTCreator; @@ -7,9 +7,9 @@ import com.auth0.jwt.algorithms.Algorithm; import com.auth0.jwt.exceptions.TokenExpiredException; import com.auth0.jwt.interfaces.Claim; import com.auth0.jwt.interfaces.DecodedJWT; -import com.gitee.sop.adminbackend.common.exception.JwtCreateException; -import com.gitee.sop.adminbackend.common.exception.JwtErrorException; -import com.gitee.sop.adminbackend.common.exception.JwtExpiredException; +import com.gitee.sop.admin.common.exception.JwtCreateException; +import com.gitee.sop.admin.common.exception.JwtErrorException; +import com.gitee.sop.admin.common.exception.JwtExpiredException; import lombok.extern.slf4j.Slf4j; import java.time.LocalDateTime; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/PasswordUtil.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/PasswordUtil.java old mode 100644 new mode 100755 similarity index 97% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/PasswordUtil.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/PasswordUtil.java index 034ace3b..27fca864 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/PasswordUtil.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/PasswordUtil.java @@ -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.Collections; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/RSATool.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/RSATool.java old mode 100644 new mode 100755 similarity index 99% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/RSATool.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/RSATool.java index f0e72724..7a79ec30 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/RSATool.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/RSATool.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.util; +package com.gitee.sop.admin.common.util; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/RequestUtil.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/RequestUtil.java old mode 100644 new mode 100755 similarity index 98% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/RequestUtil.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/RequestUtil.java index 57ef6c82..c5fed8aa --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/RequestUtil.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/RequestUtil.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.util; +package com.gitee.sop.admin.common.util; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; diff --git a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/SystemUtil.java b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/SystemUtil.java old mode 100644 new mode 100755 similarity index 94% rename from sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/SystemUtil.java rename to sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/SystemUtil.java index 35dacb33..74751de3 --- a/sop-admin/sop-admin-backend/backend-common/src/main/java/com/gitee/sop/adminbackend/common/util/SystemUtil.java +++ b/sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/util/SystemUtil.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.common.util; +package com.gitee.sop.admin.common.util; import org.springframework.boot.system.ApplicationHome; diff --git a/sop-admin/sop-admin-backend/backend-common/src/test/java/com/gitee/sop/adminbackend/common/RSAToolTest.java b/sop-admin/sop-admin-backend/admin-common/src/test/java/com/gitee/sop/admin/common/RSAToolTest.java old mode 100644 new mode 100755 similarity index 78% rename from sop-admin/sop-admin-backend/backend-common/src/test/java/com/gitee/sop/adminbackend/common/RSAToolTest.java rename to sop-admin/sop-admin-backend/admin-common/src/test/java/com/gitee/sop/admin/common/RSAToolTest.java index ead8e0a8..603159b9 --- a/sop-admin/sop-admin-backend/backend-common/src/test/java/com/gitee/sop/adminbackend/common/RSAToolTest.java +++ b/sop-admin/sop-admin-backend/admin-common/src/test/java/com/gitee/sop/admin/common/RSAToolTest.java @@ -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; /** diff --git a/sop-admin/sop-admin-backend/backend-dao/pom.xml b/sop-admin/sop-admin-backend/admin-dao/pom.xml old mode 100644 new mode 100755 similarity index 96% rename from sop-admin/sop-admin-backend/backend-dao/pom.xml rename to sop-admin/sop-admin-backend/admin-dao/pom.xml index 20cb2832..c1ae93d8 --- a/sop-admin/sop-admin-backend/backend-dao/pom.xml +++ b/sop-admin/sop-admin-backend/admin-dao/pom.xml @@ -9,7 +9,7 @@ 5.0.0-SNAPSHOT - backend-dao + admin-dao 8 diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/ApiInfo.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/ApiInfo.java old mode 100644 new mode 100755 similarity index 97% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/ApiInfo.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/ApiInfo.java index 6d325d46..309e21f4 --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/ApiInfo.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/ApiInfo.java @@ -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.PkStrategy; diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/DocApp.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/DocApp.java old mode 100644 new mode 100755 similarity index 95% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/DocApp.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/DocApp.java index 682e3c7d..3f7fffda --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/DocApp.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/DocApp.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.dao.entity; +package com.gitee.sop.admin.dao.entity; import java.time.LocalDateTime; diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/DocContent.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/DocContent.java old mode 100644 new mode 100755 similarity index 94% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/DocContent.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/DocContent.java index 15c190f0..f8d3c905 --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/DocContent.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/DocContent.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.dao.entity; +package com.gitee.sop.admin.dao.entity; import java.time.LocalDateTime; diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/DocInfo.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/DocInfo.java old mode 100644 new mode 100755 similarity index 97% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/DocInfo.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/DocInfo.java index bd95a5a0..59b92d63 --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/DocInfo.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/DocInfo.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.dao.entity; +package com.gitee.sop.admin.dao.entity; import java.time.LocalDateTime; diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/IsvInfo.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/IsvInfo.java old mode 100644 new mode 100755 similarity index 95% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/IsvInfo.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/IsvInfo.java index c192eb44..e76d2aa5 --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/IsvInfo.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/IsvInfo.java @@ -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.PkStrategy; diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/IsvKeys.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/IsvKeys.java old mode 100644 new mode 100755 similarity index 96% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/IsvKeys.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/IsvKeys.java index 177a29c0..e9bd02d6 --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/IsvKeys.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/IsvKeys.java @@ -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.PkStrategy; diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/PermGroup.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/PermGroup.java old mode 100644 new mode 100755 similarity index 95% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/PermGroup.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/PermGroup.java index cb49d547..bf03026a --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/PermGroup.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/PermGroup.java @@ -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.PkStrategy; diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/PermGroupPermission.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/PermGroupPermission.java old mode 100644 new mode 100755 similarity index 94% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/PermGroupPermission.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/PermGroupPermission.java index dc0ec9b7..6bc21b56 --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/PermGroupPermission.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/PermGroupPermission.java @@ -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.PkStrategy; diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/PermIsvGroup.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/PermIsvGroup.java old mode 100644 new mode 100755 similarity index 94% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/PermIsvGroup.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/PermIsvGroup.java index 52868ab0..0d922675 --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/PermIsvGroup.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/PermIsvGroup.java @@ -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.PkStrategy; diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysAdminUser.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysAdminUser.java old mode 100644 new mode 100755 similarity index 96% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysAdminUser.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysAdminUser.java index dc299104..75a91145 --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysAdminUser.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysAdminUser.java @@ -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.PkStrategy; diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysConfig.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysConfig.java old mode 100644 new mode 100755 similarity index 94% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysConfig.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysConfig.java index 53b716af..c1dcc237 --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysConfig.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysConfig.java @@ -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.PkStrategy; diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysDept.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysDept.java old mode 100644 new mode 100755 similarity index 95% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysDept.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysDept.java index 13db74cd..6cb0d592 --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysDept.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysDept.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.dao.entity; +package com.gitee.sop.admin.dao.entity; import java.time.LocalDateTime; diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysResource.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysResource.java old mode 100644 new mode 100755 similarity index 98% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysResource.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysResource.java index c64a3e26..3708972e --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysResource.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysResource.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.dao.entity; +package com.gitee.sop.admin.dao.entity; import java.time.LocalDateTime; diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysRole.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysRole.java old mode 100644 new mode 100755 similarity index 95% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysRole.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysRole.java index 08a7b011..40fea60b --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysRole.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysRole.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.dao.entity; +package com.gitee.sop.admin.dao.entity; import java.time.LocalDateTime; diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysRoleResource.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysRoleResource.java old mode 100644 new mode 100755 similarity index 94% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysRoleResource.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysRoleResource.java index fff9d13d..1bd8eb55 --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysRoleResource.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysRoleResource.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.dao.entity; +package com.gitee.sop.admin.dao.entity; import java.time.LocalDateTime; diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysUser.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysUser.java old mode 100644 new mode 100755 similarity index 96% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysUser.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysUser.java index ec7e3ebc..26526eac --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysUser.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysUser.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.dao.entity; +package com.gitee.sop.admin.dao.entity; import java.time.LocalDateTime; diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysUserDept.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysUserDept.java old mode 100644 new mode 100755 similarity index 94% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysUserDept.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysUserDept.java index 56721dae..9e3ca4dc --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysUserDept.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysUserDept.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.dao.entity; +package com.gitee.sop.admin.dao.entity; import java.time.LocalDateTime; diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysUserRole.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysUserRole.java old mode 100644 new mode 100755 similarity index 94% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysUserRole.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysUserRole.java index cdeeebf3..7a4ff0ae --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/entity/SysUserRole.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/entity/SysUserRole.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.dao.entity; +package com.gitee.sop.admin.dao.entity; import java.time.LocalDateTime; diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/ApiInfoMapper.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/ApiInfoMapper.java old mode 100644 new mode 100755 similarity index 81% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/ApiInfoMapper.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/ApiInfoMapper.java index b3d6c446..de1d257a --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/ApiInfoMapper.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/ApiInfoMapper.java @@ -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.sop.adminbackend.dao.entity.ApiInfo; +import com.gitee.sop.admin.dao.entity.ApiInfo; import org.apache.ibatis.annotations.Mapper; /** diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/DocAppMapper.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/DocAppMapper.java old mode 100644 new mode 100755 similarity index 77% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/DocAppMapper.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/DocAppMapper.java index 70763da6..e1b00de2 --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/DocAppMapper.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/DocAppMapper.java @@ -1,7 +1,7 @@ -package com.gitee.sop.adminbackend.dao.mapper; +package com.gitee.sop.admin.dao.mapper; import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.adminbackend.dao.entity.DocApp; +import com.gitee.sop.admin.dao.entity.DocApp; import org.apache.ibatis.annotations.Mapper; /** diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/DocContentMapper.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/DocContentMapper.java old mode 100644 new mode 100755 similarity index 66% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/DocContentMapper.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/DocContentMapper.java index 57b14b4c..84f64979 --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/DocContentMapper.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/DocContentMapper.java @@ -1,7 +1,7 @@ -package com.gitee.sop.adminbackend.dao.mapper; +package com.gitee.sop.admin.dao.mapper; import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.adminbackend.dao.entity.DocContent; +import com.gitee.sop.admin.dao.entity.DocContent; import org.apache.ibatis.annotations.Mapper; /** diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/DocInfoMapper.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/DocInfoMapper.java old mode 100644 new mode 100755 similarity index 66% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/DocInfoMapper.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/DocInfoMapper.java index e706d91a..72491a4d --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/DocInfoMapper.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/DocInfoMapper.java @@ -1,7 +1,7 @@ -package com.gitee.sop.adminbackend.dao.mapper; +package com.gitee.sop.admin.dao.mapper; import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.adminbackend.dao.entity.DocInfo; +import com.gitee.sop.admin.dao.entity.DocInfo; import org.apache.ibatis.annotations.Mapper; /** diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/IsvInfoMapper.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/IsvInfoMapper.java old mode 100644 new mode 100755 similarity index 75% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/IsvInfoMapper.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/IsvInfoMapper.java index c59b7829..a95f17ba --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/IsvInfoMapper.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/IsvInfoMapper.java @@ -1,7 +1,7 @@ -package com.gitee.sop.adminbackend.dao.mapper; +package com.gitee.sop.admin.dao.mapper; import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.adminbackend.dao.entity.IsvInfo; +import com.gitee.sop.admin.dao.entity.IsvInfo; import org.apache.ibatis.annotations.Mapper; /** diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/IsvKeysMapper.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/IsvKeysMapper.java old mode 100644 new mode 100755 similarity index 71% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/IsvKeysMapper.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/IsvKeysMapper.java index c531b5b6..532a64c8 --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/IsvKeysMapper.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/IsvKeysMapper.java @@ -1,7 +1,7 @@ -package com.gitee.sop.adminbackend.dao.mapper; +package com.gitee.sop.admin.dao.mapper; import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.adminbackend.dao.entity.IsvKeys; +import com.gitee.sop.admin.dao.entity.IsvKeys; /** * @author 六如 diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/PermGroupMapper.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/PermGroupMapper.java old mode 100644 new mode 100755 similarity index 59% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/PermGroupMapper.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/PermGroupMapper.java index 560f4756..ef0a959e --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/PermGroupMapper.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/PermGroupMapper.java @@ -1,7 +1,7 @@ -package com.gitee.sop.adminbackend.dao.mapper; +package com.gitee.sop.admin.dao.mapper; import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.adminbackend.dao.entity.PermGroup; +import com.gitee.sop.admin.dao.entity.PermGroup; /** * @author 六如 diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/PermGroupPermissionMapper.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/PermGroupPermissionMapper.java old mode 100644 new mode 100755 similarity index 59% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/PermGroupPermissionMapper.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/PermGroupPermissionMapper.java index 5245a400..ffb5c6dc --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/PermGroupPermissionMapper.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/PermGroupPermissionMapper.java @@ -1,7 +1,7 @@ -package com.gitee.sop.adminbackend.dao.mapper; +package com.gitee.sop.admin.dao.mapper; import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.adminbackend.dao.entity.PermGroupPermission; +import com.gitee.sop.admin.dao.entity.PermGroupPermission; /** * @author 六如 diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/PermIsvGroupMapper.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/PermIsvGroupMapper.java old mode 100644 new mode 100755 similarity index 66% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/PermIsvGroupMapper.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/PermIsvGroupMapper.java index 475e29e1..871f940a --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/PermIsvGroupMapper.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/PermIsvGroupMapper.java @@ -1,7 +1,7 @@ -package com.gitee.sop.adminbackend.dao.mapper; +package com.gitee.sop.admin.dao.mapper; import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.adminbackend.dao.entity.PermIsvGroup; +import com.gitee.sop.admin.dao.entity.PermIsvGroup; import org.apache.ibatis.annotations.Mapper; /** diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysAdminUserMapper.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysAdminUserMapper.java old mode 100644 new mode 100755 similarity index 59% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysAdminUserMapper.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysAdminUserMapper.java index 888d9ba9..c024294a --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysAdminUserMapper.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysAdminUserMapper.java @@ -1,7 +1,7 @@ -package com.gitee.sop.adminbackend.dao.mapper; +package com.gitee.sop.admin.dao.mapper; import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.adminbackend.dao.entity.SysAdminUser; +import com.gitee.sop.admin.dao.entity.SysAdminUser; /** * @author 六如 diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysConfigMapper.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysConfigMapper.java old mode 100644 new mode 100755 similarity index 59% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysConfigMapper.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysConfigMapper.java index b83bf6dc..48aea28e --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysConfigMapper.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysConfigMapper.java @@ -1,7 +1,7 @@ -package com.gitee.sop.adminbackend.dao.mapper; +package com.gitee.sop.admin.dao.mapper; import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.adminbackend.dao.entity.SysConfig; +import com.gitee.sop.admin.dao.entity.SysConfig; /** * @author 六如 diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysDeptMapper.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysDeptMapper.java old mode 100644 new mode 100755 similarity index 66% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysDeptMapper.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysDeptMapper.java index 54d57680..10cf6c3e --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysDeptMapper.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysDeptMapper.java @@ -1,7 +1,7 @@ -package com.gitee.sop.adminbackend.dao.mapper; +package com.gitee.sop.admin.dao.mapper; import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.adminbackend.dao.entity.SysDept; +import com.gitee.sop.admin.dao.entity.SysDept; import org.apache.ibatis.annotations.Mapper; /** diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysResourceMapper.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysResourceMapper.java old mode 100644 new mode 100755 similarity index 66% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysResourceMapper.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysResourceMapper.java index ffb560b6..d2f03deb --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysResourceMapper.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysResourceMapper.java @@ -1,7 +1,7 @@ -package com.gitee.sop.adminbackend.dao.mapper; +package com.gitee.sop.admin.dao.mapper; import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.adminbackend.dao.entity.SysResource; +import com.gitee.sop.admin.dao.entity.SysResource; import org.apache.ibatis.annotations.Mapper; /** diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysRoleMapper.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysRoleMapper.java old mode 100644 new mode 100755 similarity index 66% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysRoleMapper.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysRoleMapper.java index 06d89804..f3d21d45 --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysRoleMapper.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysRoleMapper.java @@ -1,7 +1,7 @@ -package com.gitee.sop.adminbackend.dao.mapper; +package com.gitee.sop.admin.dao.mapper; import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.adminbackend.dao.entity.SysRole; +import com.gitee.sop.admin.dao.entity.SysRole; import org.apache.ibatis.annotations.Mapper; /** diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysRoleResourceMapper.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysRoleResourceMapper.java old mode 100644 new mode 100755 similarity index 66% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysRoleResourceMapper.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysRoleResourceMapper.java index 83193d61..7969c25a --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysRoleResourceMapper.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysRoleResourceMapper.java @@ -1,7 +1,7 @@ -package com.gitee.sop.adminbackend.dao.mapper; +package com.gitee.sop.admin.dao.mapper; import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.adminbackend.dao.entity.SysRoleResource; +import com.gitee.sop.admin.dao.entity.SysRoleResource; import org.apache.ibatis.annotations.Mapper; /** diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysUserDeptMapper.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysUserDeptMapper.java old mode 100644 new mode 100755 similarity index 66% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysUserDeptMapper.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysUserDeptMapper.java index 41ef5a5b..d2a2301e --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysUserDeptMapper.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysUserDeptMapper.java @@ -1,7 +1,7 @@ -package com.gitee.sop.adminbackend.dao.mapper; +package com.gitee.sop.admin.dao.mapper; import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.adminbackend.dao.entity.SysUserDept; +import com.gitee.sop.admin.dao.entity.SysUserDept; import org.apache.ibatis.annotations.Mapper; /** diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysUserMapper.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysUserMapper.java old mode 100644 new mode 100755 similarity index 66% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysUserMapper.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysUserMapper.java index 46fc459a..a3e69b69 --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysUserMapper.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysUserMapper.java @@ -1,7 +1,7 @@ -package com.gitee.sop.adminbackend.dao.mapper; +package com.gitee.sop.admin.dao.mapper; import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.adminbackend.dao.entity.SysUser; +import com.gitee.sop.admin.dao.entity.SysUser; import org.apache.ibatis.annotations.Mapper; /** diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysUserRoleMapper.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysUserRoleMapper.java old mode 100644 new mode 100755 similarity index 66% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysUserRoleMapper.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysUserRoleMapper.java index 115614d8..47fe3ab2 --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/SysUserRoleMapper.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/SysUserRoleMapper.java @@ -1,7 +1,7 @@ -package com.gitee.sop.adminbackend.dao.mapper; +package com.gitee.sop.admin.dao.mapper; import com.gitee.fastmybatis.core.mapper.BaseMapper; -import com.gitee.sop.adminbackend.dao.entity.SysUserRole; +import com.gitee.sop.admin.dao.entity.SysUserRole; import org.apache.ibatis.annotations.Mapper; /** diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/UpgradeMapper.java b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/UpgradeMapper.java old mode 100644 new mode 100755 similarity index 92% rename from sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/UpgradeMapper.java rename to sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/UpgradeMapper.java index eff23463..5309b9ac --- a/sop-admin/sop-admin-backend/backend-dao/src/main/java/com/gitee/sop/adminbackend/dao/mapper/UpgradeMapper.java +++ b/sop-admin/sop-admin-backend/admin-dao/src/main/java/com/gitee/sop/admin/dao/mapper/UpgradeMapper.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.dao.mapper; +package com.gitee.sop.admin.dao.mapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/resources/mybatis/mapper/UpgradeMapper.xml b/sop-admin/sop-admin-backend/admin-dao/src/main/resources/mybatis/mapper/UpgradeMapper.xml old mode 100644 new mode 100755 similarity index 100% rename from sop-admin/sop-admin-backend/backend-dao/src/main/resources/mybatis/mapper/UpgradeMapper.xml rename to sop-admin/sop-admin-backend/admin-dao/src/main/resources/mybatis/mapper/UpgradeMapper.xml diff --git a/sop-admin/sop-admin-backend/backend-dao/src/main/resources/mybatis/mybatisConfig.xml b/sop-admin/sop-admin-backend/admin-dao/src/main/resources/mybatis/mybatisConfig.xml old mode 100644 new mode 100755 similarity index 100% rename from sop-admin/sop-admin-backend/backend-dao/src/main/resources/mybatis/mybatisConfig.xml rename to sop-admin/sop-admin-backend/admin-dao/src/main/resources/mybatis/mybatisConfig.xml diff --git a/sop-admin/sop-admin-backend/backend-service/pom.xml b/sop-admin/sop-admin-backend/admin-service/pom.xml old mode 100644 new mode 100755 similarity index 90% rename from sop-admin/sop-admin-backend/backend-service/pom.xml rename to sop-admin/sop-admin-backend/admin-service/pom.xml index 8240fc4f..4489abd1 --- a/sop-admin/sop-admin-backend/backend-service/pom.xml +++ b/sop-admin/sop-admin-backend/admin-service/pom.xml @@ -9,7 +9,7 @@ 5.0.0-SNAPSHOT - backend-service + admin-service 8 @@ -20,12 +20,12 @@ com.gitee.sop - backend-common + admin-common 5.0.0-SNAPSHOT com.gitee.sop - backend-dao + admin-dao 5.0.0-SNAPSHOT diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/DocAppService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocAppService.java old mode 100644 new mode 100755 similarity index 72% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/DocAppService.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocAppService.java index bae917f3..b7c3a142 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/DocAppService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocAppService.java @@ -1,12 +1,12 @@ -package com.gitee.sop.adminbackend.service.doc; +package com.gitee.sop.admin.service.doc; -import com.gitee.sop.adminbackend.common.support.ServiceSupport; -import com.gitee.sop.adminbackend.common.user.User; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.dao.entity.DocApp; -import com.gitee.sop.adminbackend.dao.mapper.DocAppMapper; -import com.gitee.sop.adminbackend.service.doc.dto.DocAppDTO; -import com.gitee.sop.adminbackend.service.doc.dto.torna.TornaModuleDTO; +import com.gitee.sop.admin.common.support.ServiceSupport; +import com.gitee.sop.admin.common.user.User; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.dao.entity.DocApp; +import com.gitee.sop.admin.dao.mapper.DocAppMapper; +import com.gitee.sop.admin.service.doc.dto.DocAppDTO; +import com.gitee.sop.admin.service.doc.dto.torna.TornaModuleDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/DocContentService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocContentService.java old mode 100644 new mode 100755 similarity index 79% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/DocContentService.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocContentService.java index 29a8245b..883d8930 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/DocContentService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocContentService.java @@ -1,8 +1,8 @@ -package com.gitee.sop.adminbackend.service.doc; +package com.gitee.sop.admin.service.doc; -import com.gitee.sop.adminbackend.common.support.ServiceSupport; -import com.gitee.sop.adminbackend.dao.entity.DocContent; -import com.gitee.sop.adminbackend.dao.mapper.DocContentMapper; +import com.gitee.sop.admin.common.support.ServiceSupport; +import com.gitee.sop.admin.dao.entity.DocContent; +import com.gitee.sop.admin.dao.mapper.DocContentMapper; import org.springframework.stereotype.Service; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/DocInfoService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocInfoService.java old mode 100644 new mode 100755 similarity index 82% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/DocInfoService.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocInfoService.java index ad068ca0..45fdc88b --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/DocInfoService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocInfoService.java @@ -1,19 +1,19 @@ -package com.gitee.sop.adminbackend.service.doc; +package com.gitee.sop.admin.service.doc; import com.alibaba.fastjson2.JSON; import com.gitee.fastmybatis.core.util.TreeUtil; -import com.gitee.sop.adminbackend.common.constants.YesOrNo; -import com.gitee.sop.adminbackend.common.exception.BizException; -import com.gitee.sop.adminbackend.common.support.ServiceSupport; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.dao.entity.DocApp; -import com.gitee.sop.adminbackend.dao.entity.DocInfo; -import com.gitee.sop.adminbackend.dao.mapper.DocAppMapper; -import com.gitee.sop.adminbackend.dao.mapper.DocInfoMapper; -import com.gitee.sop.adminbackend.service.doc.dto.DocInfoPublishUpdateDTO; -import com.gitee.sop.adminbackend.service.doc.dto.DocInfoTreeDTO; -import com.gitee.sop.adminbackend.service.doc.dto.torna.TornaDocInfoViewDTO; -import com.gitee.sop.adminbackend.service.sys.SysUserService; +import com.gitee.sop.admin.common.constants.YesOrNo; +import com.gitee.sop.admin.common.exception.BizException; +import com.gitee.sop.admin.common.support.ServiceSupport; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.dao.entity.DocApp; +import com.gitee.sop.admin.dao.entity.DocInfo; +import com.gitee.sop.admin.dao.mapper.DocAppMapper; +import com.gitee.sop.admin.dao.mapper.DocInfoMapper; +import com.gitee.sop.admin.service.doc.dto.DocInfoPublishUpdateDTO; +import com.gitee.sop.admin.service.doc.dto.DocInfoTreeDTO; +import com.gitee.sop.admin.service.doc.dto.torna.TornaDocInfoViewDTO; +import com.gitee.sop.admin.service.sys.SysUserService; import com.google.common.collect.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/DocInfoSyncService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocInfoSyncService.java old mode 100644 new mode 100755 similarity index 91% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/DocInfoSyncService.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocInfoSyncService.java index 88105b8f..42872dc9 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/DocInfoSyncService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocInfoSyncService.java @@ -1,19 +1,19 @@ -package com.gitee.sop.adminbackend.service.doc; +package com.gitee.sop.admin.service.doc; import com.alibaba.fastjson2.JSON; import com.gitee.fastmybatis.core.util.TreeUtil; -import com.gitee.sop.adminbackend.common.constants.YesOrNo; -import com.gitee.sop.adminbackend.common.enums.DocSourceTypeEnum; -import com.gitee.sop.adminbackend.common.user.User; -import com.gitee.sop.adminbackend.dao.entity.DocApp; -import com.gitee.sop.adminbackend.dao.entity.DocInfo; -import com.gitee.sop.adminbackend.dao.mapper.DocAppMapper; -import com.gitee.sop.adminbackend.service.doc.dto.torna.DocIdParam; -import com.gitee.sop.adminbackend.service.doc.dto.torna.DocIdsParam; -import com.gitee.sop.adminbackend.service.doc.dto.torna.TornaDocDTO; -import com.gitee.sop.adminbackend.service.doc.dto.torna.TornaDocInfoDTO; -import com.gitee.sop.adminbackend.service.doc.dto.torna.TornaDocInfoViewDTO; -import com.gitee.sop.adminbackend.service.doc.dto.torna.TornaDocParamDTO; +import com.gitee.sop.admin.common.constants.YesOrNo; +import com.gitee.sop.admin.common.enums.DocSourceTypeEnum; +import com.gitee.sop.admin.common.user.User; +import com.gitee.sop.admin.dao.entity.DocApp; +import com.gitee.sop.admin.dao.entity.DocInfo; +import com.gitee.sop.admin.dao.mapper.DocAppMapper; +import com.gitee.sop.admin.service.doc.dto.torna.DocIdParam; +import com.gitee.sop.admin.service.doc.dto.torna.DocIdsParam; +import com.gitee.sop.admin.service.doc.dto.torna.TornaDocDTO; +import com.gitee.sop.admin.service.doc.dto.torna.TornaDocInfoDTO; +import com.gitee.sop.admin.service.doc.dto.torna.TornaDocInfoViewDTO; +import com.gitee.sop.admin.service.doc.dto.torna.TornaDocParamDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/DocSettingService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocSettingService.java old mode 100644 new mode 100755 similarity index 81% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/DocSettingService.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocSettingService.java index 6e0c677e..65ed3984 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/DocSettingService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/DocSettingService.java @@ -1,9 +1,9 @@ -package com.gitee.sop.adminbackend.service.doc; +package com.gitee.sop.admin.service.doc; -import com.gitee.sop.adminbackend.common.enums.ConfigKeyEnum; -import com.gitee.sop.adminbackend.service.doc.dto.DocSettingDTO; -import com.gitee.sop.adminbackend.service.sys.SysConfigService; -import com.gitee.sop.adminbackend.service.sys.dto.SystemConfigDTO; +import com.gitee.sop.admin.common.enums.ConfigKeyEnum; +import com.gitee.sop.admin.service.doc.dto.DocSettingDTO; +import com.gitee.sop.admin.service.sys.SysConfigService; +import com.gitee.sop.admin.service.sys.dto.SystemConfigDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/TornaClient.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/TornaClient.java old mode 100644 new mode 100755 similarity index 92% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/TornaClient.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/TornaClient.java index 71b875d4..3ac63446 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/TornaClient.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/TornaClient.java @@ -1,11 +1,11 @@ -package com.gitee.sop.adminbackend.service.doc; +package com.gitee.sop.admin.service.doc; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.gitee.httphelper.HttpHelper; -import com.gitee.sop.adminbackend.common.enums.ConfigKeyEnum; -import com.gitee.sop.adminbackend.common.exception.BizException; +import com.gitee.sop.admin.common.enums.ConfigKeyEnum; +import com.gitee.sop.admin.common.exception.BizException; import org.springframework.stereotype.Component; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/DocAppDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/DocAppDTO.java old mode 100644 new mode 100755 similarity index 91% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/DocAppDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/DocAppDTO.java index 32ee43e3..2757c180 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/DocAppDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/DocAppDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.doc.dto; +package com.gitee.sop.admin.service.doc.dto; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/DocInfoConfigDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/DocInfoConfigDTO.java old mode 100644 new mode 100755 similarity index 75% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/DocInfoConfigDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/DocInfoConfigDTO.java index c4612894..dbd0b792 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/DocInfoConfigDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/DocInfoConfigDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.doc.dto; +package com.gitee.sop.admin.service.doc.dto; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/DocInfoPublishUpdateDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/DocInfoPublishUpdateDTO.java old mode 100644 new mode 100755 similarity index 82% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/DocInfoPublishUpdateDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/DocInfoPublishUpdateDTO.java index 38e58bdf..59e958b1 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/DocInfoPublishUpdateDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/DocInfoPublishUpdateDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.doc.dto; +package com.gitee.sop.admin.service.doc.dto; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/DocInfoTreeDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/DocInfoTreeDTO.java old mode 100644 new mode 100755 similarity index 93% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/DocInfoTreeDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/DocInfoTreeDTO.java index 2a44ea52..9ec3845d --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/DocInfoTreeDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/DocInfoTreeDTO.java @@ -1,7 +1,7 @@ -package com.gitee.sop.adminbackend.service.doc.dto; +package com.gitee.sop.admin.service.doc.dto; import com.gitee.fastmybatis.core.support.TreeNode; -import com.gitee.sop.adminbackend.common.dto.UserDTO; +import com.gitee.sop.admin.common.dto.UserDTO; import lombok.Data; import java.time.LocalDateTime; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/DocInfoViewDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/DocInfoViewDTO.java old mode 100644 new mode 100755 similarity index 57% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/DocInfoViewDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/DocInfoViewDTO.java index aa48ddec..a9b8413f --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/DocInfoViewDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/DocInfoViewDTO.java @@ -1,6 +1,6 @@ -package com.gitee.sop.adminbackend.service.doc.dto; +package com.gitee.sop.admin.service.doc.dto; -import com.gitee.sop.adminbackend.service.doc.dto.torna.TornaDocInfoViewDTO; +import com.gitee.sop.admin.service.doc.dto.torna.TornaDocInfoViewDTO; import lombok.Data; /** diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/DocSettingDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/DocSettingDTO.java old mode 100644 new mode 100755 similarity index 85% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/DocSettingDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/DocSettingDTO.java index b143f0d7..ef55fbfe --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/DocSettingDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/DocSettingDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.doc.dto; +package com.gitee.sop.admin.service.doc.dto; import lombok.Data; import org.hibernate.validator.constraints.Length; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/torna/DocIdParam.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/torna/DocIdParam.java old mode 100644 new mode 100755 similarity index 76% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/torna/DocIdParam.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/torna/DocIdParam.java index b60d0183..c2129417 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/torna/DocIdParam.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/torna/DocIdParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.doc.dto.torna; +package com.gitee.sop.admin.service.doc.dto.torna; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/torna/DocIdsParam.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/torna/DocIdsParam.java old mode 100644 new mode 100755 similarity index 84% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/torna/DocIdsParam.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/torna/DocIdsParam.java index 94cb8f8f..1a91ecba --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/torna/DocIdsParam.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/torna/DocIdsParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.doc.dto.torna; +package com.gitee.sop.admin.service.doc.dto.torna; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/torna/TornaDocDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/torna/TornaDocDTO.java old mode 100644 new mode 100755 similarity index 72% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/torna/TornaDocDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/torna/TornaDocDTO.java index 4f48944c..c17cf171 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/torna/TornaDocDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/torna/TornaDocDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.doc.dto.torna; +package com.gitee.sop.admin.service.doc.dto.torna; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/torna/TornaDocInfoDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/torna/TornaDocInfoDTO.java old mode 100644 new mode 100755 similarity index 93% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/torna/TornaDocInfoDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/torna/TornaDocInfoDTO.java index 0b57a5f9..8b48aacf --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/torna/TornaDocInfoDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/torna/TornaDocInfoDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.doc.dto.torna; +package com.gitee.sop.admin.service.doc.dto.torna; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/torna/TornaDocInfoViewDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/torna/TornaDocInfoViewDTO.java old mode 100644 new mode 100755 similarity index 98% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/torna/TornaDocInfoViewDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/torna/TornaDocInfoViewDTO.java index f8758a52..66794e92 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/torna/TornaDocInfoViewDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/torna/TornaDocInfoViewDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.doc.dto.torna; +package com.gitee.sop.admin.service.doc.dto.torna; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/torna/TornaDocParamDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/torna/TornaDocParamDTO.java old mode 100644 new mode 100755 similarity index 97% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/torna/TornaDocParamDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/torna/TornaDocParamDTO.java index 443fa369..0526be35 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/torna/TornaDocParamDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/torna/TornaDocParamDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.doc.dto.torna; +package com.gitee.sop.admin.service.doc.dto.torna; import com.gitee.fastmybatis.core.support.TreeNode; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/torna/TornaModuleDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/torna/TornaModuleDTO.java old mode 100644 new mode 100755 similarity index 69% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/torna/TornaModuleDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/torna/TornaModuleDTO.java index db84b74b..418139d7 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/torna/TornaModuleDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/doc/dto/torna/TornaModuleDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.doc.dto.torna; +package com.gitee.sop.admin.service.doc.dto.torna; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/IsvInfoService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/IsvInfoService.java old mode 100644 new mode 100755 similarity index 82% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/IsvInfoService.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/IsvInfoService.java index c14aa07f..271af57e --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/IsvInfoService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/IsvInfoService.java @@ -1,24 +1,24 @@ -package com.gitee.sop.adminbackend.service.isv; +package com.gitee.sop.admin.service.isv; import com.gitee.fastmybatis.core.PageInfo; import com.gitee.fastmybatis.core.query.LambdaQuery; -import com.gitee.sop.adminbackend.common.constants.YesOrNo; -import com.gitee.sop.adminbackend.common.context.SpringContext; -import com.gitee.sop.adminbackend.common.dto.StatusUpdateDTO; -import com.gitee.sop.adminbackend.common.enums.StatusEnum; -import com.gitee.sop.adminbackend.common.support.ServiceSupport; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.common.util.IdGen; -import com.gitee.sop.adminbackend.common.util.RSATool; -import com.gitee.sop.adminbackend.dao.entity.IsvInfo; -import com.gitee.sop.adminbackend.dao.entity.IsvKeys; -import com.gitee.sop.adminbackend.dao.mapper.IsvInfoMapper; -import com.gitee.sop.adminbackend.service.isv.dto.IsvInfoAddDTO; -import com.gitee.sop.adminbackend.service.isv.dto.IsvInfoDTO; -import com.gitee.sop.adminbackend.service.isv.dto.IsvInfoUpdateDTO; -import com.gitee.sop.adminbackend.service.isv.dto.IsvInfoUpdateKeysDTO; -import com.gitee.sop.adminbackend.service.isv.dto.IsvKeysDTO; -import com.gitee.sop.adminbackend.service.isv.event.ChangeIsvInfoEvent; +import com.gitee.sop.admin.common.constants.YesOrNo; +import com.gitee.sop.admin.common.context.SpringContext; +import com.gitee.sop.admin.common.dto.StatusUpdateDTO; +import com.gitee.sop.admin.common.enums.StatusEnum; +import com.gitee.sop.admin.common.support.ServiceSupport; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.common.util.IdGen; +import com.gitee.sop.admin.common.util.RSATool; +import com.gitee.sop.admin.dao.entity.IsvInfo; +import com.gitee.sop.admin.dao.entity.IsvKeys; +import com.gitee.sop.admin.dao.mapper.IsvInfoMapper; +import com.gitee.sop.admin.service.isv.dto.IsvInfoAddDTO; +import com.gitee.sop.admin.service.isv.dto.IsvInfoDTO; +import com.gitee.sop.admin.service.isv.dto.IsvInfoUpdateDTO; +import com.gitee.sop.admin.service.isv.dto.IsvInfoUpdateKeysDTO; +import com.gitee.sop.admin.service.isv.dto.IsvKeysDTO; +import com.gitee.sop.admin.service.isv.event.ChangeIsvInfoEvent; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/IsvKeysService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/IsvKeysService.java old mode 100644 new mode 100755 similarity index 59% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/IsvKeysService.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/IsvKeysService.java index 6ec45e1b..539b62f6 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/IsvKeysService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/IsvKeysService.java @@ -1,12 +1,12 @@ -package com.gitee.sop.adminbackend.service.isv; +package com.gitee.sop.admin.service.isv; -import com.gitee.sop.adminbackend.common.context.SpringContext; -import com.gitee.sop.adminbackend.common.support.ServiceSupport; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.dao.entity.IsvKeys; -import com.gitee.sop.adminbackend.dao.mapper.IsvKeysMapper; -import com.gitee.sop.adminbackend.service.isv.dto.IsvInfoUpdateKeysDTO; -import com.gitee.sop.adminbackend.service.isv.event.ChangeIsvKeyEvent; +import com.gitee.sop.admin.common.context.SpringContext; +import com.gitee.sop.admin.common.support.ServiceSupport; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.dao.entity.IsvKeys; +import com.gitee.sop.admin.dao.mapper.IsvKeysMapper; +import com.gitee.sop.admin.service.isv.dto.IsvInfoUpdateKeysDTO; +import com.gitee.sop.admin.service.isv.event.ChangeIsvKeyEvent; import org.springframework.stereotype.Service; import java.util.Collections; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/PermGroupPermissionService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/PermGroupPermissionService.java old mode 100644 new mode 100755 similarity index 81% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/PermGroupPermissionService.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/PermGroupPermissionService.java index 2e72ac76..603b1d9e --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/PermGroupPermissionService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/PermGroupPermissionService.java @@ -1,17 +1,17 @@ -package com.gitee.sop.adminbackend.service.isv; +package com.gitee.sop.admin.service.isv; import com.gitee.fastmybatis.core.PageInfo; import com.gitee.fastmybatis.core.query.LambdaQuery; -import com.gitee.sop.adminbackend.common.context.SpringContext; -import com.gitee.sop.adminbackend.common.support.ServiceSupport; -import com.gitee.sop.adminbackend.dao.entity.ApiInfo; -import com.gitee.sop.adminbackend.dao.entity.PermGroupPermission; -import com.gitee.sop.adminbackend.dao.entity.PermIsvGroup; -import com.gitee.sop.adminbackend.dao.mapper.ApiInfoMapper; -import com.gitee.sop.adminbackend.dao.mapper.PermGroupPermissionMapper; -import com.gitee.sop.adminbackend.dao.mapper.PermIsvGroupMapper; -import com.gitee.sop.adminbackend.service.isv.dto.PermGroupPermissionDTO; -import com.gitee.sop.adminbackend.service.isv.event.ChangeIsvPermEvent; +import com.gitee.sop.admin.common.context.SpringContext; +import com.gitee.sop.admin.common.support.ServiceSupport; +import com.gitee.sop.admin.dao.entity.ApiInfo; +import com.gitee.sop.admin.dao.entity.PermGroupPermission; +import com.gitee.sop.admin.dao.entity.PermIsvGroup; +import com.gitee.sop.admin.dao.mapper.ApiInfoMapper; +import com.gitee.sop.admin.dao.mapper.PermGroupPermissionMapper; +import com.gitee.sop.admin.dao.mapper.PermIsvGroupMapper; +import com.gitee.sop.admin.service.isv.dto.PermGroupPermissionDTO; +import com.gitee.sop.admin.service.isv.event.ChangeIsvPermEvent; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/PermGroupService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/PermGroupService.java old mode 100644 new mode 100755 similarity index 75% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/PermGroupService.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/PermGroupService.java index c14960ce..102e3cab --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/PermGroupService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/PermGroupService.java @@ -1,13 +1,13 @@ -package com.gitee.sop.adminbackend.service.isv; +package com.gitee.sop.admin.service.isv; import com.gitee.fastmybatis.core.PageInfo; import com.gitee.fastmybatis.core.query.LambdaQuery; -import com.gitee.sop.adminbackend.common.exception.BizException; -import com.gitee.sop.adminbackend.common.support.ServiceSupport; -import com.gitee.sop.adminbackend.dao.entity.PermGroup; -import com.gitee.sop.adminbackend.dao.entity.PermIsvGroup; -import com.gitee.sop.adminbackend.dao.mapper.PermGroupMapper; -import com.gitee.sop.adminbackend.dao.mapper.PermIsvGroupMapper; +import com.gitee.sop.admin.common.exception.BizException; +import com.gitee.sop.admin.common.support.ServiceSupport; +import com.gitee.sop.admin.dao.entity.PermGroup; +import com.gitee.sop.admin.dao.entity.PermIsvGroup; +import com.gitee.sop.admin.dao.mapper.PermGroupMapper; +import com.gitee.sop.admin.dao.mapper.PermIsvGroupMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/PermIsvGroupService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/PermIsvGroupService.java old mode 100644 new mode 100755 similarity index 90% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/PermIsvGroupService.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/PermIsvGroupService.java index 49a49a58..eb987911 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/PermIsvGroupService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/PermIsvGroupService.java @@ -1,11 +1,11 @@ -package com.gitee.sop.adminbackend.service.isv; +package com.gitee.sop.admin.service.isv; import com.gitee.fastmybatis.core.PageInfo; import com.gitee.fastmybatis.core.query.LambdaQuery; -import com.gitee.sop.adminbackend.common.support.ServiceSupport; -import com.gitee.sop.adminbackend.dao.entity.PermIsvGroup; -import com.gitee.sop.adminbackend.dao.mapper.PermIsvGroupMapper; -import com.gitee.sop.adminbackend.service.isv.dto.IsvGroupSettingDTO; +import com.gitee.sop.admin.common.support.ServiceSupport; +import com.gitee.sop.admin.dao.entity.PermIsvGroup; +import com.gitee.sop.admin.dao.mapper.PermIsvGroupMapper; +import com.gitee.sop.admin.service.isv.dto.IsvGroupSettingDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/IsvGroupSettingDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/dto/IsvGroupSettingDTO.java old mode 100644 new mode 100755 similarity index 81% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/IsvGroupSettingDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/dto/IsvGroupSettingDTO.java index 14c9aba2..bb496996 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/IsvGroupSettingDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/dto/IsvGroupSettingDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.isv.dto; +package com.gitee.sop.admin.service.isv.dto; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/IsvInfoAddDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/dto/IsvInfoAddDTO.java old mode 100644 new mode 100755 similarity index 87% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/IsvInfoAddDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/dto/IsvInfoAddDTO.java index 1b250d1b..b7935343 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/IsvInfoAddDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/dto/IsvInfoAddDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.isv.dto; +package com.gitee.sop.admin.service.isv.dto; import lombok.Data; import org.hibernate.validator.constraints.Length; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/IsvInfoDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/dto/IsvInfoDTO.java old mode 100644 new mode 100755 similarity index 83% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/IsvInfoDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/dto/IsvInfoDTO.java index e21c3c58..46a81e96 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/IsvInfoDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/dto/IsvInfoDTO.java @@ -1,6 +1,6 @@ -package com.gitee.sop.adminbackend.service.isv.dto; +package com.gitee.sop.admin.service.isv.dto; -import com.gitee.sop.adminbackend.service.jackson.convert.annotation.UserFormat; +import com.gitee.sop.admin.service.jackson.convert.annotation.UserFormat; import lombok.Data; import java.time.LocalDateTime; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/IsvInfoUpdateDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/dto/IsvInfoUpdateDTO.java old mode 100644 new mode 100755 similarity index 79% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/IsvInfoUpdateDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/dto/IsvInfoUpdateDTO.java index 6b335614..6c65d94d --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/IsvInfoUpdateDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/dto/IsvInfoUpdateDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.isv.dto; +package com.gitee.sop.admin.service.isv.dto; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/IsvInfoUpdateKeysDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/dto/IsvInfoUpdateKeysDTO.java old mode 100644 new mode 100755 similarity index 93% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/IsvInfoUpdateKeysDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/dto/IsvInfoUpdateKeysDTO.java index 6d87eb05..1c1e2891 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/IsvInfoUpdateKeysDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/dto/IsvInfoUpdateKeysDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.isv.dto; +package com.gitee.sop.admin.service.isv.dto; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/IsvKeysDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/dto/IsvKeysDTO.java old mode 100644 new mode 100755 similarity index 93% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/IsvKeysDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/dto/IsvKeysDTO.java index fed12f01..e143709f --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/IsvKeysDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/dto/IsvKeysDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.isv.dto; +package com.gitee.sop.admin.service.isv.dto; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/IsvKeysGenDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/dto/IsvKeysGenDTO.java old mode 100644 new mode 100755 similarity index 92% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/IsvKeysGenDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/dto/IsvKeysGenDTO.java index 5a3470b0..392a8035 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/IsvKeysGenDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/dto/IsvKeysGenDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.isv.dto; +package com.gitee.sop.admin.service.isv.dto; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/PermGroupPermissionDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/dto/PermGroupPermissionDTO.java old mode 100644 new mode 100755 similarity index 82% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/PermGroupPermissionDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/dto/PermGroupPermissionDTO.java index 290ad5ae..b5e45438 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/PermGroupPermissionDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/dto/PermGroupPermissionDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.isv.dto; +package com.gitee.sop.admin.service.isv.dto; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/event/ChangeApiInfoEvent.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/event/ChangeApiInfoEvent.java old mode 100644 new mode 100755 similarity index 80% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/event/ChangeApiInfoEvent.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/event/ChangeApiInfoEvent.java index 28ecd9cb..d26f99bc --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/event/ChangeApiInfoEvent.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/event/ChangeApiInfoEvent.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.isv.event; +package com.gitee.sop.admin.service.isv.event; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/event/ChangeIsvInfoEvent.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/event/ChangeIsvInfoEvent.java old mode 100644 new mode 100755 similarity index 80% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/event/ChangeIsvInfoEvent.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/event/ChangeIsvInfoEvent.java index 3bb22bc5..8c48f422 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/event/ChangeIsvInfoEvent.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/event/ChangeIsvInfoEvent.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.isv.event; +package com.gitee.sop.admin.service.isv.event; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/event/ChangeIsvKeyEvent.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/event/ChangeIsvKeyEvent.java old mode 100644 new mode 100755 similarity index 79% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/event/ChangeIsvKeyEvent.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/event/ChangeIsvKeyEvent.java index 70971f47..f7f2d2a3 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/event/ChangeIsvKeyEvent.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/event/ChangeIsvKeyEvent.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.isv.event; +package com.gitee.sop.admin.service.isv.event; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/event/ChangeIsvPermEvent.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/event/ChangeIsvPermEvent.java old mode 100644 new mode 100755 similarity index 79% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/event/ChangeIsvPermEvent.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/event/ChangeIsvPermEvent.java index 873d3b72..00ed9f4a --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/event/ChangeIsvPermEvent.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/event/ChangeIsvPermEvent.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.isv.event; +package com.gitee.sop.admin.service.isv.event; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/listener/ChangeListener.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/listener/ChangeListener.java old mode 100644 new mode 100755 similarity index 79% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/listener/ChangeListener.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/listener/ChangeListener.java index f0e000f6..67de45d9 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/listener/ChangeListener.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/isv/listener/ChangeListener.java @@ -1,11 +1,11 @@ -package com.gitee.sop.adminbackend.service.isv.listener; +package com.gitee.sop.admin.service.isv.listener; -import com.gitee.sop.adminbackend.dao.entity.IsvInfo; -import com.gitee.sop.adminbackend.dao.mapper.IsvInfoMapper; -import com.gitee.sop.adminbackend.service.isv.event.ChangeApiInfoEvent; -import com.gitee.sop.adminbackend.service.isv.event.ChangeIsvInfoEvent; -import com.gitee.sop.adminbackend.service.isv.event.ChangeIsvKeyEvent; -import com.gitee.sop.adminbackend.service.isv.event.ChangeIsvPermEvent; +import com.gitee.sop.admin.dao.entity.IsvInfo; +import com.gitee.sop.admin.dao.mapper.IsvInfoMapper; +import com.gitee.sop.admin.service.isv.event.ChangeApiInfoEvent; +import com.gitee.sop.admin.service.isv.event.ChangeIsvInfoEvent; +import com.gitee.sop.admin.service.isv.event.ChangeIsvKeyEvent; +import com.gitee.sop.admin.service.isv.event.ChangeIsvPermEvent; import com.gitee.sop.support.service.RefreshService; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/jackson/convert/annotation/UserFormat.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/jackson/convert/annotation/UserFormat.java old mode 100644 new mode 100755 similarity index 80% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/jackson/convert/annotation/UserFormat.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/jackson/convert/annotation/UserFormat.java index e7869a87..ea1ef521 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/jackson/convert/annotation/UserFormat.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/jackson/convert/annotation/UserFormat.java @@ -1,9 +1,9 @@ -package com.gitee.sop.adminbackend.service.jackson.convert.annotation; +package com.gitee.sop.admin.service.jackson.convert.annotation; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.gitee.sop.adminbackend.service.jackson.convert.serde.UserFormatSerializer; +import com.gitee.sop.admin.service.jackson.convert.serde.UserFormatSerializer; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/jackson/convert/serde/UserFormatSerializer.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/jackson/convert/serde/UserFormatSerializer.java old mode 100644 new mode 100755 similarity index 75% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/jackson/convert/serde/UserFormatSerializer.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/jackson/convert/serde/UserFormatSerializer.java index 35fdbd59..129156c5 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/jackson/convert/serde/UserFormatSerializer.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/jackson/convert/serde/UserFormatSerializer.java @@ -1,13 +1,13 @@ -package com.gitee.sop.adminbackend.service.jackson.convert.serde; +package com.gitee.sop.admin.service.jackson.convert.serde; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import com.gitee.sop.adminbackend.common.context.SpringContext; -import com.gitee.sop.adminbackend.common.resp.UserVO; -import com.gitee.sop.adminbackend.common.user.User; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.service.sys.UserCacheService; +import com.gitee.sop.admin.common.context.SpringContext; +import com.gitee.sop.admin.common.resp.UserVO; +import com.gitee.sop.admin.common.user.User; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.service.sys.UserCacheService; import lombok.extern.slf4j.Slf4j; import java.io.IOException; diff --git a/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/jackson/package-info.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/jackson/package-info.java new file mode 100755 index 00000000..ec956c92 --- /dev/null +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/jackson/package-info.java @@ -0,0 +1 @@ +package com.gitee.sop.admin.service.jackson; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/serve/ApiInfoService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/serve/ApiInfoService.java old mode 100644 new mode 100755 similarity index 69% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/serve/ApiInfoService.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/serve/ApiInfoService.java index edaf44c9..352ffb34 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/serve/ApiInfoService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/serve/ApiInfoService.java @@ -1,11 +1,11 @@ -package com.gitee.sop.adminbackend.service.serve; +package com.gitee.sop.admin.service.serve; -import com.gitee.sop.adminbackend.common.context.SpringContext; -import com.gitee.sop.adminbackend.common.dto.StatusUpdateDTO; -import com.gitee.sop.adminbackend.common.support.ServiceSupport; -import com.gitee.sop.adminbackend.dao.entity.ApiInfo; -import com.gitee.sop.adminbackend.dao.mapper.ApiInfoMapper; -import com.gitee.sop.adminbackend.service.isv.event.ChangeApiInfoEvent; +import com.gitee.sop.admin.common.context.SpringContext; +import com.gitee.sop.admin.common.dto.StatusUpdateDTO; +import com.gitee.sop.admin.common.support.ServiceSupport; +import com.gitee.sop.admin.dao.entity.ApiInfo; +import com.gitee.sop.admin.dao.mapper.ApiInfoMapper; +import com.gitee.sop.admin.service.isv.event.ChangeApiInfoEvent; import org.springframework.stereotype.Service; import java.util.Collections; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/SysConfigService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysConfigService.java old mode 100644 new mode 100755 similarity index 90% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/SysConfigService.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysConfigService.java index 9414c282..ceda3f9b --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/SysConfigService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysConfigService.java @@ -1,11 +1,11 @@ -package com.gitee.sop.adminbackend.service.sys; +package com.gitee.sop.admin.service.sys; import com.gitee.fastmybatis.core.support.BaseLambdaService; -import com.gitee.sop.adminbackend.common.config.IConfig; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.dao.entity.SysConfig; -import com.gitee.sop.adminbackend.dao.mapper.SysConfigMapper; -import com.gitee.sop.adminbackend.service.sys.dto.SystemConfigDTO; +import com.gitee.sop.admin.common.config.IConfig; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.dao.entity.SysConfig; +import com.gitee.sop.admin.dao.mapper.SysConfigMapper; +import com.gitee.sop.admin.service.sys.dto.SystemConfigDTO; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/SysDeptService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysDeptService.java old mode 100644 new mode 100755 similarity index 73% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/SysDeptService.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysDeptService.java index c5f69b72..0089d1dd --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/SysDeptService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysDeptService.java @@ -1,14 +1,14 @@ -package com.gitee.sop.adminbackend.service.sys; +package com.gitee.sop.admin.service.sys; import com.gitee.fastmybatis.core.query.LambdaQuery; import com.gitee.fastmybatis.core.util.TreeUtil; -import com.gitee.sop.adminbackend.common.dto.StatusUpdateDTO; -import com.gitee.sop.adminbackend.common.exception.BizException; -import com.gitee.sop.adminbackend.common.support.ServiceSupport; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.dao.entity.SysDept; -import com.gitee.sop.adminbackend.dao.mapper.SysDeptMapper; -import com.gitee.sop.adminbackend.service.sys.dto.SysDeptDTO; +import com.gitee.sop.admin.common.dto.StatusUpdateDTO; +import com.gitee.sop.admin.common.exception.BizException; +import com.gitee.sop.admin.common.support.ServiceSupport; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.dao.entity.SysDept; +import com.gitee.sop.admin.dao.mapper.SysDeptMapper; +import com.gitee.sop.admin.service.sys.dto.SysDeptDTO; import org.springframework.stereotype.Service; import java.util.List; diff --git a/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysResourceService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysResourceService.java new file mode 100755 index 00000000..9f17dc32 --- /dev/null +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysResourceService.java @@ -0,0 +1,15 @@ +package com.gitee.sop.admin.service.sys; + +import com.gitee.sop.admin.common.support.ServiceSupport; +import com.gitee.sop.admin.dao.entity.SysResource; +import com.gitee.sop.admin.dao.mapper.SysResourceMapper; +import org.springframework.stereotype.Service; + + +/** + * @author 六如 + */ +@Service +public class SysResourceService implements ServiceSupport { + +} diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/SysRoleResourceService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysRoleResourceService.java old mode 100644 new mode 100755 similarity index 85% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/SysRoleResourceService.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysRoleResourceService.java index 33547584..b1f567c5 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/SysRoleResourceService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysRoleResourceService.java @@ -1,9 +1,9 @@ -package com.gitee.sop.adminbackend.service.sys; +package com.gitee.sop.admin.service.sys; -import com.gitee.sop.adminbackend.common.support.ServiceSupport; -import com.gitee.sop.adminbackend.dao.entity.SysRoleResource; -import com.gitee.sop.adminbackend.dao.mapper.SysRoleResourceMapper; -import com.gitee.sop.adminbackend.service.sys.dto.SysRoleResourceDTO; +import com.gitee.sop.admin.common.support.ServiceSupport; +import com.gitee.sop.admin.dao.entity.SysRoleResource; +import com.gitee.sop.admin.dao.mapper.SysRoleResourceMapper; +import com.gitee.sop.admin.service.sys.dto.SysRoleResourceDTO; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/SysRoleService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysRoleService.java old mode 100644 new mode 100755 similarity index 65% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/SysRoleService.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysRoleService.java index 76210ccc..aacba537 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/SysRoleService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysRoleService.java @@ -1,9 +1,9 @@ -package com.gitee.sop.adminbackend.service.sys; +package com.gitee.sop.admin.service.sys; -import com.gitee.sop.adminbackend.common.dto.StatusUpdateDTO; -import com.gitee.sop.adminbackend.common.support.ServiceSupport; -import com.gitee.sop.adminbackend.dao.entity.SysRole; -import com.gitee.sop.adminbackend.dao.mapper.SysRoleMapper; +import com.gitee.sop.admin.common.dto.StatusUpdateDTO; +import com.gitee.sop.admin.common.support.ServiceSupport; +import com.gitee.sop.admin.dao.entity.SysRole; +import com.gitee.sop.admin.dao.mapper.SysRoleMapper; import org.springframework.stereotype.Service; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/SysUserDeptService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysUserDeptService.java old mode 100644 new mode 100755 similarity index 86% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/SysUserDeptService.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysUserDeptService.java index c06f2c7e..2ccc1a5a --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/SysUserDeptService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysUserDeptService.java @@ -1,13 +1,13 @@ -package com.gitee.sop.adminbackend.service.sys; +package com.gitee.sop.admin.service.sys; -import com.gitee.sop.adminbackend.common.support.ServiceSupport; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.dao.entity.SysDept; -import com.gitee.sop.adminbackend.dao.entity.SysUserDept; -import com.gitee.sop.adminbackend.dao.mapper.SysDeptMapper; -import com.gitee.sop.adminbackend.dao.mapper.SysUserDeptMapper; -import com.gitee.sop.adminbackend.service.sys.dto.DeptUserResultDTO; -import com.gitee.sop.adminbackend.service.sys.dto.SysDeptDTO; +import com.gitee.sop.admin.common.support.ServiceSupport; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.dao.entity.SysDept; +import com.gitee.sop.admin.dao.entity.SysUserDept; +import com.gitee.sop.admin.dao.mapper.SysDeptMapper; +import com.gitee.sop.admin.dao.mapper.SysUserDeptMapper; +import com.gitee.sop.admin.service.sys.dto.DeptUserResultDTO; +import com.gitee.sop.admin.service.sys.dto.SysDeptDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/SysUserRoleService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysUserRoleService.java old mode 100644 new mode 100755 similarity index 78% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/SysUserRoleService.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysUserRoleService.java index 62222d68..df31378a --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/SysUserRoleService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysUserRoleService.java @@ -1,13 +1,13 @@ -package com.gitee.sop.adminbackend.service.sys; +package com.gitee.sop.admin.service.sys; -import com.gitee.sop.adminbackend.common.support.ServiceSupport; -import com.gitee.sop.adminbackend.common.user.User; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.dao.entity.SysRole; -import com.gitee.sop.adminbackend.dao.entity.SysUserRole; -import com.gitee.sop.adminbackend.dao.mapper.SysRoleMapper; -import com.gitee.sop.adminbackend.dao.mapper.SysUserRoleMapper; -import com.gitee.sop.adminbackend.service.sys.dto.SysRoleDTO; +import com.gitee.sop.admin.common.support.ServiceSupport; +import com.gitee.sop.admin.common.user.User; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.dao.entity.SysRole; +import com.gitee.sop.admin.dao.entity.SysUserRole; +import com.gitee.sop.admin.dao.mapper.SysRoleMapper; +import com.gitee.sop.admin.dao.mapper.SysUserRoleMapper; +import com.gitee.sop.admin.service.sys.dto.SysRoleDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/SysUserService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysUserService.java old mode 100644 new mode 100755 similarity index 84% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/SysUserService.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysUserService.java index edaf9a7f..02a1707c --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/SysUserService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysUserService.java @@ -1,24 +1,24 @@ -package com.gitee.sop.adminbackend.service.sys; +package com.gitee.sop.admin.service.sys; import com.gitee.fastmybatis.core.PageInfo; import com.gitee.fastmybatis.core.query.LambdaQuery; -import com.gitee.sop.adminbackend.common.config.Configs; -import com.gitee.sop.adminbackend.common.dto.StatusUpdateBatchDTO; -import com.gitee.sop.adminbackend.common.dto.StatusUpdateDTO; -import com.gitee.sop.adminbackend.common.dto.UserDTO; -import com.gitee.sop.adminbackend.common.enums.ConfigKeyEnum; -import com.gitee.sop.adminbackend.common.support.ServiceSupport; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.common.util.GenerateUtil; -import com.gitee.sop.adminbackend.dao.entity.SysUser; -import com.gitee.sop.adminbackend.dao.mapper.SysUserMapper; -import com.gitee.sop.adminbackend.service.sys.dto.DeptUserResultDTO; -import com.gitee.sop.adminbackend.service.sys.dto.SysDeptDTO; -import com.gitee.sop.adminbackend.service.sys.dto.SysUserAddDTO; -import com.gitee.sop.adminbackend.service.sys.dto.SysUserDTO; -import com.gitee.sop.adminbackend.service.sys.dto.SysUserSearchDTO; -import com.gitee.sop.adminbackend.service.sys.dto.SysUserUpdateDTO; -import com.gitee.sop.adminbackend.service.sys.login.enums.RegTypeEnum; +import com.gitee.sop.admin.common.config.Configs; +import com.gitee.sop.admin.common.dto.StatusUpdateBatchDTO; +import com.gitee.sop.admin.common.dto.StatusUpdateDTO; +import com.gitee.sop.admin.common.dto.UserDTO; +import com.gitee.sop.admin.common.enums.ConfigKeyEnum; +import com.gitee.sop.admin.common.support.ServiceSupport; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.common.util.GenerateUtil; +import com.gitee.sop.admin.dao.entity.SysUser; +import com.gitee.sop.admin.dao.mapper.SysUserMapper; +import com.gitee.sop.admin.service.sys.dto.DeptUserResultDTO; +import com.gitee.sop.admin.service.sys.dto.SysDeptDTO; +import com.gitee.sop.admin.service.sys.dto.SysUserAddDTO; +import com.gitee.sop.admin.service.sys.dto.SysUserDTO; +import com.gitee.sop.admin.service.sys.dto.SysUserSearchDTO; +import com.gitee.sop.admin.service.sys.dto.SysUserUpdateDTO; +import com.gitee.sop.admin.service.sys.login.enums.RegTypeEnum; import com.google.common.collect.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.crypto.bcrypt.BCrypt; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/UpgradeService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/UpgradeService.java old mode 100644 new mode 100755 similarity index 83% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/UpgradeService.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/UpgradeService.java index b65f4bf9..5b86c59c --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/UpgradeService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/UpgradeService.java @@ -1,10 +1,10 @@ -package com.gitee.sop.adminbackend.service.sys; +package com.gitee.sop.admin.service.sys; -import com.gitee.sop.adminbackend.common.enums.ConfigKeyEnum; -import com.gitee.sop.adminbackend.common.util.PasswordUtil; -import com.gitee.sop.adminbackend.dao.entity.SysUser; -import com.gitee.sop.adminbackend.dao.mapper.UpgradeMapper; -import com.gitee.sop.adminbackend.service.sys.login.enums.RegTypeEnum; +import com.gitee.sop.admin.common.enums.ConfigKeyEnum; +import com.gitee.sop.admin.common.util.PasswordUtil; +import com.gitee.sop.admin.dao.entity.SysUser; +import com.gitee.sop.admin.dao.mapper.UpgradeMapper; +import com.gitee.sop.admin.service.sys.login.enums.RegTypeEnum; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/UserCacheService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/UserCacheService.java old mode 100644 new mode 100755 similarity index 57% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/UserCacheService.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/UserCacheService.java index cc76a01a..e7dc1521 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/UserCacheService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/UserCacheService.java @@ -1,6 +1,6 @@ -package com.gitee.sop.adminbackend.service.sys; +package com.gitee.sop.admin.service.sys; -import com.gitee.sop.adminbackend.common.user.User; +import com.gitee.sop.admin.common.user.User; import java.util.Optional; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/UserPermissionService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/UserPermissionService.java old mode 100644 new mode 100755 similarity index 84% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/UserPermissionService.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/UserPermissionService.java index 2789373a..8bcf1e25 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/UserPermissionService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/UserPermissionService.java @@ -1,14 +1,14 @@ -package com.gitee.sop.adminbackend.service.sys; +package com.gitee.sop.admin.service.sys; import com.gitee.fastmybatis.core.util.TreeUtil; -import com.gitee.sop.adminbackend.common.enums.MenuTypeEnum; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.dao.entity.SysResource; -import com.gitee.sop.adminbackend.dao.entity.SysRoleResource; -import com.gitee.sop.adminbackend.service.sys.dto.MenuTreeDTO; -import com.gitee.sop.adminbackend.service.sys.dto.MenuTreeDTO.Meta; -import com.gitee.sop.adminbackend.service.sys.dto.SysRoleDTO; -import com.gitee.sop.adminbackend.service.sys.dto.UserPermissionDTO; +import com.gitee.sop.admin.common.enums.MenuTypeEnum; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.dao.entity.SysResource; +import com.gitee.sop.admin.dao.entity.SysRoleResource; +import com.gitee.sop.admin.service.sys.dto.MenuTreeDTO; +import com.gitee.sop.admin.service.sys.dto.MenuTreeDTO.Meta; +import com.gitee.sop.admin.service.sys.dto.SysRoleDTO; +import com.gitee.sop.admin.service.sys.dto.UserPermissionDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/DeptUserResultDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/DeptUserResultDTO.java old mode 100644 new mode 100755 similarity index 82% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/DeptUserResultDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/DeptUserResultDTO.java index 999a92d9..ef3fc6b2 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/DeptUserResultDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/DeptUserResultDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.sys.dto; +package com.gitee.sop.admin.service.sys.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/MenuTreeDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/MenuTreeDTO.java old mode 100644 new mode 100755 similarity index 95% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/MenuTreeDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/MenuTreeDTO.java index c96d59ff..d1725bb9 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/MenuTreeDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/MenuTreeDTO.java @@ -1,8 +1,8 @@ -package com.gitee.sop.adminbackend.service.sys.dto; +package com.gitee.sop.admin.service.sys.dto; import com.fasterxml.jackson.annotation.JsonInclude; import com.gitee.fastmybatis.core.support.TreeNode; -import com.gitee.sop.adminbackend.common.jackson.convert.annotation.Bool; +import com.gitee.sop.admin.common.jackson.convert.annotation.Bool; import lombok.Data; import java.util.List; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/SysDeptDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/SysDeptDTO.java old mode 100644 new mode 100755 similarity index 95% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/SysDeptDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/SysDeptDTO.java index 220c2280..40d8f4ea --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/SysDeptDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/SysDeptDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.sys.dto; +package com.gitee.sop.admin.service.sys.dto; import com.gitee.fastmybatis.core.support.TreeNode; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/SysRoleDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/SysRoleDTO.java old mode 100644 new mode 100755 similarity index 85% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/SysRoleDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/SysRoleDTO.java index 1f090f49..53d2e4ea --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/SysRoleDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/SysRoleDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.sys.dto; +package com.gitee.sop.admin.service.sys.dto; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/SysRoleResourceDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/SysRoleResourceDTO.java old mode 100644 new mode 100755 similarity index 85% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/SysRoleResourceDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/SysRoleResourceDTO.java index 47d35441..87aa25b2 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/SysRoleResourceDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/SysRoleResourceDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.sys.dto; +package com.gitee.sop.admin.service.sys.dto; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/SysUserAddDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/SysUserAddDTO.java old mode 100644 new mode 100755 similarity index 95% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/SysUserAddDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/SysUserAddDTO.java index dc5cef66..9150bc55 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/SysUserAddDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/SysUserAddDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.sys.dto; +package com.gitee.sop.admin.service.sys.dto; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/SysUserDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/SysUserDTO.java old mode 100644 new mode 100755 similarity index 93% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/SysUserDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/SysUserDTO.java index 2554cb3a..653ac3ae --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/SysUserDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/SysUserDTO.java @@ -1,6 +1,6 @@ -package com.gitee.sop.adminbackend.service.sys.dto; +package com.gitee.sop.admin.service.sys.dto; -import com.gitee.sop.adminbackend.common.user.User; +import com.gitee.sop.admin.common.user.User; import lombok.Data; import java.time.LocalDateTime; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/SysUserSearchDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/SysUserSearchDTO.java old mode 100644 new mode 100755 similarity index 93% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/SysUserSearchDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/SysUserSearchDTO.java index 590be97b..895de6ef --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/SysUserSearchDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/SysUserSearchDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.sys.dto; +package com.gitee.sop.admin.service.sys.dto; import com.gitee.fastmybatis.core.query.Operator; import com.gitee.fastmybatis.core.query.annotation.Condition; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/SysUserUpdateDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/SysUserUpdateDTO.java old mode 100644 new mode 100755 similarity index 94% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/SysUserUpdateDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/SysUserUpdateDTO.java index cb154f20..bfef2883 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/SysUserUpdateDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/SysUserUpdateDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.sys.dto; +package com.gitee.sop.admin.service.sys.dto; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/SystemConfigDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/SystemConfigDTO.java old mode 100644 new mode 100755 similarity index 84% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/SystemConfigDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/SystemConfigDTO.java index 30339db7..cbcf3cfd --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/SystemConfigDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/SystemConfigDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.sys.dto; +package com.gitee.sop.admin.service.sys.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/UserPermissionDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/UserPermissionDTO.java old mode 100644 new mode 100755 similarity index 91% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/UserPermissionDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/UserPermissionDTO.java index ac3fcc3b..a3a36c95 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/UserPermissionDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/UserPermissionDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.sys.dto; +package com.gitee.sop.admin.service.sys.dto; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/UserRoleInfoDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/UserRoleInfoDTO.java old mode 100644 new mode 100755 similarity index 81% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/UserRoleInfoDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/UserRoleInfoDTO.java index 657c0fe8..6dd9e565 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/dto/UserRoleInfoDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/dto/UserRoleInfoDTO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.sys.dto; +package com.gitee.sop.admin.service.sys.dto; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/impl/LocalUserCacheService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/impl/LocalUserCacheService.java old mode 100644 new mode 100755 similarity index 79% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/impl/LocalUserCacheService.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/impl/LocalUserCacheService.java index 417043d1..88f19dca --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/impl/LocalUserCacheService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/impl/LocalUserCacheService.java @@ -1,11 +1,11 @@ -package com.gitee.sop.adminbackend.service.sys.impl; +package com.gitee.sop.admin.service.sys.impl; -import com.gitee.sop.adminbackend.common.user.User; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.dao.entity.SysUser; -import com.gitee.sop.adminbackend.service.sys.SysUserService; -import com.gitee.sop.adminbackend.service.sys.UserCacheService; -import com.gitee.sop.adminbackend.service.sys.dto.SysUserDTO; +import com.gitee.sop.admin.common.user.User; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.dao.entity.SysUser; +import com.gitee.sop.admin.service.sys.SysUserService; +import com.gitee.sop.admin.service.sys.UserCacheService; +import com.gitee.sop.admin.service.sys.dto.SysUserDTO; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/LoginService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/LoginService.java old mode 100644 new mode 100755 similarity index 80% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/LoginService.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/LoginService.java index bbbc6464..8617b58b --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/LoginService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/LoginService.java @@ -1,23 +1,23 @@ -package com.gitee.sop.adminbackend.service.sys.login; +package com.gitee.sop.admin.service.sys.login; -import com.gitee.sop.adminbackend.common.config.Configs; -import com.gitee.sop.adminbackend.common.enums.ConfigKeyEnum; -import com.gitee.sop.adminbackend.common.enums.StatusEnum; -import com.gitee.sop.adminbackend.common.exception.BizException; -import com.gitee.sop.adminbackend.common.manager.UserCacheManager; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.common.util.DateUtil; -import com.gitee.sop.adminbackend.common.util.GenerateUtil; -import com.gitee.sop.adminbackend.common.util.JwtUtil; -import com.gitee.sop.adminbackend.dao.entity.SysUser; -import com.gitee.sop.adminbackend.service.sys.SysUserService; -import com.gitee.sop.adminbackend.service.sys.UserPermissionService; -import com.gitee.sop.adminbackend.service.sys.dto.UserPermissionDTO; -import com.gitee.sop.adminbackend.service.sys.login.dto.LoginDTO; -import com.gitee.sop.adminbackend.service.sys.login.dto.LoginForm; -import com.gitee.sop.adminbackend.service.sys.login.dto.LoginResult; -import com.gitee.sop.adminbackend.service.sys.login.dto.LoginUser; -import com.gitee.sop.adminbackend.service.sys.login.enums.RegTypeEnum; +import com.gitee.sop.admin.common.config.Configs; +import com.gitee.sop.admin.common.enums.ConfigKeyEnum; +import com.gitee.sop.admin.common.enums.StatusEnum; +import com.gitee.sop.admin.common.exception.BizException; +import com.gitee.sop.admin.common.manager.UserCacheManager; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.common.util.DateUtil; +import com.gitee.sop.admin.common.util.GenerateUtil; +import com.gitee.sop.admin.common.util.JwtUtil; +import com.gitee.sop.admin.dao.entity.SysUser; +import com.gitee.sop.admin.service.sys.SysUserService; +import com.gitee.sop.admin.service.sys.UserPermissionService; +import com.gitee.sop.admin.service.sys.dto.UserPermissionDTO; +import com.gitee.sop.admin.service.sys.login.dto.LoginDTO; +import com.gitee.sop.admin.service.sys.login.dto.LoginForm; +import com.gitee.sop.admin.service.sys.login.dto.LoginResult; +import com.gitee.sop.admin.service.sys.login.dto.LoginUser; +import com.gitee.sop.admin.service.sys.login.enums.RegTypeEnum; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/NotNullStringBuilder.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/NotNullStringBuilder.java old mode 100644 new mode 100755 similarity index 94% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/NotNullStringBuilder.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/NotNullStringBuilder.java index fa0dbee2..6a116353 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/NotNullStringBuilder.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/NotNullStringBuilder.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.sys.login; +package com.gitee.sop.admin.service.sys.login; /** * @author thc diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/ThirdPartyLoginManager.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/ThirdPartyLoginManager.java old mode 100644 new mode 100755 similarity index 56% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/ThirdPartyLoginManager.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/ThirdPartyLoginManager.java index 47db668e..4f47942a --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/ThirdPartyLoginManager.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/ThirdPartyLoginManager.java @@ -1,7 +1,7 @@ -package com.gitee.sop.adminbackend.service.sys.login; +package com.gitee.sop.admin.service.sys.login; -import com.gitee.sop.adminbackend.service.sys.login.dto.LoginForm; -import com.gitee.sop.adminbackend.service.sys.login.dto.LoginResult; +import com.gitee.sop.admin.service.sys.login.dto.LoginForm; +import com.gitee.sop.admin.service.sys.login.dto.LoginResult; /** * @author 六如 diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/dto/LoginDTO.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/dto/LoginDTO.java old mode 100644 new mode 100755 similarity index 56% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/dto/LoginDTO.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/dto/LoginDTO.java index 56e0613b..6c1b7a0d --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/dto/LoginDTO.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/dto/LoginDTO.java @@ -1,6 +1,6 @@ -package com.gitee.sop.adminbackend.service.sys.login.dto; +package com.gitee.sop.admin.service.sys.login.dto; -import com.gitee.sop.adminbackend.service.sys.login.enums.RegTypeEnum; +import com.gitee.sop.admin.service.sys.login.enums.RegTypeEnum; import lombok.Data; @Data diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/dto/LoginForm.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/dto/LoginForm.java old mode 100644 new mode 100755 similarity index 70% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/dto/LoginForm.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/dto/LoginForm.java index 5c9766f3..225f6136 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/dto/LoginForm.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/dto/LoginForm.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.sys.login.dto; +package com.gitee.sop.admin.service.sys.login.dto; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/dto/LoginResult.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/dto/LoginResult.java old mode 100644 new mode 100755 similarity index 63% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/dto/LoginResult.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/dto/LoginResult.java index a5c487bb..debe6dac --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/dto/LoginResult.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/dto/LoginResult.java @@ -1,6 +1,6 @@ -package com.gitee.sop.adminbackend.service.sys.login.dto; +package com.gitee.sop.admin.service.sys.login.dto; -import com.gitee.sop.adminbackend.service.sys.login.enums.RegTypeEnum; +import com.gitee.sop.admin.service.sys.login.enums.RegTypeEnum; import lombok.Data; /** diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/dto/LoginUser.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/dto/LoginUser.java old mode 100644 new mode 100755 similarity index 92% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/dto/LoginUser.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/dto/LoginUser.java index 26c91b6d..de4dbe7c --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/dto/LoginUser.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/dto/LoginUser.java @@ -1,6 +1,6 @@ -package com.gitee.sop.adminbackend.service.sys.login.dto; +package com.gitee.sop.admin.service.sys.login.dto; -import com.gitee.sop.adminbackend.common.user.User; +import com.gitee.sop.admin.common.user.User; import lombok.Data; import java.util.List; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/enums/RegTypeEnum.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/enums/RegTypeEnum.java old mode 100644 new mode 100755 similarity index 89% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/enums/RegTypeEnum.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/enums/RegTypeEnum.java index f4b39453..15f9477a --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/enums/RegTypeEnum.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/enums/RegTypeEnum.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.service.sys.login.enums; +package com.gitee.sop.admin.service.sys.login.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/impl/DefaultUserCacheManager.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/impl/DefaultUserCacheManager.java old mode 100644 new mode 100755 similarity index 84% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/impl/DefaultUserCacheManager.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/impl/DefaultUserCacheManager.java index cd676e80..5bddf3e2 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/login/impl/DefaultUserCacheManager.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/login/impl/DefaultUserCacheManager.java @@ -1,12 +1,12 @@ -package com.gitee.sop.adminbackend.service.sys.login.impl; +package com.gitee.sop.admin.service.sys.login.impl; -import com.gitee.sop.adminbackend.common.enums.StatusEnum; -import com.gitee.sop.adminbackend.common.manager.UserCacheManager; -import com.gitee.sop.adminbackend.common.user.User; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.dao.entity.SysUser; -import com.gitee.sop.adminbackend.service.sys.SysUserService; -import com.gitee.sop.adminbackend.service.sys.login.dto.LoginUser; +import com.gitee.sop.admin.common.enums.StatusEnum; +import com.gitee.sop.admin.common.manager.UserCacheManager; +import com.gitee.sop.admin.common.user.User; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.dao.entity.SysUser; +import com.gitee.sop.admin.service.sys.SysUserService; +import com.gitee.sop.admin.service.sys.login.dto.LoginUser; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/website/WebsiteService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/website/WebsiteService.java old mode 100644 new mode 100755 similarity index 65% rename from sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/website/WebsiteService.java rename to sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/website/WebsiteService.java index 40baa20d..80a41bfe --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/website/WebsiteService.java +++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/website/WebsiteService.java @@ -1,19 +1,19 @@ -package com.gitee.sop.adminbackend.service.website; +package com.gitee.sop.admin.service.website; import com.gitee.fastmybatis.core.util.TreeUtil; -import com.gitee.sop.adminbackend.common.constants.YesOrNo; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.dao.entity.DocApp; -import com.gitee.sop.adminbackend.dao.entity.DocInfo; -import com.gitee.sop.adminbackend.service.doc.DocAppService; -import com.gitee.sop.adminbackend.service.doc.DocInfoService; -import com.gitee.sop.adminbackend.service.doc.DocSettingService; -import com.gitee.sop.adminbackend.service.doc.dto.DocAppDTO; -import com.gitee.sop.adminbackend.service.doc.dto.DocInfoConfigDTO; -import com.gitee.sop.adminbackend.service.doc.dto.DocInfoTreeDTO; -import com.gitee.sop.adminbackend.service.doc.dto.DocInfoViewDTO; -import com.gitee.sop.adminbackend.service.doc.dto.DocSettingDTO; -import com.gitee.sop.adminbackend.service.doc.dto.torna.TornaDocInfoViewDTO; +import com.gitee.sop.admin.common.constants.YesOrNo; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.dao.entity.DocApp; +import com.gitee.sop.admin.dao.entity.DocInfo; +import com.gitee.sop.admin.service.doc.DocAppService; +import com.gitee.sop.admin.service.doc.DocInfoService; +import com.gitee.sop.admin.service.doc.DocSettingService; +import com.gitee.sop.admin.service.doc.dto.DocAppDTO; +import com.gitee.sop.admin.service.doc.dto.DocInfoConfigDTO; +import com.gitee.sop.admin.service.doc.dto.DocInfoTreeDTO; +import com.gitee.sop.admin.service.doc.dto.DocInfoViewDTO; +import com.gitee.sop.admin.service.doc.dto.DocSettingDTO; +import com.gitee.sop.admin.service.doc.dto.torna.TornaDocInfoViewDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/sop-admin/sop-admin-backend/backend-web/pom.xml b/sop-admin/sop-admin-backend/admin-web/pom.xml old mode 100644 new mode 100755 similarity index 91% rename from sop-admin/sop-admin-backend/backend-web/pom.xml rename to sop-admin/sop-admin-backend/admin-web/pom.xml index 69075ca8..8036c63d --- a/sop-admin/sop-admin-backend/backend-web/pom.xml +++ b/sop-admin/sop-admin-backend/admin-web/pom.xml @@ -9,7 +9,7 @@ 5.0.0-SNAPSHOT - backend-web + admin-web 8 @@ -20,7 +20,7 @@ com.gitee.sop - backend-service + admin-service 5.0.0-SNAPSHOT diff --git a/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/AdminHomeController.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/AdminHomeController.java new file mode 100755 index 00000000..56312745 --- /dev/null +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/AdminHomeController.java @@ -0,0 +1,19 @@ +package com.gitee.sop.admin.controller; + +import com.gitee.sop.admin.common.annotation.NoToken; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +@NoToken +public class AdminHomeController { + + private static final String REDIRECT_INDEX = "forward:index.html"; + + // 后台admin入口地址 + @GetMapping("${index.path}") + public String index() { + return REDIRECT_INDEX; + } + +} diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/ExceptionHandlerController.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/ExceptionHandlerController.java old mode 100644 new mode 100755 similarity index 86% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/ExceptionHandlerController.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/ExceptionHandlerController.java index 62a71308..ccce9aff --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/ExceptionHandlerController.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/ExceptionHandlerController.java @@ -1,9 +1,9 @@ -package com.gitee.sop.adminbackend.controller; +package com.gitee.sop.admin.controller; -import com.gitee.sop.adminbackend.common.exception.BizException; -import com.gitee.sop.adminbackend.common.exception.ErrorCode; -import com.gitee.sop.adminbackend.common.exception.ExceptionCode; -import com.gitee.sop.adminbackend.common.resp.Result; +import com.gitee.sop.admin.common.exception.BizException; +import com.gitee.sop.admin.common.exception.ErrorCode; +import com.gitee.sop.admin.common.exception.ExceptionCode; +import com.gitee.sop.admin.common.resp.Result; import lombok.extern.slf4j.Slf4j; import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.validation.ObjectError; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/doc/DocController.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/doc/DocController.java old mode 100644 new mode 100755 similarity index 71% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/doc/DocController.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/doc/DocController.java index de22a938..ed780b14 --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/doc/DocController.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/doc/DocController.java @@ -1,19 +1,19 @@ -package com.gitee.sop.adminbackend.controller.doc; +package com.gitee.sop.admin.controller.doc; -import com.gitee.sop.adminbackend.common.context.UserContext; -import com.gitee.sop.adminbackend.common.req.IdParam; -import com.gitee.sop.adminbackend.common.resp.Result; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.controller.doc.param.DocAppAddParam; -import com.gitee.sop.adminbackend.controller.doc.param.DocInfoUpdateParam; -import com.gitee.sop.adminbackend.controller.doc.vo.DocAppVO; -import com.gitee.sop.adminbackend.controller.doc.vo.DocInfoTreeVO; -import com.gitee.sop.adminbackend.service.doc.DocAppService; -import com.gitee.sop.adminbackend.service.doc.DocInfoService; -import com.gitee.sop.adminbackend.service.doc.DocInfoSyncService; -import com.gitee.sop.adminbackend.service.doc.dto.DocAppDTO; -import com.gitee.sop.adminbackend.service.doc.dto.DocInfoPublishUpdateDTO; -import com.gitee.sop.adminbackend.service.doc.dto.DocInfoTreeDTO; +import com.gitee.sop.admin.common.context.UserContext; +import com.gitee.sop.admin.common.req.IdParam; +import com.gitee.sop.admin.common.resp.Result; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.controller.doc.param.DocAppAddParam; +import com.gitee.sop.admin.controller.doc.param.DocInfoUpdateParam; +import com.gitee.sop.admin.controller.doc.vo.DocAppVO; +import com.gitee.sop.admin.controller.doc.vo.DocInfoTreeVO; +import com.gitee.sop.admin.service.doc.DocAppService; +import com.gitee.sop.admin.service.doc.DocInfoService; +import com.gitee.sop.admin.service.doc.DocInfoSyncService; +import com.gitee.sop.admin.service.doc.dto.DocAppDTO; +import com.gitee.sop.admin.service.doc.dto.DocInfoPublishUpdateDTO; +import com.gitee.sop.admin.service.doc.dto.DocInfoTreeDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/doc/DocSettingController.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/doc/DocSettingController.java old mode 100644 new mode 100755 similarity index 75% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/doc/DocSettingController.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/doc/DocSettingController.java index c7d39b10..e94f68f6 --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/doc/DocSettingController.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/doc/DocSettingController.java @@ -1,10 +1,10 @@ -package com.gitee.sop.adminbackend.controller.doc; +package com.gitee.sop.admin.controller.doc; -import com.gitee.sop.adminbackend.common.resp.Result; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.controller.doc.vo.DocSettingVO; -import com.gitee.sop.adminbackend.service.doc.DocSettingService; -import com.gitee.sop.adminbackend.service.doc.dto.DocSettingDTO; +import com.gitee.sop.admin.common.resp.Result; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.controller.doc.vo.DocSettingVO; +import com.gitee.sop.admin.service.doc.DocSettingService; +import com.gitee.sop.admin.service.doc.dto.DocSettingDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/doc/param/DocAppAddParam.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/doc/param/DocAppAddParam.java old mode 100644 new mode 100755 similarity index 81% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/doc/param/DocAppAddParam.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/doc/param/DocAppAddParam.java index 93072690..b70faeaf --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/doc/param/DocAppAddParam.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/doc/param/DocAppAddParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.doc.param; +package com.gitee.sop.admin.controller.doc.param; import lombok.Data; import org.hibernate.validator.constraints.Length; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/doc/param/DocInfoUpdateParam.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/doc/param/DocInfoUpdateParam.java old mode 100644 new mode 100755 similarity index 78% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/doc/param/DocInfoUpdateParam.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/doc/param/DocInfoUpdateParam.java index 3c616c88..0685c465 --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/doc/param/DocInfoUpdateParam.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/doc/param/DocInfoUpdateParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.doc.param; +package com.gitee.sop.admin.controller.doc.param; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/doc/vo/DocAppVO.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/doc/vo/DocAppVO.java old mode 100644 new mode 100755 similarity index 80% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/doc/vo/DocAppVO.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/doc/vo/DocAppVO.java index 489293d9..eddcca44 --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/doc/vo/DocAppVO.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/doc/vo/DocAppVO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.doc.vo; +package com.gitee.sop.admin.controller.doc.vo; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/doc/vo/DocInfoTreeVO.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/doc/vo/DocInfoTreeVO.java old mode 100644 new mode 100755 similarity index 90% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/doc/vo/DocInfoTreeVO.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/doc/vo/DocInfoTreeVO.java index 404edfaf..6ae7ca31 --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/doc/vo/DocInfoTreeVO.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/doc/vo/DocInfoTreeVO.java @@ -1,8 +1,8 @@ -package com.gitee.sop.adminbackend.controller.doc.vo; +package com.gitee.sop.admin.controller.doc.vo; import com.gitee.fastmybatis.core.support.TreeNode; -import com.gitee.sop.adminbackend.common.constants.YesOrNo; -import com.gitee.sop.adminbackend.service.jackson.convert.annotation.UserFormat; +import com.gitee.sop.admin.common.constants.YesOrNo; +import com.gitee.sop.admin.service.jackson.convert.annotation.UserFormat; import lombok.Data; import java.time.LocalDateTime; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/doc/vo/DocSettingVO.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/doc/vo/DocSettingVO.java old mode 100644 new mode 100755 similarity index 78% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/doc/vo/DocSettingVO.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/doc/vo/DocSettingVO.java index 057189c6..fd96adcc --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/doc/vo/DocSettingVO.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/doc/vo/DocSettingVO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.doc.vo; +package com.gitee.sop.admin.controller.doc.vo; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/IsvInfoController.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/IsvInfoController.java old mode 100644 new mode 100755 similarity index 75% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/IsvInfoController.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/IsvInfoController.java index 00ec3634..eeb261b8 --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/IsvInfoController.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/IsvInfoController.java @@ -1,26 +1,26 @@ -package com.gitee.sop.adminbackend.controller.isv; +package com.gitee.sop.admin.controller.isv; import com.gitee.fastmybatis.core.PageInfo; import com.gitee.fastmybatis.core.query.LambdaQuery; import com.gitee.fastmybatis.core.query.param.PageParam; -import com.gitee.sop.adminbackend.common.dto.StatusUpdateDTO; -import com.gitee.sop.adminbackend.common.req.StatusUpdateParam; -import com.gitee.sop.adminbackend.common.resp.Result; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.common.util.RSATool; -import com.gitee.sop.adminbackend.controller.isv.param.IsvInfoAddParam; -import com.gitee.sop.adminbackend.controller.isv.param.IsvInfoUpdateKeysParam; -import com.gitee.sop.adminbackend.controller.isv.param.IsvInfoUpdateParam; -import com.gitee.sop.adminbackend.controller.isv.param.IsvKeysGenParam; -import com.gitee.sop.adminbackend.controller.isv.vo.IsvInfoVO; -import com.gitee.sop.adminbackend.dao.entity.IsvInfo; -import com.gitee.sop.adminbackend.service.isv.IsvInfoService; -import com.gitee.sop.adminbackend.service.isv.PermIsvGroupService; -import com.gitee.sop.adminbackend.service.isv.dto.IsvInfoAddDTO; -import com.gitee.sop.adminbackend.service.isv.dto.IsvInfoDTO; -import com.gitee.sop.adminbackend.service.isv.dto.IsvInfoUpdateDTO; -import com.gitee.sop.adminbackend.service.isv.dto.IsvInfoUpdateKeysDTO; -import com.gitee.sop.adminbackend.service.isv.dto.IsvKeysDTO; +import com.gitee.sop.admin.common.dto.StatusUpdateDTO; +import com.gitee.sop.admin.common.req.StatusUpdateParam; +import com.gitee.sop.admin.common.resp.Result; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.common.util.RSATool; +import com.gitee.sop.admin.controller.isv.param.IsvInfoAddParam; +import com.gitee.sop.admin.controller.isv.param.IsvInfoUpdateKeysParam; +import com.gitee.sop.admin.controller.isv.param.IsvInfoUpdateParam; +import com.gitee.sop.admin.controller.isv.param.IsvKeysGenParam; +import com.gitee.sop.admin.controller.isv.vo.IsvInfoVO; +import com.gitee.sop.admin.dao.entity.IsvInfo; +import com.gitee.sop.admin.service.isv.IsvInfoService; +import com.gitee.sop.admin.service.isv.PermIsvGroupService; +import com.gitee.sop.admin.service.isv.dto.IsvInfoAddDTO; +import com.gitee.sop.admin.service.isv.dto.IsvInfoDTO; +import com.gitee.sop.admin.service.isv.dto.IsvInfoUpdateDTO; +import com.gitee.sop.admin.service.isv.dto.IsvInfoUpdateKeysDTO; +import com.gitee.sop.admin.service.isv.dto.IsvKeysDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/PermGroupController.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/PermGroupController.java old mode 100644 new mode 100755 similarity index 84% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/PermGroupController.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/PermGroupController.java index 0016fb69..e160c12f --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/PermGroupController.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/PermGroupController.java @@ -1,13 +1,13 @@ -package com.gitee.sop.adminbackend.controller.isv; +package com.gitee.sop.admin.controller.isv; import com.gitee.fastmybatis.core.PageInfo; import com.gitee.fastmybatis.core.query.LambdaQuery; -import com.gitee.sop.adminbackend.common.req.IdParam; -import com.gitee.sop.adminbackend.common.resp.Result; -import com.gitee.sop.adminbackend.controller.isv.param.PermGroupPageParam; -import com.gitee.sop.adminbackend.controller.isv.param.PermGroupParam; -import com.gitee.sop.adminbackend.dao.entity.PermGroup; -import com.gitee.sop.adminbackend.service.isv.PermGroupService; +import com.gitee.sop.admin.common.req.IdParam; +import com.gitee.sop.admin.common.resp.Result; +import com.gitee.sop.admin.controller.isv.param.PermGroupPageParam; +import com.gitee.sop.admin.controller.isv.param.PermGroupParam; +import com.gitee.sop.admin.dao.entity.PermGroup; +import com.gitee.sop.admin.service.isv.PermGroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/PermGroupPermissionController.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/PermGroupPermissionController.java old mode 100644 new mode 100755 similarity index 77% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/PermGroupPermissionController.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/PermGroupPermissionController.java index 9f547da1..5935caa9 --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/PermGroupPermissionController.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/PermGroupPermissionController.java @@ -1,14 +1,14 @@ -package com.gitee.sop.adminbackend.controller.isv; +package com.gitee.sop.admin.controller.isv; import com.gitee.fastmybatis.core.PageInfo; import com.gitee.fastmybatis.core.query.LambdaQuery; -import com.gitee.sop.adminbackend.common.resp.Result; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.controller.isv.param.PermGroupApiInfoParam; -import com.gitee.sop.adminbackend.controller.isv.param.PermGroupPermissionParam; -import com.gitee.sop.adminbackend.dao.entity.ApiInfo; -import com.gitee.sop.adminbackend.service.isv.PermGroupPermissionService; -import com.gitee.sop.adminbackend.service.isv.dto.PermGroupPermissionDTO; +import com.gitee.sop.admin.common.resp.Result; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.controller.isv.param.PermGroupApiInfoParam; +import com.gitee.sop.admin.controller.isv.param.PermGroupPermissionParam; +import com.gitee.sop.admin.dao.entity.ApiInfo; +import com.gitee.sop.admin.service.isv.PermGroupPermissionService; +import com.gitee.sop.admin.service.isv.dto.PermGroupPermissionDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/PermIsvGroupController.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/PermIsvGroupController.java old mode 100644 new mode 100755 similarity index 75% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/PermIsvGroupController.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/PermIsvGroupController.java index a192304a..1b9a8974 --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/PermIsvGroupController.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/PermIsvGroupController.java @@ -1,12 +1,12 @@ -package com.gitee.sop.adminbackend.controller.isv; +package com.gitee.sop.admin.controller.isv; -import com.gitee.sop.adminbackend.common.context.SpringContext; -import com.gitee.sop.adminbackend.common.resp.Result; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.controller.isv.param.IsvGroupSettingParam; -import com.gitee.sop.adminbackend.service.isv.PermIsvGroupService; -import com.gitee.sop.adminbackend.service.isv.dto.IsvGroupSettingDTO; -import com.gitee.sop.adminbackend.service.isv.event.ChangeIsvPermEvent; +import com.gitee.sop.admin.common.context.SpringContext; +import com.gitee.sop.admin.common.resp.Result; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.controller.isv.param.IsvGroupSettingParam; +import com.gitee.sop.admin.service.isv.PermIsvGroupService; +import com.gitee.sop.admin.service.isv.dto.IsvGroupSettingDTO; +import com.gitee.sop.admin.service.isv.event.ChangeIsvPermEvent; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvGroupSettingParam.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/IsvGroupSettingParam.java old mode 100644 new mode 100755 similarity index 80% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvGroupSettingParam.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/IsvGroupSettingParam.java index fec29489..c0ee8407 --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvGroupSettingParam.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/IsvGroupSettingParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.isv.param; +package com.gitee.sop.admin.controller.isv.param; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvInfoAddParam.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/IsvInfoAddParam.java old mode 100644 new mode 100755 similarity index 85% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvInfoAddParam.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/IsvInfoAddParam.java index 9e4b50ad..306a97ea --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvInfoAddParam.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/IsvInfoAddParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.isv.param; +package com.gitee.sop.admin.controller.isv.param; import lombok.Data; import org.hibernate.validator.constraints.Length; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvInfoUpdateKeysParam.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/IsvInfoUpdateKeysParam.java old mode 100644 new mode 100755 similarity index 94% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvInfoUpdateKeysParam.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/IsvInfoUpdateKeysParam.java index 4fdbde89..7ff2d57a --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvInfoUpdateKeysParam.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/IsvInfoUpdateKeysParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.isv.param; +package com.gitee.sop.admin.controller.isv.param; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvInfoUpdateParam.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/IsvInfoUpdateParam.java old mode 100644 new mode 100755 similarity index 82% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvInfoUpdateParam.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/IsvInfoUpdateParam.java index 8b88039f..1f381e07 --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvInfoUpdateParam.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/IsvInfoUpdateParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.isv.param; +package com.gitee.sop.admin.controller.isv.param; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvKeysGenParam.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/IsvKeysGenParam.java old mode 100644 new mode 100755 similarity index 87% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvKeysGenParam.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/IsvKeysGenParam.java index 4f54e347..70c72ab9 --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvKeysGenParam.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/IsvKeysGenParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.isv.param; +package com.gitee.sop.admin.controller.isv.param; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/PermGroupApiInfoParam.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/PermGroupApiInfoParam.java old mode 100644 new mode 100755 similarity index 88% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/PermGroupApiInfoParam.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/PermGroupApiInfoParam.java index 4b196184..6a0d6efc --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/PermGroupApiInfoParam.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/PermGroupApiInfoParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.isv.param; +package com.gitee.sop.admin.controller.isv.param; import com.gitee.fastmybatis.core.query.Operator; import com.gitee.fastmybatis.core.query.annotation.Condition; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/PermGroupPageParam.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/PermGroupPageParam.java old mode 100644 new mode 100755 similarity index 89% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/PermGroupPageParam.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/PermGroupPageParam.java index e04b7f45..066fc34b --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/PermGroupPageParam.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/PermGroupPageParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.isv.param; +package com.gitee.sop.admin.controller.isv.param; import com.gitee.fastmybatis.core.query.Operator; import com.gitee.fastmybatis.core.query.annotation.Condition; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/PermGroupParam.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/PermGroupParam.java old mode 100644 new mode 100755 similarity index 86% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/PermGroupParam.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/PermGroupParam.java index a7d7b39b..5b3be85e --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/PermGroupParam.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/PermGroupParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.isv.param; +package com.gitee.sop.admin.controller.isv.param; import com.gitee.fastmybatis.core.query.Operator; import com.gitee.fastmybatis.core.query.annotation.Condition; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/PermGroupPermissionParam.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/PermGroupPermissionParam.java old mode 100644 new mode 100755 similarity index 80% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/PermGroupPermissionParam.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/PermGroupPermissionParam.java index 3d608c03..81ca1d98 --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/PermGroupPermissionParam.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/param/PermGroupPermissionParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.isv.param; +package com.gitee.sop.admin.controller.isv.param; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/vo/IsvInfoVO.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/vo/IsvInfoVO.java old mode 100644 new mode 100755 similarity index 82% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/vo/IsvInfoVO.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/vo/IsvInfoVO.java index 463f6902..039d3ea1 --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/isv/vo/IsvInfoVO.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/isv/vo/IsvInfoVO.java @@ -1,6 +1,6 @@ -package com.gitee.sop.adminbackend.controller.isv.vo; +package com.gitee.sop.admin.controller.isv.vo; -import com.gitee.sop.adminbackend.service.jackson.convert.annotation.UserFormat; +import com.gitee.sop.admin.service.jackson.convert.annotation.UserFormat; import lombok.Data; import java.time.LocalDateTime; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/serve/ApiInfoController.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/serve/ApiInfoController.java old mode 100644 new mode 100755 similarity index 82% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/serve/ApiInfoController.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/serve/ApiInfoController.java index 7d88dd81..c256286c --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/serve/ApiInfoController.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/serve/ApiInfoController.java @@ -1,15 +1,15 @@ -package com.gitee.sop.adminbackend.controller.serve; +package com.gitee.sop.admin.controller.serve; import com.gitee.fastmybatis.core.PageInfo; import com.gitee.fastmybatis.core.query.Query; -import com.gitee.sop.adminbackend.common.dto.StatusUpdateDTO; -import com.gitee.sop.adminbackend.common.req.StatusUpdateParam; -import com.gitee.sop.adminbackend.common.resp.Result; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.controller.serve.param.ApiInfoPageParam; -import com.gitee.sop.adminbackend.controller.serve.vo.ApiInfoVO; -import com.gitee.sop.adminbackend.dao.entity.ApiInfo; -import com.gitee.sop.adminbackend.service.serve.ApiInfoService; +import com.gitee.sop.admin.common.dto.StatusUpdateDTO; +import com.gitee.sop.admin.common.req.StatusUpdateParam; +import com.gitee.sop.admin.common.resp.Result; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.controller.serve.param.ApiInfoPageParam; +import com.gitee.sop.admin.controller.serve.vo.ApiInfoVO; +import com.gitee.sop.admin.dao.entity.ApiInfo; +import com.gitee.sop.admin.service.serve.ApiInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/serve/param/ApiInfoPageParam.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/serve/param/ApiInfoPageParam.java old mode 100644 new mode 100755 similarity index 89% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/serve/param/ApiInfoPageParam.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/serve/param/ApiInfoPageParam.java index cf2dc359..793fdd03 --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/serve/param/ApiInfoPageParam.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/serve/param/ApiInfoPageParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.serve.param; +package com.gitee.sop.admin.controller.serve.param; import com.gitee.fastmybatis.core.query.Operator; import com.gitee.fastmybatis.core.query.annotation.Condition; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/serve/param/ApiInfoParam.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/serve/param/ApiInfoParam.java old mode 100644 new mode 100755 similarity index 84% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/serve/param/ApiInfoParam.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/serve/param/ApiInfoParam.java index 5bab3382..14e98ed0 --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/serve/param/ApiInfoParam.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/serve/param/ApiInfoParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.serve.param; +package com.gitee.sop.admin.controller.serve.param; import com.gitee.fastmybatis.core.query.Operator; import com.gitee.fastmybatis.core.query.annotation.Condition; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/serve/vo/ApiInfoVO.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/serve/vo/ApiInfoVO.java old mode 100644 new mode 100755 similarity index 91% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/serve/vo/ApiInfoVO.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/serve/vo/ApiInfoVO.java index 9bfccb7f..2a7ce9c9 --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/serve/vo/ApiInfoVO.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/serve/vo/ApiInfoVO.java @@ -1,6 +1,6 @@ -package com.gitee.sop.adminbackend.controller.serve.vo; +package com.gitee.sop.admin.controller.serve.vo; -import com.gitee.sop.adminbackend.service.jackson.convert.annotation.UserFormat; +import com.gitee.sop.admin.service.jackson.convert.annotation.UserFormat; import lombok.Data; import java.time.LocalDateTime; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/LoginController.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/LoginController.java old mode 100644 new mode 100755 similarity index 64% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/LoginController.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/LoginController.java index f6adb68a..5ad91b5f --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/LoginController.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/LoginController.java @@ -1,14 +1,14 @@ -package com.gitee.sop.adminbackend.controller.sys; +package com.gitee.sop.admin.controller.sys; -import com.gitee.sop.adminbackend.common.annotation.NoToken; -import com.gitee.sop.adminbackend.common.resp.Result; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.controller.sys.param.LoginParam; -import com.gitee.sop.adminbackend.controller.sys.vo.LoginResultVO; -import com.gitee.sop.adminbackend.service.sys.login.LoginService; -import com.gitee.sop.adminbackend.service.sys.login.dto.LoginDTO; -import com.gitee.sop.adminbackend.service.sys.login.dto.LoginUser; -import com.gitee.sop.adminbackend.service.sys.login.enums.RegTypeEnum; +import com.gitee.sop.admin.common.annotation.NoToken; +import com.gitee.sop.admin.common.resp.Result; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.controller.sys.param.LoginParam; +import com.gitee.sop.admin.controller.sys.vo.LoginResultVO; +import com.gitee.sop.admin.service.sys.login.LoginService; +import com.gitee.sop.admin.service.sys.login.dto.LoginDTO; +import com.gitee.sop.admin.service.sys.login.dto.LoginUser; +import com.gitee.sop.admin.service.sys.login.enums.RegTypeEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/SysConfigController.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/SysConfigController.java old mode 100644 new mode 100755 similarity index 76% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/SysConfigController.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/SysConfigController.java index 94892081..772d07e1 --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/SysConfigController.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/SysConfigController.java @@ -1,8 +1,8 @@ -package com.gitee.sop.adminbackend.controller.sys; +package com.gitee.sop.admin.controller.sys; -import com.gitee.sop.adminbackend.common.resp.Result; -import com.gitee.sop.adminbackend.controller.sys.param.ConfigSettingParam; -import com.gitee.sop.adminbackend.service.sys.SysConfigService; +import com.gitee.sop.admin.common.resp.Result; +import com.gitee.sop.admin.controller.sys.param.ConfigSettingParam; +import com.gitee.sop.admin.service.sys.SysConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/SysDeptController.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/SysDeptController.java old mode 100644 new mode 100755 similarity index 81% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/SysDeptController.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/SysDeptController.java index 743bf91b..a5ba960f --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/SysDeptController.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/SysDeptController.java @@ -1,12 +1,12 @@ -package com.gitee.sop.adminbackend.controller.sys; +package com.gitee.sop.admin.controller.sys; -import com.gitee.sop.adminbackend.common.dto.StatusUpdateDTO; -import com.gitee.sop.adminbackend.common.exception.BizException; -import com.gitee.sop.adminbackend.common.req.StatusUpdateParam; -import com.gitee.sop.adminbackend.common.resp.Result; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.dao.entity.SysDept; -import com.gitee.sop.adminbackend.service.sys.SysDeptService; +import com.gitee.sop.admin.common.dto.StatusUpdateDTO; +import com.gitee.sop.admin.common.exception.BizException; +import com.gitee.sop.admin.common.req.StatusUpdateParam; +import com.gitee.sop.admin.common.resp.Result; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.dao.entity.SysDept; +import com.gitee.sop.admin.service.sys.SysDeptService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/SysResourceController.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/SysResourceController.java old mode 100644 new mode 100755 similarity index 80% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/SysResourceController.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/SysResourceController.java index ab86a761..1988d04c --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/SysResourceController.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/SysResourceController.java @@ -1,17 +1,17 @@ -package com.gitee.sop.adminbackend.controller.sys; +package com.gitee.sop.admin.controller.sys; -import com.gitee.sop.adminbackend.common.context.UserContext; -import com.gitee.sop.adminbackend.common.req.IdParam; -import com.gitee.sop.adminbackend.common.resp.Result; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.controller.sys.param.SysResourceAddParam; -import com.gitee.sop.adminbackend.controller.sys.param.SysResourceUpdateParam; -import com.gitee.sop.adminbackend.controller.sys.param.SysRoleResourceSaveParam; -import com.gitee.sop.adminbackend.controller.sys.vo.SysResourceVO; -import com.gitee.sop.adminbackend.dao.entity.SysResource; -import com.gitee.sop.adminbackend.service.sys.SysResourceService; -import com.gitee.sop.adminbackend.service.sys.SysRoleResourceService; -import com.gitee.sop.adminbackend.service.sys.dto.SysRoleResourceDTO; +import com.gitee.sop.admin.common.context.UserContext; +import com.gitee.sop.admin.common.req.IdParam; +import com.gitee.sop.admin.common.resp.Result; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.controller.sys.param.SysResourceAddParam; +import com.gitee.sop.admin.controller.sys.param.SysResourceUpdateParam; +import com.gitee.sop.admin.controller.sys.param.SysRoleResourceSaveParam; +import com.gitee.sop.admin.controller.sys.vo.SysResourceVO; +import com.gitee.sop.admin.dao.entity.SysResource; +import com.gitee.sop.admin.service.sys.SysResourceService; +import com.gitee.sop.admin.service.sys.SysRoleResourceService; +import com.gitee.sop.admin.service.sys.dto.SysRoleResourceDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/SysRoleController.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/SysRoleController.java old mode 100644 new mode 100755 similarity index 83% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/SysRoleController.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/SysRoleController.java index ff0470c1..52744359 --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/SysRoleController.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/SysRoleController.java @@ -1,15 +1,15 @@ -package com.gitee.sop.adminbackend.controller.sys; +package com.gitee.sop.admin.controller.sys; import com.gitee.fastmybatis.core.PageInfo; import com.gitee.fastmybatis.core.query.LambdaQuery; -import com.gitee.sop.adminbackend.common.dto.StatusUpdateDTO; -import com.gitee.sop.adminbackend.common.req.IdParam; -import com.gitee.sop.adminbackend.common.req.StatusUpdateParam; -import com.gitee.sop.adminbackend.common.resp.Result; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.controller.sys.param.SysRoleParam; -import com.gitee.sop.adminbackend.dao.entity.SysRole; -import com.gitee.sop.adminbackend.service.sys.SysRoleService; +import com.gitee.sop.admin.common.dto.StatusUpdateDTO; +import com.gitee.sop.admin.common.req.IdParam; +import com.gitee.sop.admin.common.req.StatusUpdateParam; +import com.gitee.sop.admin.common.resp.Result; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.controller.sys.param.SysRoleParam; +import com.gitee.sop.admin.dao.entity.SysRole; +import com.gitee.sop.admin.service.sys.SysRoleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/SysUserController.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/SysUserController.java old mode 100644 new mode 100755 similarity index 74% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/SysUserController.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/SysUserController.java index f45b9995..ad50f41b --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/SysUserController.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/SysUserController.java @@ -1,23 +1,23 @@ -package com.gitee.sop.adminbackend.controller.sys; +package com.gitee.sop.admin.controller.sys; import com.gitee.fastmybatis.core.PageInfo; -import com.gitee.sop.adminbackend.common.context.UserContext; -import com.gitee.sop.adminbackend.common.dto.StatusUpdateBatchDTO; -import com.gitee.sop.adminbackend.common.dto.StatusUpdateDTO; -import com.gitee.sop.adminbackend.common.req.StatusUpdateBatchParam; -import com.gitee.sop.adminbackend.common.req.StatusUpdateParam; -import com.gitee.sop.adminbackend.common.resp.Result; -import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.controller.sys.param.RestPasswordParam; -import com.gitee.sop.adminbackend.controller.sys.param.SysUserAddParam; -import com.gitee.sop.adminbackend.controller.sys.param.SysUserParam; -import com.gitee.sop.adminbackend.controller.sys.param.SysUserUpdateParam; -import com.gitee.sop.adminbackend.controller.sys.vo.SysUserVO; -import com.gitee.sop.adminbackend.service.sys.SysUserService; -import com.gitee.sop.adminbackend.service.sys.dto.SysUserAddDTO; -import com.gitee.sop.adminbackend.service.sys.dto.SysUserDTO; -import com.gitee.sop.adminbackend.service.sys.dto.SysUserSearchDTO; -import com.gitee.sop.adminbackend.service.sys.dto.SysUserUpdateDTO; +import com.gitee.sop.admin.common.context.UserContext; +import com.gitee.sop.admin.common.dto.StatusUpdateBatchDTO; +import com.gitee.sop.admin.common.dto.StatusUpdateDTO; +import com.gitee.sop.admin.common.req.StatusUpdateBatchParam; +import com.gitee.sop.admin.common.req.StatusUpdateParam; +import com.gitee.sop.admin.common.resp.Result; +import com.gitee.sop.admin.common.util.CopyUtil; +import com.gitee.sop.admin.controller.sys.param.RestPasswordParam; +import com.gitee.sop.admin.controller.sys.param.SysUserAddParam; +import com.gitee.sop.admin.controller.sys.param.SysUserParam; +import com.gitee.sop.admin.controller.sys.param.SysUserUpdateParam; +import com.gitee.sop.admin.controller.sys.vo.SysUserVO; +import com.gitee.sop.admin.service.sys.SysUserService; +import com.gitee.sop.admin.service.sys.dto.SysUserAddDTO; +import com.gitee.sop.admin.service.sys.dto.SysUserDTO; +import com.gitee.sop.admin.service.sys.dto.SysUserSearchDTO; +import com.gitee.sop.admin.service.sys.dto.SysUserUpdateDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/SysUserRoleController.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/SysUserRoleController.java old mode 100644 new mode 100755 similarity index 80% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/SysUserRoleController.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/SysUserRoleController.java index 0cd9c8e3..b7216c4b --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/SysUserRoleController.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/SysUserRoleController.java @@ -1,9 +1,9 @@ -package com.gitee.sop.adminbackend.controller.sys; +package com.gitee.sop.admin.controller.sys; -import com.gitee.sop.adminbackend.common.context.UserContext; -import com.gitee.sop.adminbackend.common.resp.Result; -import com.gitee.sop.adminbackend.controller.sys.param.SysUserRoleSettingParam; -import com.gitee.sop.adminbackend.service.sys.SysUserRoleService; +import com.gitee.sop.admin.common.context.UserContext; +import com.gitee.sop.admin.common.resp.Result; +import com.gitee.sop.admin.controller.sys.param.SysUserRoleSettingParam; +import com.gitee.sop.admin.service.sys.SysUserRoleService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/UserPermissionController.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/UserPermissionController.java old mode 100644 new mode 100755 similarity index 73% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/UserPermissionController.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/UserPermissionController.java index 79ecc35e..48879153 --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/UserPermissionController.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/UserPermissionController.java @@ -1,9 +1,9 @@ -package com.gitee.sop.adminbackend.controller.sys; +package com.gitee.sop.admin.controller.sys; -import com.gitee.sop.adminbackend.common.context.UserContext; -import com.gitee.sop.adminbackend.common.resp.Result; -import com.gitee.sop.adminbackend.service.sys.UserPermissionService; -import com.gitee.sop.adminbackend.service.sys.dto.MenuTreeDTO; +import com.gitee.sop.admin.common.context.UserContext; +import com.gitee.sop.admin.common.resp.Result; +import com.gitee.sop.admin.service.sys.UserPermissionService; +import com.gitee.sop.admin.service.sys.dto.MenuTreeDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/ConfigSettingParam.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/ConfigSettingParam.java old mode 100644 new mode 100755 similarity index 63% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/ConfigSettingParam.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/ConfigSettingParam.java index 544e4fa1..9cc0ab7d --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/ConfigSettingParam.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/ConfigSettingParam.java @@ -1,6 +1,6 @@ -package com.gitee.sop.adminbackend.controller.sys.param; +package com.gitee.sop.admin.controller.sys.param; -import com.gitee.sop.adminbackend.service.sys.dto.SystemConfigDTO; +import com.gitee.sop.admin.service.sys.dto.SystemConfigDTO; import lombok.Data; import javax.validation.constraints.NotEmpty; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/LoginParam.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/LoginParam.java old mode 100644 new mode 100755 similarity index 81% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/LoginParam.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/LoginParam.java index b4d3a593..63a7743e --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/LoginParam.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/LoginParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.sys.param; +package com.gitee.sop.admin.controller.sys.param; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/RestPasswordParam.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/RestPasswordParam.java old mode 100644 new mode 100755 similarity index 82% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/RestPasswordParam.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/RestPasswordParam.java index 3b39c7d0..a525295d --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/RestPasswordParam.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/RestPasswordParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.sys.param; +package com.gitee.sop.admin.controller.sys.param; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysDeptParam.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysDeptParam.java old mode 100644 new mode 100755 similarity index 91% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysDeptParam.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysDeptParam.java index 28834f75..08094174 --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysDeptParam.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysDeptParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.sys.param; +package com.gitee.sop.admin.controller.sys.param; import com.gitee.fastmybatis.core.query.Operator; import com.gitee.fastmybatis.core.query.annotation.Condition; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysResourceAddParam.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysResourceAddParam.java old mode 100644 new mode 100755 similarity index 94% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysResourceAddParam.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysResourceAddParam.java index afbdde42..c4d79f0d --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysResourceAddParam.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysResourceAddParam.java @@ -1,6 +1,6 @@ -package com.gitee.sop.adminbackend.controller.sys.param; +package com.gitee.sop.admin.controller.sys.param; -import com.gitee.sop.adminbackend.common.jackson.convert.annotation.Bool; +import com.gitee.sop.admin.common.jackson.convert.annotation.Bool; import lombok.Data; import javax.validation.constraints.NotNull; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysResourceUpdateParam.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysResourceUpdateParam.java old mode 100644 new mode 100755 similarity index 84% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysResourceUpdateParam.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysResourceUpdateParam.java index 860f4f4f..7e1f864a --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysResourceUpdateParam.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysResourceUpdateParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.sys.param; +package com.gitee.sop.admin.controller.sys.param; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysRoleParam.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysRoleParam.java old mode 100644 new mode 100755 similarity index 92% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysRoleParam.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysRoleParam.java index dad55eb9..d5b72929 --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysRoleParam.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysRoleParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.sys.param; +package com.gitee.sop.admin.controller.sys.param; import com.gitee.fastmybatis.core.query.Operator; import com.gitee.fastmybatis.core.query.annotation.Condition; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysRoleResourceSaveParam.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysRoleResourceSaveParam.java old mode 100644 new mode 100755 similarity index 86% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysRoleResourceSaveParam.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysRoleResourceSaveParam.java index 1a27e7b7..65991a6c --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysRoleResourceSaveParam.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysRoleResourceSaveParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.sys.param; +package com.gitee.sop.admin.controller.sys.param; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysUserAddParam.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysUserAddParam.java old mode 100644 new mode 100755 similarity index 95% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysUserAddParam.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysUserAddParam.java index 728ca8ad..ba18c6e2 --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysUserAddParam.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysUserAddParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.sys.param; +package com.gitee.sop.admin.controller.sys.param; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysUserParam.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysUserParam.java old mode 100644 new mode 100755 similarity index 93% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysUserParam.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysUserParam.java index 37c54a23..98f2b78e --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysUserParam.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysUserParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.sys.param; +package com.gitee.sop.admin.controller.sys.param; import com.gitee.fastmybatis.core.query.Operator; import com.gitee.fastmybatis.core.query.annotation.Condition; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysUserRoleSettingParam.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysUserRoleSettingParam.java old mode 100644 new mode 100755 similarity index 84% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysUserRoleSettingParam.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysUserRoleSettingParam.java index b22e9061..d90e4d19 --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysUserRoleSettingParam.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysUserRoleSettingParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.sys.param; +package com.gitee.sop.admin.controller.sys.param; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysUserUpdateParam.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysUserUpdateParam.java old mode 100644 new mode 100755 similarity index 84% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysUserUpdateParam.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysUserUpdateParam.java index 1da0ba57..a370a715 --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/SysUserUpdateParam.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/param/SysUserUpdateParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.sys.param; +package com.gitee.sop.admin.controller.sys.param; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/vo/LoginResultVO.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/vo/LoginResultVO.java old mode 100644 new mode 100755 similarity index 92% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/vo/LoginResultVO.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/vo/LoginResultVO.java index 6e6efa08..2e07c88e --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/vo/LoginResultVO.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/vo/LoginResultVO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.sys.vo; +package com.gitee.sop.admin.controller.sys.vo; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/vo/SysDeptVO.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/vo/SysDeptVO.java old mode 100644 new mode 100755 similarity index 94% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/vo/SysDeptVO.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/vo/SysDeptVO.java index 678cf9f9..4e16320f --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/vo/SysDeptVO.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/vo/SysDeptVO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.sys.vo; +package com.gitee.sop.admin.controller.sys.vo; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/vo/SysResourceVO.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/vo/SysResourceVO.java old mode 100644 new mode 100755 similarity index 95% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/vo/SysResourceVO.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/vo/SysResourceVO.java index 02b71002..c360b241 --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/vo/SysResourceVO.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/vo/SysResourceVO.java @@ -1,6 +1,6 @@ -package com.gitee.sop.adminbackend.controller.sys.vo; +package com.gitee.sop.admin.controller.sys.vo; -import com.gitee.sop.adminbackend.common.jackson.convert.annotation.Bool; +import com.gitee.sop.admin.common.jackson.convert.annotation.Bool; import lombok.Data; import javax.validation.constraints.NotBlank; diff --git a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/vo/SysUserVO.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/vo/SysUserVO.java old mode 100644 new mode 100755 similarity index 95% rename from sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/vo/SysUserVO.java rename to sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/vo/SysUserVO.java index 393601c9..92f9081f --- a/sop-admin/sop-admin-backend/backend-web/src/main/java/com/gitee/sop/adminbackend/controller/sys/vo/SysUserVO.java +++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/vo/SysUserVO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.sys.vo; +package com.gitee.sop.admin.controller.sys.vo; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/jackson/package-info.java b/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/jackson/package-info.java deleted file mode 100644 index 1b5b5549..00000000 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/jackson/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.gitee.sop.adminbackend.service.jackson; diff --git a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/SysResourceService.java b/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/SysResourceService.java deleted file mode 100644 index 317f7a6d..00000000 --- a/sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/sys/SysResourceService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.gitee.sop.adminbackend.service.sys; - -import com.gitee.sop.adminbackend.common.support.ServiceSupport; -import com.gitee.sop.adminbackend.dao.entity.SysResource; -import com.gitee.sop.adminbackend.dao.mapper.SysResourceMapper; -import org.springframework.stereotype.Service; - - -/** - * @author 六如 - */ -@Service -public class SysResourceService implements ServiceSupport { - -} diff --git a/sop-admin/sop-admin-backend/website-web/pom.xml b/sop-admin/sop-admin-backend/website-web/pom.xml old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-backend/website-web/src/main/java/com/gitee/sop/adminbackend/controller/website/vo/DocAppVO.java b/sop-admin/sop-admin-backend/website-web/src/main/java/com/gitee/sop/adminbackend/controller/website/vo/DocAppVO.java old mode 100644 new mode 100755 index a54967bc..1917877f --- a/sop-admin/sop-admin-backend/website-web/src/main/java/com/gitee/sop/adminbackend/controller/website/vo/DocAppVO.java +++ b/sop-admin/sop-admin-backend/website-web/src/main/java/com/gitee/sop/adminbackend/controller/website/vo/DocAppVO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.website.vo; +package com.gitee.sop.admin.controller.website.vo; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/website-web/src/main/java/com/gitee/sop/adminbackend/controller/website/vo/DocInfoConfigVO.java b/sop-admin/sop-admin-backend/website-web/src/main/java/com/gitee/sop/adminbackend/controller/website/vo/DocInfoConfigVO.java old mode 100644 new mode 100755 index a55de295..00a263b1 --- a/sop-admin/sop-admin-backend/website-web/src/main/java/com/gitee/sop/adminbackend/controller/website/vo/DocInfoConfigVO.java +++ b/sop-admin/sop-admin-backend/website-web/src/main/java/com/gitee/sop/adminbackend/controller/website/vo/DocInfoConfigVO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.website.vo; +package com.gitee.sop.admin.controller.website.vo; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/website-web/src/main/java/com/gitee/sop/adminbackend/controller/website/vo/DocInfoTreeVO.java b/sop-admin/sop-admin-backend/website-web/src/main/java/com/gitee/sop/adminbackend/controller/website/vo/DocInfoTreeVO.java old mode 100644 new mode 100755 index b6a75b8d..c72bc487 --- a/sop-admin/sop-admin-backend/website-web/src/main/java/com/gitee/sop/adminbackend/controller/website/vo/DocInfoTreeVO.java +++ b/sop-admin/sop-admin-backend/website-web/src/main/java/com/gitee/sop/adminbackend/controller/website/vo/DocInfoTreeVO.java @@ -1,7 +1,7 @@ -package com.gitee.sop.adminbackend.controller.website.vo; +package com.gitee.sop.admin.controller.website.vo; import com.gitee.fastmybatis.core.support.TreeNode; -import com.gitee.sop.adminbackend.common.constants.YesOrNo; +import com.gitee.sop.admin.common.constants.YesOrNo; import lombok.Data; import java.util.List; diff --git a/sop-admin/sop-admin-backend/website-web/src/main/java/com/gitee/sop/adminbackend/controller/website/vo/DocInfoViewVO.java b/sop-admin/sop-admin-backend/website-web/src/main/java/com/gitee/sop/adminbackend/controller/website/vo/DocInfoViewVO.java old mode 100644 new mode 100755 index a7d845bc..b2a68e54 --- a/sop-admin/sop-admin-backend/website-web/src/main/java/com/gitee/sop/adminbackend/controller/website/vo/DocInfoViewVO.java +++ b/sop-admin/sop-admin-backend/website-web/src/main/java/com/gitee/sop/adminbackend/controller/website/vo/DocInfoViewVO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.website.vo; +package com.gitee.sop.admin.controller.website.vo; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/website-web/src/main/java/com/gitee/sop/adminbackend/controller/website/vo/TornaDocInfoViewVO.java b/sop-admin/sop-admin-backend/website-web/src/main/java/com/gitee/sop/adminbackend/controller/website/vo/TornaDocInfoViewVO.java old mode 100644 new mode 100755 index 7e67a693..cf1a5778 --- a/sop-admin/sop-admin-backend/website-web/src/main/java/com/gitee/sop/adminbackend/controller/website/vo/TornaDocInfoViewVO.java +++ b/sop-admin/sop-admin-backend/website-web/src/main/java/com/gitee/sop/adminbackend/controller/website/vo/TornaDocInfoViewVO.java @@ -1,6 +1,6 @@ -package com.gitee.sop.adminbackend.controller.website.vo; +package com.gitee.sop.admin.controller.website.vo; -import com.gitee.sop.adminbackend.service.doc.dto.torna.TornaDocParamDTO; +import com.gitee.sop.admin.service.doc.dto.torna.TornaDocParamDTO; import lombok.Data; import java.time.LocalDateTime; diff --git a/sop-admin/sop-admin-frontend/.browserslistrc b/sop-admin/sop-admin-frontend/.browserslistrc old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/.dockerignore b/sop-admin/sop-admin-frontend/.dockerignore old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/.editorconfig b/sop-admin/sop-admin-frontend/.editorconfig old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/.env b/sop-admin/sop-admin-frontend/.env old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/.env.development b/sop-admin/sop-admin-frontend/.env.development old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/.env.production b/sop-admin/sop-admin-frontend/.env.production old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/.env.staging b/sop-admin/sop-admin-frontend/.env.staging old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/.gitignore b/sop-admin/sop-admin-frontend/.gitignore old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/.husky/common.sh b/sop-admin/sop-admin-frontend/.husky/common.sh old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/.lintstagedrc b/sop-admin/sop-admin-frontend/.lintstagedrc old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/.markdownlint.json b/sop-admin/sop-admin-frontend/.markdownlint.json old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/.npmrc b/sop-admin/sop-admin-frontend/.npmrc old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/.nvmrc b/sop-admin/sop-admin-frontend/.nvmrc old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/.prettierrc.js b/sop-admin/sop-admin-frontend/.prettierrc.js old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/.stylelintignore b/sop-admin/sop-admin-frontend/.stylelintignore old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/.vscode/extensions.json b/sop-admin/sop-admin-frontend/.vscode/extensions.json old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/.vscode/settings.json b/sop-admin/sop-admin-frontend/.vscode/settings.json old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/.vscode/vue3.0.code-snippets b/sop-admin/sop-admin-frontend/.vscode/vue3.0.code-snippets old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/.vscode/vue3.2.code-snippets b/sop-admin/sop-admin-frontend/.vscode/vue3.2.code-snippets old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/.vscode/vue3.3.code-snippets b/sop-admin/sop-admin-frontend/.vscode/vue3.3.code-snippets old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/Dockerfile b/sop-admin/sop-admin-frontend/Dockerfile old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/LICENSE b/sop-admin/sop-admin-frontend/LICENSE old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/README.md b/sop-admin/sop-admin-frontend/README.md old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/build.sh b/sop-admin/sop-admin-frontend/build.sh new file mode 100755 index 00000000..2633fe08 --- /dev/null +++ b/sop-admin/sop-admin-frontend/build.sh @@ -0,0 +1,2 @@ +# 构建 +sudo pnpm build diff --git a/sop-admin/sop-admin-frontend/build/cdn.ts b/sop-admin/sop-admin-frontend/build/cdn.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/build/compress.ts b/sop-admin/sop-admin-frontend/build/compress.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/build/info.ts b/sop-admin/sop-admin-frontend/build/info.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/build/optimize.ts b/sop-admin/sop-admin-frontend/build/optimize.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/build/plugins.ts b/sop-admin/sop-admin-frontend/build/plugins.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/build/utils.ts b/sop-admin/sop-admin-frontend/build/utils.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/commitlint.config.js b/sop-admin/sop-admin-frontend/commitlint.config.js old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/eslint.config.js b/sop-admin/sop-admin-frontend/eslint.config.js old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/index.html b/sop-admin/sop-admin-frontend/index.html old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/locales/en.yaml b/sop-admin/sop-admin-frontend/locales/en.yaml old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/locales/zh-CN.yaml b/sop-admin/sop-admin-frontend/locales/zh-CN.yaml old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/mock/asyncRoutes.ts b/sop-admin/sop-admin-frontend/mock/asyncRoutes.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/mock/login.ts b/sop-admin/sop-admin-frontend/mock/login.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/mock/refreshToken.ts b/sop-admin/sop-admin-frontend/mock/refreshToken.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/package.json b/sop-admin/sop-admin-frontend/package.json old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/pnpm-lock.yaml b/sop-admin/sop-admin-frontend/pnpm-lock.yaml old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/postcss.config.js b/sop-admin/sop-admin-frontend/postcss.config.js old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/public/favicon.ico b/sop-admin/sop-admin-frontend/public/favicon.ico old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/public/logo.png b/sop-admin/sop-admin-frontend/public/logo.png old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/App.vue b/sop-admin/sop-admin-frontend/src/App.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/api/doc.ts b/sop-admin/sop-admin-frontend/src/api/doc.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/api/docSetting.ts b/sop-admin/sop-admin-frontend/src/api/docSetting.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/api/isvList.ts b/sop-admin/sop-admin-frontend/src/api/isvList.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/api/permGroup.ts b/sop-admin/sop-admin-frontend/src/api/permGroup.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/api/permGroupPermission.ts b/sop-admin/sop-admin-frontend/src/api/permGroupPermission.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/api/routes.ts b/sop-admin/sop-admin-frontend/src/api/routes.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/api/serveApi.ts b/sop-admin/sop-admin-frontend/src/api/serveApi.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/api/sysAdminUser.ts b/sop-admin/sop-admin-frontend/src/api/sysAdminUser.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/api/system.ts b/sop-admin/sop-admin-frontend/src/api/system.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/api/user.ts b/sop-admin/sop-admin-frontend/src/api/user.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/iconfont/iconfont.css b/sop-admin/sop-admin-frontend/src/assets/iconfont/iconfont.css old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/iconfont/iconfont.js b/sop-admin/sop-admin-frontend/src/assets/iconfont/iconfont.js old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/iconfont/iconfont.json b/sop-admin/sop-admin-frontend/src/assets/iconfont/iconfont.json old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/iconfont/iconfont.ttf b/sop-admin/sop-admin-frontend/src/assets/iconfont/iconfont.ttf old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/iconfont/iconfont.woff b/sop-admin/sop-admin-frontend/src/assets/iconfont/iconfont.woff old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/iconfont/iconfont.woff2 b/sop-admin/sop-admin-frontend/src/assets/iconfont/iconfont.woff2 old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/login/avatar.svg b/sop-admin/sop-admin-frontend/src/assets/login/avatar.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/login/bg.png b/sop-admin/sop-admin-frontend/src/assets/login/bg.png old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/login/illustration.svg b/sop-admin/sop-admin-frontend/src/assets/login/illustration.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/status/403.svg b/sop-admin/sop-admin-frontend/src/assets/status/403.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/status/404.svg b/sop-admin/sop-admin-frontend/src/assets/status/404.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/status/500.svg b/sop-admin/sop-admin-frontend/src/assets/status/500.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/svg/back_top.svg b/sop-admin/sop-admin-frontend/src/assets/svg/back_top.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/svg/dark.svg b/sop-admin/sop-admin-frontend/src/assets/svg/dark.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/svg/day.svg b/sop-admin/sop-admin-frontend/src/assets/svg/day.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/svg/enter_outlined.svg b/sop-admin/sop-admin-frontend/src/assets/svg/enter_outlined.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/svg/exit_screen.svg b/sop-admin/sop-admin-frontend/src/assets/svg/exit_screen.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/svg/full_screen.svg b/sop-admin/sop-admin-frontend/src/assets/svg/full_screen.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/svg/globalization.svg b/sop-admin/sop-admin-frontend/src/assets/svg/globalization.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/svg/keyboard_esc.svg b/sop-admin/sop-admin-frontend/src/assets/svg/keyboard_esc.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/svg/system.svg b/sop-admin/sop-admin-frontend/src/assets/svg/system.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/table-bar/collapse.svg b/sop-admin/sop-admin-frontend/src/assets/table-bar/collapse.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/table-bar/drag.svg b/sop-admin/sop-admin-frontend/src/assets/table-bar/drag.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/table-bar/expand.svg b/sop-admin/sop-admin-frontend/src/assets/table-bar/expand.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/table-bar/refresh.svg b/sop-admin/sop-admin-frontend/src/assets/table-bar/refresh.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/table-bar/settings.svg b/sop-admin/sop-admin-frontend/src/assets/table-bar/settings.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/assets/user.jpg b/sop-admin/sop-admin-frontend/src/assets/user.jpg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ApiSelect/index.ts b/sop-admin/sop-admin-frontend/src/components/ApiSelect/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ApiSelect/index.vue b/sop-admin/sop-admin-frontend/src/components/ApiSelect/index.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReAnimateSelector/index.ts b/sop-admin/sop-admin-frontend/src/components/ReAnimateSelector/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReAnimateSelector/src/animate.ts b/sop-admin/sop-admin-frontend/src/components/ReAnimateSelector/src/animate.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReAnimateSelector/src/index.vue b/sop-admin/sop-admin-frontend/src/components/ReAnimateSelector/src/index.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReAuth/index.ts b/sop-admin/sop-admin-frontend/src/components/ReAuth/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReAuth/src/auth.tsx b/sop-admin/sop-admin-frontend/src/components/ReAuth/src/auth.tsx old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReCol/index.ts b/sop-admin/sop-admin-frontend/src/components/ReCol/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReCropper/index.ts b/sop-admin/sop-admin-frontend/src/components/ReCropper/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReCropper/src/circled.css b/sop-admin/sop-admin-frontend/src/components/ReCropper/src/circled.css old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReCropper/src/index.tsx b/sop-admin/sop-admin-frontend/src/components/ReCropper/src/index.tsx old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/arrow-down.svg b/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/arrow-down.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/arrow-h.svg b/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/arrow-h.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/arrow-left.svg b/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/arrow-left.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/arrow-right.svg b/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/arrow-right.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/arrow-up.svg b/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/arrow-up.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/arrow-v.svg b/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/arrow-v.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/change.svg b/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/change.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/download.svg b/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/download.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/index.ts b/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/reload.svg b/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/reload.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/rotate-left.svg b/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/rotate-left.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/rotate-right.svg b/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/rotate-right.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/search-minus.svg b/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/search-minus.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/search-plus.svg b/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/search-plus.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/upload.svg b/sop-admin/sop-admin-frontend/src/components/ReCropper/src/svg/upload.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReCropperPreview/index.ts b/sop-admin/sop-admin-frontend/src/components/ReCropperPreview/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReCropperPreview/src/index.vue b/sop-admin/sop-admin-frontend/src/components/ReCropperPreview/src/index.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReDialog/index.ts b/sop-admin/sop-admin-frontend/src/components/ReDialog/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReDialog/index.vue b/sop-admin/sop-admin-frontend/src/components/ReDialog/index.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReDialog/type.ts b/sop-admin/sop-admin-frontend/src/components/ReDialog/type.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReIcon/data.ts b/sop-admin/sop-admin-frontend/src/components/ReIcon/data.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReIcon/index.ts b/sop-admin/sop-admin-frontend/src/components/ReIcon/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReIcon/src/Select.vue b/sop-admin/sop-admin-frontend/src/components/ReIcon/src/Select.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReIcon/src/hooks.ts b/sop-admin/sop-admin-frontend/src/components/ReIcon/src/hooks.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReIcon/src/iconfont.ts b/sop-admin/sop-admin-frontend/src/components/ReIcon/src/iconfont.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReIcon/src/iconifyIconOffline.ts b/sop-admin/sop-admin-frontend/src/components/ReIcon/src/iconifyIconOffline.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReIcon/src/iconifyIconOnline.ts b/sop-admin/sop-admin-frontend/src/components/ReIcon/src/iconifyIconOnline.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReIcon/src/offlineIcon.ts b/sop-admin/sop-admin-frontend/src/components/ReIcon/src/offlineIcon.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReIcon/src/types.ts b/sop-admin/sop-admin-frontend/src/components/ReIcon/src/types.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/RePerms/index.ts b/sop-admin/sop-admin-frontend/src/components/RePerms/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/RePerms/src/perms.tsx b/sop-admin/sop-admin-frontend/src/components/RePerms/src/perms.tsx old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/RePureTableBar/index.ts b/sop-admin/sop-admin-frontend/src/components/RePureTableBar/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/RePureTableBar/src/bar.tsx b/sop-admin/sop-admin-frontend/src/components/RePureTableBar/src/bar.tsx old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReSegmented/index.ts b/sop-admin/sop-admin-frontend/src/components/ReSegmented/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReSegmented/src/index.css b/sop-admin/sop-admin-frontend/src/components/ReSegmented/src/index.css old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReSegmented/src/index.tsx b/sop-admin/sop-admin-frontend/src/components/ReSegmented/src/index.tsx old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReSegmented/src/type.ts b/sop-admin/sop-admin-frontend/src/components/ReSegmented/src/type.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReText/index.ts b/sop-admin/sop-admin-frontend/src/components/ReText/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/components/ReText/src/index.vue b/sop-admin/sop-admin-frontend/src/components/ReText/src/index.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/config/index.ts b/sop-admin/sop-admin-frontend/src/config/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/directives/auth/index.ts b/sop-admin/sop-admin-frontend/src/directives/auth/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/directives/copy/index.ts b/sop-admin/sop-admin-frontend/src/directives/copy/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/directives/index.ts b/sop-admin/sop-admin-frontend/src/directives/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/directives/longpress/index.ts b/sop-admin/sop-admin-frontend/src/directives/longpress/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/directives/optimize/index.ts b/sop-admin/sop-admin-frontend/src/directives/optimize/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/directives/perms/index.ts b/sop-admin/sop-admin-frontend/src/directives/perms/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/directives/ripple/index.scss b/sop-admin/sop-admin-frontend/src/directives/ripple/index.scss old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/directives/ripple/index.ts b/sop-admin/sop-admin-frontend/src/directives/ripple/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-content/index.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-content/index.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-footer/index.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-footer/index.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-frame/index.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-frame/index.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-navbar/index.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-navbar/index.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-notice/components/NoticeItem.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-notice/components/NoticeItem.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-notice/components/NoticeList.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-notice/components/NoticeList.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-notice/data.ts b/sop-admin/sop-admin-frontend/src/layout/components/lay-notice/data.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-notice/index.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-notice/index.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-panel/index.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-panel/index.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-search/components/SearchFooter.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-search/components/SearchFooter.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-search/components/SearchHistory.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-search/components/SearchHistory.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-search/components/SearchHistoryItem.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-search/components/SearchHistoryItem.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-search/components/SearchModal.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-search/components/SearchModal.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-search/components/SearchResult.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-search/components/SearchResult.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-search/index.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-search/index.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-search/types.ts b/sop-admin/sop-admin-frontend/src/layout/components/lay-search/types.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-setting/index.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-setting/index.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-sidebar/NavHorizontal.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-sidebar/NavHorizontal.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-sidebar/NavMix.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-sidebar/NavMix.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-sidebar/NavVertical.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-sidebar/NavVertical.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-sidebar/components/SidebarBreadCrumb.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-sidebar/components/SidebarBreadCrumb.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-sidebar/components/SidebarCenterCollapse.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-sidebar/components/SidebarCenterCollapse.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-sidebar/components/SidebarExtraIcon.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-sidebar/components/SidebarExtraIcon.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-sidebar/components/SidebarFullScreen.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-sidebar/components/SidebarFullScreen.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-sidebar/components/SidebarItem.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-sidebar/components/SidebarItem.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-sidebar/components/SidebarLeftCollapse.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-sidebar/components/SidebarLeftCollapse.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-sidebar/components/SidebarLinkItem.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-sidebar/components/SidebarLinkItem.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-sidebar/components/SidebarLogo.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-sidebar/components/SidebarLogo.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-sidebar/components/SidebarTopCollapse.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-sidebar/components/SidebarTopCollapse.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-tag/components/TagChrome.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-tag/components/TagChrome.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-tag/index.scss b/sop-admin/sop-admin-frontend/src/layout/components/lay-tag/index.scss old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/components/lay-tag/index.vue b/sop-admin/sop-admin-frontend/src/layout/components/lay-tag/index.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/frame.vue b/sop-admin/sop-admin-frontend/src/layout/frame.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/hooks/useBoolean.ts b/sop-admin/sop-admin-frontend/src/layout/hooks/useBoolean.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/hooks/useDataThemeChange.ts b/sop-admin/sop-admin-frontend/src/layout/hooks/useDataThemeChange.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/hooks/useLayout.ts b/sop-admin/sop-admin-frontend/src/layout/hooks/useLayout.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/hooks/useMultiFrame.ts b/sop-admin/sop-admin-frontend/src/layout/hooks/useMultiFrame.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/hooks/useNav.ts b/sop-admin/sop-admin-frontend/src/layout/hooks/useNav.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/hooks/useTag.ts b/sop-admin/sop-admin-frontend/src/layout/hooks/useTag.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/hooks/useTranslationLang.ts b/sop-admin/sop-admin-frontend/src/layout/hooks/useTranslationLang.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/index.vue b/sop-admin/sop-admin-frontend/src/layout/index.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/redirect.vue b/sop-admin/sop-admin-frontend/src/layout/redirect.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/theme/index.ts b/sop-admin/sop-admin-frontend/src/layout/theme/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/layout/types.ts b/sop-admin/sop-admin-frontend/src/layout/types.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/main.ts b/sop-admin/sop-admin-frontend/src/main.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/model/enums/index.ts b/sop-admin/sop-admin-frontend/src/model/enums/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/model/index.ts b/sop-admin/sop-admin-frontend/src/model/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/plugins/echarts.ts b/sop-admin/sop-admin-frontend/src/plugins/echarts.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/plugins/elementPlus.ts b/sop-admin/sop-admin-frontend/src/plugins/elementPlus.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/plugins/i18n.ts b/sop-admin/sop-admin-frontend/src/plugins/i18n.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/router/enums.ts b/sop-admin/sop-admin-frontend/src/router/enums.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/router/index.ts b/sop-admin/sop-admin-frontend/src/router/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/router/modules/error.ts b/sop-admin/sop-admin-frontend/src/router/modules/error.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/router/modules/home.ts b/sop-admin/sop-admin-frontend/src/router/modules/home.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/router/modules/remaining.ts b/sop-admin/sop-admin-frontend/src/router/modules/remaining.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/router/utils.ts b/sop-admin/sop-admin-frontend/src/router/utils.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/store/index.ts b/sop-admin/sop-admin-frontend/src/store/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/store/modules/app.ts b/sop-admin/sop-admin-frontend/src/store/modules/app.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/store/modules/epTheme.ts b/sop-admin/sop-admin-frontend/src/store/modules/epTheme.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/store/modules/multiTags.ts b/sop-admin/sop-admin-frontend/src/store/modules/multiTags.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/store/modules/permission.ts b/sop-admin/sop-admin-frontend/src/store/modules/permission.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/store/modules/settings.ts b/sop-admin/sop-admin-frontend/src/store/modules/settings.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/store/modules/user.ts b/sop-admin/sop-admin-frontend/src/store/modules/user.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/store/types.ts b/sop-admin/sop-admin-frontend/src/store/types.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/store/utils.ts b/sop-admin/sop-admin-frontend/src/store/utils.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/style/dark.scss b/sop-admin/sop-admin-frontend/src/style/dark.scss old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/style/element-plus.scss b/sop-admin/sop-admin-frontend/src/style/element-plus.scss old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/style/index.scss b/sop-admin/sop-admin-frontend/src/style/index.scss old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/style/login.css b/sop-admin/sop-admin-frontend/src/style/login.css old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/style/reset.scss b/sop-admin/sop-admin-frontend/src/style/reset.scss old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/style/sidebar.scss b/sop-admin/sop-admin-frontend/src/style/sidebar.scss old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/style/tailwind.css b/sop-admin/sop-admin-frontend/src/style/tailwind.css old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/style/transition.scss b/sop-admin/sop-admin-frontend/src/style/transition.scss old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/utils/auth.ts b/sop-admin/sop-admin-frontend/src/utils/auth.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/utils/file.ts b/sop-admin/sop-admin-frontend/src/utils/file.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/utils/globalPolyfills.ts b/sop-admin/sop-admin-frontend/src/utils/globalPolyfills.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/utils/http/index.ts b/sop-admin/sop-admin-frontend/src/utils/http/index.ts old mode 100644 new mode 100755 index 21e59925..24418ce3 --- a/sop-admin/sop-admin-frontend/src/utils/http/index.ts +++ b/sop-admin/sop-admin-frontend/src/utils/http/index.ts @@ -15,6 +15,8 @@ import { getToken, formatToken } from "@/utils/auth"; import { useUserStoreHook } from "@/store/modules/user"; import { ElMessage } from "element-plus"; +const isDev = process.env.NODE_ENV === "development"; + export const baseUrl = (url: string) => { if (!url) { throw new Error("url不能为空"); @@ -22,7 +24,7 @@ export const baseUrl = (url: string) => { if (url.startsWith("/")) { url = url.substring(1); } - return `/api/${url}`; + return isDev ? `/api/${url}` : `/${url}`; }; export const createUrl = (data: object) => { diff --git a/sop-admin/sop-admin-frontend/src/utils/http/types.d.ts b/sop-admin/sop-admin-frontend/src/utils/http/types.d.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/utils/localforage/index.ts b/sop-admin/sop-admin-frontend/src/utils/localforage/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/utils/localforage/types.d.ts b/sop-admin/sop-admin-frontend/src/utils/localforage/types.d.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/utils/message.ts b/sop-admin/sop-admin-frontend/src/utils/message.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/utils/mitt.ts b/sop-admin/sop-admin-frontend/src/utils/mitt.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/utils/perm.ts b/sop-admin/sop-admin-frontend/src/utils/perm.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/utils/preventDefault.ts b/sop-admin/sop-admin-frontend/src/utils/preventDefault.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/utils/print.ts b/sop-admin/sop-admin-frontend/src/utils/print.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/utils/progress/index.ts b/sop-admin/sop-admin-frontend/src/utils/progress/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/utils/propTypes.ts b/sop-admin/sop-admin-frontend/src/utils/propTypes.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/utils/responsive.ts b/sop-admin/sop-admin-frontend/src/utils/responsive.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/utils/sso.ts b/sop-admin/sop-admin-frontend/src/utils/sso.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/utils/tree.ts b/sop-admin/sop-admin-frontend/src/utils/tree.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/doc/list/index.ts b/sop-admin/sop-admin-frontend/src/views/doc/list/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/doc/list/index.vue b/sop-admin/sop-admin-frontend/src/views/doc/list/index.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/doc/setting/index.ts b/sop-admin/sop-admin-frontend/src/views/doc/setting/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/doc/setting/index.vue b/sop-admin/sop-admin-frontend/src/views/doc/setting/index.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/error/403.vue b/sop-admin/sop-admin-frontend/src/views/error/403.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/error/404.vue b/sop-admin/sop-admin-frontend/src/views/error/404.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/error/500.vue b/sop-admin/sop-admin-frontend/src/views/error/500.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/isv/list/index.ts b/sop-admin/sop-admin-frontend/src/views/isv/list/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/isv/list/index.vue b/sop-admin/sop-admin-frontend/src/views/isv/list/index.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/isv/list/isvGroup.ts b/sop-admin/sop-admin-frontend/src/views/isv/list/isvGroup.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/isv/list/isvKeys.ts b/sop-admin/sop-admin-frontend/src/views/isv/list/isvKeys.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/isv/list/showKeys.ts b/sop-admin/sop-admin-frontend/src/views/isv/list/showKeys.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/isv/perm/permGroup.ts b/sop-admin/sop-admin-frontend/src/views/isv/perm/permGroup.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/isv/perm/permGroup.vue b/sop-admin/sop-admin-frontend/src/views/isv/perm/permGroup.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/isv/perm/permGroupApi.ts b/sop-admin/sop-admin-frontend/src/views/isv/perm/permGroupApi.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/isv/perm/permGroupApi.vue b/sop-admin/sop-admin-frontend/src/views/isv/perm/permGroupApi.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/login/index.vue b/sop-admin/sop-admin-frontend/src/views/login/index.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/login/utils/motion.ts b/sop-admin/sop-admin-frontend/src/views/login/utils/motion.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/login/utils/rule.ts b/sop-admin/sop-admin-frontend/src/views/login/utils/rule.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/login/utils/static.ts b/sop-admin/sop-admin-frontend/src/views/login/utils/static.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/serve/api/index.ts b/sop-admin/sop-admin-frontend/src/views/serve/api/index.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/serve/api/index.vue b/sop-admin/sop-admin-frontend/src/views/serve/api/index.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/dept/form.vue b/sop-admin/sop-admin-frontend/src/views/system/dept/form.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/dept/index.vue b/sop-admin/sop-admin-frontend/src/views/system/dept/index.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/dept/utils/hook.tsx b/sop-admin/sop-admin-frontend/src/views/system/dept/utils/hook.tsx old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/dept/utils/rule.ts b/sop-admin/sop-admin-frontend/src/views/system/dept/utils/rule.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/dept/utils/types.ts b/sop-admin/sop-admin-frontend/src/views/system/dept/utils/types.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/hooks.ts b/sop-admin/sop-admin-frontend/src/views/system/hooks.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/menu/README.md b/sop-admin/sop-admin-frontend/src/views/system/menu/README.md old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/menu/form.vue b/sop-admin/sop-admin-frontend/src/views/system/menu/form.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/menu/index.vue b/sop-admin/sop-admin-frontend/src/views/system/menu/index.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/menu/utils/enums.ts b/sop-admin/sop-admin-frontend/src/views/system/menu/utils/enums.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/menu/utils/hook.tsx b/sop-admin/sop-admin-frontend/src/views/system/menu/utils/hook.tsx old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/menu/utils/rule.ts b/sop-admin/sop-admin-frontend/src/views/system/menu/utils/rule.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/menu/utils/types.ts b/sop-admin/sop-admin-frontend/src/views/system/menu/utils/types.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/role/form.vue b/sop-admin/sop-admin-frontend/src/views/system/role/form.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/role/index.vue b/sop-admin/sop-admin-frontend/src/views/system/role/index.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/role/utils/hook.tsx b/sop-admin/sop-admin-frontend/src/views/system/role/utils/hook.tsx old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/role/utils/rule.ts b/sop-admin/sop-admin-frontend/src/views/system/role/utils/rule.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/role/utils/types.ts b/sop-admin/sop-admin-frontend/src/views/system/role/utils/types.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/user/form/index.vue b/sop-admin/sop-admin-frontend/src/views/system/user/form/index.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/user/form/role.vue b/sop-admin/sop-admin-frontend/src/views/system/user/form/role.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/user/index.vue b/sop-admin/sop-admin-frontend/src/views/system/user/index.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/user/svg/expand.svg b/sop-admin/sop-admin-frontend/src/views/system/user/svg/expand.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/user/svg/unexpand.svg b/sop-admin/sop-admin-frontend/src/views/system/user/svg/unexpand.svg old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/user/tree.vue b/sop-admin/sop-admin-frontend/src/views/system/user/tree.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/user/utils/hook.tsx b/sop-admin/sop-admin-frontend/src/views/system/user/utils/hook.tsx old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/user/utils/reset.css b/sop-admin/sop-admin-frontend/src/views/system/user/utils/reset.css old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/user/utils/rule.ts b/sop-admin/sop-admin-frontend/src/views/system/user/utils/rule.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/system/user/utils/types.ts b/sop-admin/sop-admin-frontend/src/views/system/user/utils/types.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/src/views/welcome/index.vue b/sop-admin/sop-admin-frontend/src/views/welcome/index.vue old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/stylelint.config.js b/sop-admin/sop-admin-frontend/stylelint.config.js old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/tailwind.config.ts b/sop-admin/sop-admin-frontend/tailwind.config.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/tsconfig.json b/sop-admin/sop-admin-frontend/tsconfig.json old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/types/directives.d.ts b/sop-admin/sop-admin-frontend/types/directives.d.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/types/global-components.d.ts b/sop-admin/sop-admin-frontend/types/global-components.d.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/types/global.d.ts b/sop-admin/sop-admin-frontend/types/global.d.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/types/index.d.ts b/sop-admin/sop-admin-frontend/types/index.d.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/types/router.d.ts b/sop-admin/sop-admin-frontend/types/router.d.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/types/shims-tsx.d.ts b/sop-admin/sop-admin-frontend/types/shims-tsx.d.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/types/shims-vue.d.ts b/sop-admin/sop-admin-frontend/types/shims-vue.d.ts old mode 100644 new mode 100755 diff --git a/sop-admin/sop-admin-frontend/vite.config.ts b/sop-admin/sop-admin-frontend/vite.config.ts old mode 100644 new mode 100755 diff --git a/sop-example/example-payment/.gitignore b/sop-example/example-payment/.gitignore old mode 100644 new mode 100755 diff --git a/sop-example/example-payment/pom.xml b/sop-example/example-payment/pom.xml old mode 100644 new mode 100755 diff --git a/sop-example/example-payment/src/main/java/com/gitee/sop/payment/ExamplePaymentApplication.java b/sop-example/example-payment/src/main/java/com/gitee/sop/payment/ExamplePaymentApplication.java old mode 100644 new mode 100755 diff --git a/sop-example/example-payment/src/main/java/com/gitee/sop/payment/impl/OpenPaymentImpl.java b/sop-example/example-payment/src/main/java/com/gitee/sop/payment/impl/OpenPaymentImpl.java old mode 100644 new mode 100755 diff --git a/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/OpenPayment.java b/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/OpenPayment.java old mode 100644 new mode 100755 diff --git a/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/req/PayOrderSearchRequest.java b/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/req/PayOrderSearchRequest.java old mode 100644 new mode 100755 diff --git a/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/req/PayTradeWapPayRequest.java b/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/req/PayTradeWapPayRequest.java old mode 100644 new mode 100755 diff --git a/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/resp/PayOrderSearchResponse.java b/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/resp/PayOrderSearchResponse.java old mode 100644 new mode 100755 diff --git a/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/resp/PayTradeWapPayResponse.java b/sop-example/example-payment/src/main/java/com/gitee/sop/payment/open/resp/PayTradeWapPayResponse.java old mode 100644 new mode 100755 diff --git a/sop-example/example-payment/src/main/resources/application-dev.properties b/sop-example/example-payment/src/main/resources/application-dev.properties old mode 100644 new mode 100755 diff --git a/sop-example/example-payment/src/main/resources/application-test.properties b/sop-example/example-payment/src/main/resources/application-test.properties old mode 100644 new mode 100755 diff --git a/sop-example/example-payment/src/main/resources/application.properties b/sop-example/example-payment/src/main/resources/application.properties old mode 100644 new mode 100755 diff --git a/sop-example/example-payment/src/main/resources/doc.json b/sop-example/example-payment/src/main/resources/doc.json old mode 100644 new mode 100755 diff --git a/sop-example/example-payment/src/main/resources/i18n/isp/bizerror_en.properties b/sop-example/example-payment/src/main/resources/i18n/isp/bizerror_en.properties old mode 100644 new mode 100755 diff --git a/sop-example/example-payment/src/main/resources/i18n/isp/bizerror_zh_CN.properties b/sop-example/example-payment/src/main/resources/i18n/isp/bizerror_zh_CN.properties old mode 100644 new mode 100755 diff --git a/sop-example/example-payment/src/main/resources/i18n/isp/goods_error_en.properties b/sop-example/example-payment/src/main/resources/i18n/isp/goods_error_en.properties old mode 100644 new mode 100755 diff --git a/sop-example/example-payment/src/main/resources/i18n/isp/goods_error_zh_CN.properties b/sop-example/example-payment/src/main/resources/i18n/isp/goods_error_zh_CN.properties old mode 100644 new mode 100755 diff --git a/sop-example/example-payment/src/test/java/com/gitee/sop/payment/DocPushTest.java b/sop-example/example-payment/src/test/java/com/gitee/sop/payment/DocPushTest.java old mode 100644 new mode 100755 diff --git a/sop-example/example-story/.gitignore b/sop-example/example-story/.gitignore old mode 100644 new mode 100755 diff --git a/sop-example/example-story/pom.xml b/sop-example/example-story/pom.xml old mode 100644 new mode 100755 diff --git a/sop-example/example-story/src/main/java/com/gitee/sop/storyweb/ExampleStoryApplication.java b/sop-example/example-story/src/main/java/com/gitee/sop/storyweb/ExampleStoryApplication.java old mode 100644 new mode 100755 diff --git a/sop-example/example-story/src/main/java/com/gitee/sop/storyweb/impl/OpenStoryImpl.java b/sop-example/example-story/src/main/java/com/gitee/sop/storyweb/impl/OpenStoryImpl.java old mode 100644 new mode 100755 diff --git a/sop-example/example-story/src/main/java/com/gitee/sop/storyweb/message/StoryMessageEnum.java b/sop-example/example-story/src/main/java/com/gitee/sop/storyweb/message/StoryMessageEnum.java old mode 100644 new mode 100755 diff --git a/sop-example/example-story/src/main/java/com/gitee/sop/storyweb/open/OpenStory.java b/sop-example/example-story/src/main/java/com/gitee/sop/storyweb/open/OpenStory.java old mode 100644 new mode 100755 diff --git a/sop-example/example-story/src/main/java/com/gitee/sop/storyweb/open/req/StorySaveRequest.java b/sop-example/example-story/src/main/java/com/gitee/sop/storyweb/open/req/StorySaveRequest.java old mode 100644 new mode 100755 diff --git a/sop-example/example-story/src/main/java/com/gitee/sop/storyweb/open/resp/StoryResponse.java b/sop-example/example-story/src/main/java/com/gitee/sop/storyweb/open/resp/StoryResponse.java old mode 100644 new mode 100755 diff --git a/sop-example/example-story/src/main/resources/application-dev.properties b/sop-example/example-story/src/main/resources/application-dev.properties old mode 100644 new mode 100755 diff --git a/sop-example/example-story/src/main/resources/application-test.properties b/sop-example/example-story/src/main/resources/application-test.properties old mode 100644 new mode 100755 diff --git a/sop-example/example-story/src/main/resources/application.properties b/sop-example/example-story/src/main/resources/application.properties old mode 100644 new mode 100755 diff --git a/sop-example/example-story/src/main/resources/doc.json b/sop-example/example-story/src/main/resources/doc.json old mode 100644 new mode 100755 diff --git a/sop-example/example-story/src/main/resources/download.txt b/sop-example/example-story/src/main/resources/download.txt old mode 100644 new mode 100755 diff --git a/sop-example/example-story/src/main/resources/i18n/bizerror_en.properties b/sop-example/example-story/src/main/resources/i18n/bizerror_en.properties old mode 100644 new mode 100755 diff --git a/sop-example/example-story/src/main/resources/i18n/bizerror_zh_CN.properties b/sop-example/example-story/src/main/resources/i18n/bizerror_zh_CN.properties old mode 100644 new mode 100755 diff --git a/sop-example/example-story/src/test/java/com/gitee/sop/storyweb/DocPushTest.java b/sop-example/example-story/src/test/java/com/gitee/sop/storyweb/DocPushTest.java old mode 100644 new mode 100755 diff --git a/sop-example/pom.xml b/sop-example/pom.xml old mode 100644 new mode 100755 diff --git a/sop-example/readme.md b/sop-example/readme.md old mode 100644 new mode 100755 diff --git a/sop-gateway/pom.xml b/sop-gateway/pom.xml old mode 100644 new mode 100755 index 149369d6..31a9941e --- a/sop-gateway/pom.xml +++ b/sop-gateway/pom.xml @@ -88,11 +88,6 @@ jackson-dataformat-xml - - org.springframework.boot - spring-boot-starter-data-redis - - diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/SopGatewayApplication.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/SopGatewayApplication.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/common/ApiInfoDTO.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/common/ApiInfoDTO.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/common/CacheKey.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/common/CacheKey.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/common/ParamInfoDTO.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/common/ParamInfoDTO.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/common/RouteContext.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/common/RouteContext.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/common/SopConstants.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/common/SopConstants.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/common/enums/StatusEnum.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/common/enums/StatusEnum.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/common/enums/YesOrNoEnum.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/common/enums/YesOrNoEnum.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/config/ApiConfig.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/config/ApiConfig.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/config/CustomConfig.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/config/CustomConfig.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/config/GatewayConfig.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/config/GatewayConfig.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/controller/IndexController.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/controller/IndexController.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/entity/ApiInfo.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/entity/ApiInfo.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/entity/IsvInfo.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/entity/IsvInfo.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/entity/IsvKeys.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/entity/IsvKeys.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/entity/PermGroupPermission.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/entity/PermGroupPermission.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/entity/PermIsvGroup.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/entity/PermIsvGroup.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/mapper/ApiInfoMapper.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/mapper/ApiInfoMapper.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/mapper/IsvInfoMapper.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/mapper/IsvInfoMapper.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/mapper/IsvKeysMapper.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/mapper/IsvKeysMapper.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/mapper/PermGroupPermissionMapper.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/mapper/PermGroupPermissionMapper.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/mapper/PermIsvGroupMapper.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/dao/mapper/PermIsvGroupMapper.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/exception/ApiException.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/exception/ApiException.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/exception/ControllerGlobalExceptionHandler.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/exception/ControllerGlobalExceptionHandler.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/exception/ExceptionExecutor.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/exception/ExceptionExecutor.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/exception/SignException.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/exception/SignException.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/exception/impl/ExceptionExecutorImpl.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/exception/impl/ExceptionExecutorImpl.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/interceptor/RouteInterceptor.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/interceptor/RouteInterceptor.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/interceptor/RouteInterceptorOrders.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/interceptor/RouteInterceptorOrders.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/interceptor/internal/ResultRouteInterceptor.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/interceptor/internal/ResultRouteInterceptor.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/message/CodeEnum.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/message/CodeEnum.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/message/ErrorEnum.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/message/ErrorEnum.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/message/ErrorImpl.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/message/ErrorImpl.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/message/IError.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/message/IError.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/request/ApiRequest.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/request/ApiRequest.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/request/ApiRequestContext.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/request/ApiRequestContext.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/request/ApiRequestContextFactory.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/request/ApiRequestContextFactory.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/request/ApiUploadContext.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/request/ApiUploadContext.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/request/RequestFormatEnum.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/request/RequestFormatEnum.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/request/UploadContext.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/request/UploadContext.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/response/ApiResponse.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/response/ApiResponse.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/response/NoCommonResponse.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/response/NoCommonResponse.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/response/Response.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/response/Response.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/GenericServiceInvoker.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/GenericServiceInvoker.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/ParamExecutor.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/ParamExecutor.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/ResultWrapper.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/ResultWrapper.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/RouteService.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/RouteService.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/Serde.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/Serde.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/dubbo/ApiRegisterServiceImpl.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/dubbo/ApiRegisterServiceImpl.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/dubbo/RefreshServiceImpl.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/dubbo/RefreshServiceImpl.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/impl/ParamExecutorImpl.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/impl/ParamExecutorImpl.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/impl/ResultWrapperImpl.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/impl/ResultWrapperImpl.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/impl/RouteServiceImpl.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/impl/RouteServiceImpl.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/impl/SerdeGsonImpl.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/impl/SerdeGsonImpl.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/impl/SerdeImpl.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/impl/SerdeImpl.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/ApiManager.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/ApiManager.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/CacheManager.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/CacheManager.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/IpBlacklistManager.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/IpBlacklistManager.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/IsvApiPermissionManager.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/IsvApiPermissionManager.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/IsvManager.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/IsvManager.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/Manager.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/Manager.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/SecretManager.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/SecretManager.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/dto/IsvDTO.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/dto/IsvDTO.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/IpBlacklistManagerImpl.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/IpBlacklistManagerImpl.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/LocalApiManagerImpl.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/LocalApiManagerImpl.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/LocalIsvApiPermissionManagerImpl.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/LocalIsvApiPermissionManagerImpl.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/LocalIsvManagerImpl.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/LocalIsvManagerImpl.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/LocalSecretManagerImpl.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/LocalSecretManagerImpl.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/RedisApiManagerImpl.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/RedisApiManagerImpl.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/RedisIsvApiPermissionManagerImpl.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/RedisIsvApiPermissionManagerImpl.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/RedisIsvManagerImpl.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/RedisIsvManagerImpl.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/RedisSecretManager.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/manager/impl/RedisSecretManager.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/AbstractSigner.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/AbstractSigner.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/ApiEncrypter.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/ApiEncrypter.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/ApiValidator.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/ApiValidator.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/Encrypter.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/Encrypter.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/SignConfig.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/SignConfig.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/SignEncipher.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/SignEncipher.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/SignEncipherMD5.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/SignEncipherMD5.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/Signer.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/Signer.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/Validator.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/Validator.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/sign/PlatformSigner.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/sign/PlatformSigner.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/sign/SignUtil.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/service/validate/sign/SignUtil.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/util/AESUtil.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/util/AESUtil.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/util/ClassUtil.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/util/ClassUtil.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/util/CopyUtil.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/util/CopyUtil.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/util/DateUtil.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/util/DateUtil.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/util/FieldUtil.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/util/FieldUtil.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/util/JsonUtil.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/util/JsonUtil.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/util/KeyStore.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/util/KeyStore.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/util/RSANewUtil.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/util/RSANewUtil.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/util/RSAUtil.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/util/RSAUtil.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/util/RequestUtil.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/util/RequestUtil.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/util/ResponseUtil.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/util/ResponseUtil.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/util/XmlUtil.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/util/XmlUtil.java old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/resources/application-dev.properties b/sop-gateway/src/main/resources/application-dev.properties old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/resources/application-test.properties b/sop-gateway/src/main/resources/application-test.properties old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/resources/application.properties b/sop-gateway/src/main/resources/application.properties old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/resources/i18n/open/code_en.properties b/sop-gateway/src/main/resources/i18n/open/code_en.properties old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/resources/i18n/open/code_zh_CN.properties b/sop-gateway/src/main/resources/i18n/open/code_zh_CN.properties old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/resources/i18n/open/error_en.properties b/sop-gateway/src/main/resources/i18n/open/error_en.properties old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/resources/i18n/open/error_zh_CN.properties b/sop-gateway/src/main/resources/i18n/open/error_zh_CN.properties old mode 100644 new mode 100755 diff --git a/sop-gateway/src/main/resources/mybatis/mybatisConfig.xml b/sop-gateway/src/main/resources/mybatis/mybatisConfig.xml old mode 100644 new mode 100755 diff --git a/sop-registry/pom.xml b/sop-registry/pom.xml old mode 100644 new mode 100755 diff --git a/sop-registry/readme.md b/sop-registry/readme.md old mode 100644 new mode 100755 diff --git a/sop-registry/src/main/java/com/gitee/sop/registry/EmbeddedZooKeeper.java b/sop-registry/src/main/java/com/gitee/sop/registry/EmbeddedZooKeeper.java old mode 100644 new mode 100755 diff --git a/sop-registry/src/main/java/com/gitee/sop/registry/RegistryMain.java b/sop-registry/src/main/java/com/gitee/sop/registry/RegistryMain.java old mode 100644 new mode 100755 diff --git a/sop-sdk/pom.xml b/sop-sdk/pom.xml old mode 100644 new mode 100755 diff --git a/sop-sdk/readme.md b/sop-sdk/readme.md old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-c++/.gitignore b/sop-sdk/sdk-c++/.gitignore old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-c++/CMakeLists.txt b/sop-sdk/sdk-c++/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-c++/aa.txt b/sop-sdk/sdk-c++/aa.txt old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-c++/bb.txt b/sop-sdk/sdk-c++/bb.txt old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-c++/common/OpenClient.cpp b/sop-sdk/sdk-c++/common/OpenClient.cpp old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-c++/common/OpenClient.h b/sop-sdk/sdk-c++/common/OpenClient.h old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-c++/common/RSASign.cpp b/sop-sdk/sdk-c++/common/RSASign.cpp old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-c++/common/RSASign.h b/sop-sdk/sdk-c++/common/RSASign.h old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-c++/common/RequestType.h b/sop-sdk/sdk-c++/common/RequestType.h old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-c++/common/httplib.h b/sop-sdk/sdk-c++/common/httplib.h old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-c++/common/sha256.cpp b/sop-sdk/sdk-c++/common/sha256.cpp old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-c++/common/sha256.hpp b/sop-sdk/sdk-c++/common/sha256.hpp old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-c++/common/sign.cpp b/sop-sdk/sdk-c++/common/sign.cpp old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-c++/common/sign.h b/sop-sdk/sdk-c++/common/sign.h old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-c++/common/stdafx.cpp b/sop-sdk/sdk-c++/common/stdafx.cpp old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-c++/common/stdafx.h b/sop-sdk/sdk-c++/common/stdafx.h old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-c++/common/targetver.h b/sop-sdk/sdk-c++/common/targetver.h old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-c++/common/tool.cpp b/sop-sdk/sdk-c++/common/tool.cpp old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-c++/common/tool.h b/sop-sdk/sdk-c++/common/tool.h old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-c++/main.cpp b/sop-sdk/sdk-c++/main.cpp old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-c++/privateEx.pem b/sop-sdk/sdk-c++/privateEx.pem old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-c++/readme.md b/sop-sdk/sdk-c++/readme.md old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-c++/request/BaseRequest.cpp b/sop-sdk/sdk-c++/request/BaseRequest.cpp old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-c++/request/BaseRequest.h b/sop-sdk/sdk-c++/request/BaseRequest.h old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-c++/request/MemberInfoGetRequest.hpp b/sop-sdk/sdk-c++/request/MemberInfoGetRequest.hpp old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-c++/thirdparty/base64/base64.cpp b/sop-sdk/sdk-c++/thirdparty/base64/base64.cpp old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/.gitignore b/sop-sdk/sdk-csharp/.gitignore old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp.sln b/sop-sdk/sdk-csharp/SDKCSharp.sln old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Client/OpenClient.cs b/sop-sdk/sdk-csharp/SDKCSharp/Client/OpenClient.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Client/OpenHttp.cs b/sop-sdk/sdk-csharp/SDKCSharp/Client/OpenHttp.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Client/OpenRequest.cs b/sop-sdk/sdk-csharp/SDKCSharp/Client/OpenRequest.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Common/CustomDataNameBuilder.cs b/sop-sdk/sdk-csharp/SDKCSharp/Common/CustomDataNameBuilder.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Common/DataNameBuilder.cs b/sop-sdk/sdk-csharp/SDKCSharp/Common/DataNameBuilder.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Common/DefaultDataNameBuilder.cs b/sop-sdk/sdk-csharp/SDKCSharp/Common/DefaultDataNameBuilder.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Common/ErrorResponse.cs b/sop-sdk/sdk-csharp/SDKCSharp/Common/ErrorResponse.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Common/IgnoreSign.cs b/sop-sdk/sdk-csharp/SDKCSharp/Common/IgnoreSign.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Common/OpenConfig.cs b/sop-sdk/sdk-csharp/SDKCSharp/Common/OpenConfig.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Common/RequestForm.cs b/sop-sdk/sdk-csharp/SDKCSharp/Common/RequestForm.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Common/RequestMethod.cs b/sop-sdk/sdk-csharp/SDKCSharp/Common/RequestMethod.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Common/Result.cs b/sop-sdk/sdk-csharp/SDKCSharp/Common/Result.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Common/SdkConfig.cs b/sop-sdk/sdk-csharp/SDKCSharp/Common/SdkConfig.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Common/SopSdkConstants.cs b/sop-sdk/sdk-csharp/SDKCSharp/Common/SopSdkConstants.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Common/SopSdkErrors.cs b/sop-sdk/sdk-csharp/SDKCSharp/Common/SopSdkErrors.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Common/UploadFile.cs b/sop-sdk/sdk-csharp/SDKCSharp/Common/UploadFile.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Model/DemoFileUploadModel.cs b/sop-sdk/sdk-csharp/SDKCSharp/Model/DemoFileUploadModel.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Model/GetStoryModel.cs b/sop-sdk/sdk-csharp/SDKCSharp/Model/GetStoryModel.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Program.cs b/sop-sdk/sdk-csharp/SDKCSharp/Program.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Request/BaseRequest.cs b/sop-sdk/sdk-csharp/SDKCSharp/Request/BaseRequest.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Request/CommonRequest.cs b/sop-sdk/sdk-csharp/SDKCSharp/Request/CommonRequest.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Request/DemoFileUploadRequest.cs b/sop-sdk/sdk-csharp/SDKCSharp/Request/DemoFileUploadRequest.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Request/GetStoryRequest.cs b/sop-sdk/sdk-csharp/SDKCSharp/Request/GetStoryRequest.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Response/BaseResponse.cs b/sop-sdk/sdk-csharp/SDKCSharp/Response/BaseResponse.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Response/CommonResponse.cs b/sop-sdk/sdk-csharp/SDKCSharp/Response/CommonResponse.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Response/DemoFileUploadResponse.cs b/sop-sdk/sdk-csharp/SDKCSharp/Response/DemoFileUploadResponse.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Response/GetStoryResponse.cs b/sop-sdk/sdk-csharp/SDKCSharp/Response/GetStoryResponse.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/SDKCSharp.csproj b/sop-sdk/sdk-csharp/SDKCSharp/SDKCSharp.csproj old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Utility/AESUtil.cs b/sop-sdk/sdk-csharp/SDKCSharp/Utility/AESUtil.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Utility/ClassUtil.cs b/sop-sdk/sdk-csharp/SDKCSharp/Utility/ClassUtil.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Utility/FileUtil.cs b/sop-sdk/sdk-csharp/SDKCSharp/Utility/FileUtil.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Utility/JsonUtil.cs b/sop-sdk/sdk-csharp/SDKCSharp/Utility/JsonUtil.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Utility/MD5Util.cs b/sop-sdk/sdk-csharp/SDKCSharp/Utility/MD5Util.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Utility/RSAHelper.cs b/sop-sdk/sdk-csharp/SDKCSharp/Utility/RSAHelper.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Utility/SignType.cs b/sop-sdk/sdk-csharp/SDKCSharp/Utility/SignType.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/Utility/SignUtil.cs b/sop-sdk/sdk-csharp/SDKCSharp/Utility/SignUtil.cs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/file1.txt b/sop-sdk/sdk-csharp/SDKCSharp/file1.txt old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/SDKCSharp/file2.txt b/sop-sdk/sdk-csharp/SDKCSharp/file2.txt old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-csharp/readme.md b/sop-sdk/sdk-csharp/readme.md old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-go/common/HttpTool.go b/sop-sdk/sdk-go/common/HttpTool.go old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-go/common/IRequest.go b/sop-sdk/sdk-go/common/IRequest.go old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-go/common/OpenClient.go b/sop-sdk/sdk-go/common/OpenClient.go old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-go/common/SignUtil.go b/sop-sdk/sdk-go/common/SignUtil.go old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-go/common/StringUtil.go b/sop-sdk/sdk-go/common/StringUtil.go old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-go/model/MemberInfoGetModel.go b/sop-sdk/sdk-go/model/MemberInfoGetModel.go old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-go/readme.md b/sop-sdk/sdk-go/readme.md old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-go/request/MemberInfoGetRequest.go b/sop-sdk/sdk-go/request/MemberInfoGetRequest.go old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-go/response/BaseResponse.go b/sop-sdk/sdk-go/response/BaseResponse.go old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-go/response/MemberInfoGetResponse.go b/sop-sdk/sdk-go/response/MemberInfoGetResponse.go old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-go/test/aa.txt b/sop-sdk/sdk-go/test/aa.txt old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-go/test/bb.txt b/sop-sdk/sdk-go/test/bb.txt old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-go/test/test.go b/sop-sdk/sdk-go/test/test.go old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/.gitignore b/sop-sdk/sdk-java/.gitignore old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/pom.xml b/sop-sdk/sdk-java/pom.xml old mode 100644 new mode 100755 index e55d08d6..2d6e7b13 --- a/sop-sdk/sdk-java/pom.xml +++ b/sop-sdk/sdk-java/pom.xml @@ -56,6 +56,7 @@ org.apache.maven.plugins maven-surefire-plugin + 3.2.5 true @@ -63,6 +64,7 @@ org.apache.maven.plugins maven-compiler-plugin + 3.13.0 ${java.version} ${java.version} diff --git a/sop-sdk/sdk-java/readme.md b/sop-sdk/sdk-java/readme.md old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/client/OpenClient.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/client/OpenClient.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/client/OpenHttp.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/client/OpenHttp.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/client/OpenRequest.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/client/OpenRequest.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/common/CustomDataNameBuilder.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/common/CustomDataNameBuilder.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/common/DataNameBuilder.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/common/DataNameBuilder.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/common/DefaultDataNameBuilder.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/common/DefaultDataNameBuilder.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/common/OpenConfig.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/common/OpenConfig.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/common/RequestForm.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/common/RequestForm.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/common/RequestMethod.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/common/RequestMethod.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/common/Result.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/common/Result.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/common/SopSdkConstants.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/common/SopSdkConstants.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/common/SopSdkErrors.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/common/SopSdkErrors.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/common/UploadFile.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/common/UploadFile.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/entity/Goods.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/entity/Goods.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/exception/SdkException.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/exception/SdkException.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/model/DemoFileUploadModel.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/model/DemoFileUploadModel.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/model/GetStoryModel.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/model/GetStoryModel.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/model/OpenAuthTokenAppModel.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/model/OpenAuthTokenAppModel.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/request/BaseRequest.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/request/BaseRequest.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/request/DemoFileUploadRequest.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/request/DemoFileUploadRequest.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/request/GetStoryRequest.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/request/GetStoryRequest.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/request/OpenAuthTokenAppRequest.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/request/OpenAuthTokenAppRequest.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/request/PayTradeWapPayModel.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/request/PayTradeWapPayModel.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/request/PayTradeWapPayRequest.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/request/PayTradeWapPayRequest.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/response/DemoFileUploadResponse.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/response/DemoFileUploadResponse.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/response/GetStoryResponse.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/response/GetStoryResponse.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/response/OpenAuthTokenAppResponse.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/response/OpenAuthTokenAppResponse.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/response/PayTradeWapPayResponse.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/response/PayTradeWapPayResponse.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/sign/SignUtil.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/sign/SignUtil.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/sign/SopSignException.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/sign/SopSignException.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/sign/StreamUtil.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/sign/StreamUtil.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/sign/StringUtils.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/sign/StringUtils.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/util/Base64Util.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/util/Base64Util.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/util/BaseNCodec.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/util/BaseNCodec.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/util/ClassUtil.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/util/ClassUtil.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/util/FileUtil.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/util/FileUtil.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/util/HexUtil.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/util/HexUtil.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/util/MD5Util.java b/sop-sdk/sdk-java/src/main/java/com/gitee/sop/sdk/util/MD5Util.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/resources/file1.txt b/sop-sdk/sdk-java/src/main/resources/file1.txt old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/main/resources/file2.txt b/sop-sdk/sdk-java/src/main/resources/file2.txt old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/test/java/com/gitee/sop/sdk/BaseTest.java b/sop-sdk/sdk-java/src/test/java/com/gitee/sop/sdk/BaseTest.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-java/src/test/java/com/gitee/sop/sdk/SdkTest.java b/sop-sdk/sdk-java/src/test/java/com/gitee/sop/sdk/SdkTest.java old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-nodejs/.gitignore b/sop-sdk/sdk-nodejs/.gitignore old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-nodejs/common/BaseRequest.js b/sop-sdk/sdk-nodejs/common/BaseRequest.js old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-nodejs/common/OpenClient.js b/sop-sdk/sdk-nodejs/common/OpenClient.js old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-nodejs/common/RequestType.js b/sop-sdk/sdk-nodejs/common/RequestType.js old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-nodejs/common/SignUtil.js b/sop-sdk/sdk-nodejs/common/SignUtil.js old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-nodejs/main.js b/sop-sdk/sdk-nodejs/main.js old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-nodejs/package.json b/sop-sdk/sdk-nodejs/package.json old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-nodejs/readme.md b/sop-sdk/sdk-nodejs/readme.md old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-nodejs/request/StoryGetRequest.js b/sop-sdk/sdk-nodejs/request/StoryGetRequest.js old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-python/.gitignore b/sop-sdk/sdk-python/.gitignore old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-python/common/JsonUtil.py b/sop-sdk/sdk-python/common/JsonUtil.py old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-python/common/OpenClient.py b/sop-sdk/sdk-python/common/OpenClient.py old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-python/common/RequestType.py b/sop-sdk/sdk-python/common/RequestType.py old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-python/common/RequestTypes.py b/sop-sdk/sdk-python/common/RequestTypes.py old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-python/common/SignUtil.py b/sop-sdk/sdk-python/common/SignUtil.py old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-python/common/__init__.py b/sop-sdk/sdk-python/common/__init__.py old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-python/model/MemberInfoGetModel.py b/sop-sdk/sdk-python/model/MemberInfoGetModel.py old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-python/model/__init__.py b/sop-sdk/sdk-python/model/__init__.py old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-python/readme.md b/sop-sdk/sdk-python/readme.md old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-python/request/BaseRequest.py b/sop-sdk/sdk-python/request/BaseRequest.py old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-python/request/MemberInfoGetRequest.py b/sop-sdk/sdk-python/request/MemberInfoGetRequest.py old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-python/request/__init__.py b/sop-sdk/sdk-python/request/__init__.py old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-python/response/BaseResponse.py b/sop-sdk/sdk-python/response/BaseResponse.py old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-python/response/__init__.py b/sop-sdk/sdk-python/response/__init__.py old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-python/test/__init__.py b/sop-sdk/sdk-python/test/__init__.py old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-python/test/aa.txt b/sop-sdk/sdk-python/test/aa.txt old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-python/test/bb.txt b/sop-sdk/sdk-python/test/bb.txt old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-python/test/test.py b/sop-sdk/sdk-python/test/test.py old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-rust/readme.md b/sop-sdk/sdk-rust/readme.md old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-rust/sdk-test/.gitignore b/sop-sdk/sdk-rust/sdk-test/.gitignore old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-rust/sdk-test/Cargo.lock b/sop-sdk/sdk-rust/sdk-test/Cargo.lock old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-rust/sdk-test/Cargo.toml b/sop-sdk/sdk-rust/sdk-test/Cargo.toml old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-rust/sdk-test/aa.txt b/sop-sdk/sdk-rust/sdk-test/aa.txt old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-rust/sdk-test/bb.txt b/sop-sdk/sdk-rust/sdk-test/bb.txt old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-rust/sdk-test/src/main.rs b/sop-sdk/sdk-rust/sdk-test/src/main.rs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-rust/sdk/.gitignore b/sop-sdk/sdk-rust/sdk/.gitignore old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-rust/sdk/Cargo.lock b/sop-sdk/sdk-rust/sdk/Cargo.lock old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-rust/sdk/Cargo.toml b/sop-sdk/sdk-rust/sdk/Cargo.toml old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-rust/sdk/src/client.rs b/sop-sdk/sdk-rust/sdk/src/client.rs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-rust/sdk/src/http.rs b/sop-sdk/sdk-rust/sdk/src/http.rs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-rust/sdk/src/lib.rs b/sop-sdk/sdk-rust/sdk/src/lib.rs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-rust/sdk/src/request/memberinfoget.rs b/sop-sdk/sdk-rust/sdk/src/request/memberinfoget.rs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-rust/sdk/src/request/mod.rs b/sop-sdk/sdk-rust/sdk/src/request/mod.rs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-rust/sdk/src/response/memberinfoget.rs b/sop-sdk/sdk-rust/sdk/src/response/memberinfoget.rs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-rust/sdk/src/response/mod.rs b/sop-sdk/sdk-rust/sdk/src/response/mod.rs old mode 100644 new mode 100755 diff --git a/sop-sdk/sdk-rust/sdk/src/sign.rs b/sop-sdk/sdk-rust/sdk/src/sign.rs old mode 100644 new mode 100755 diff --git a/sop-support/pom.xml b/sop-support/pom.xml old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/changelog.md b/sop-support/sop-doc-plugin/changelog.md old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/pom.xml b/sop-support/sop-doc-plugin/pom.xml old mode 100644 new mode 100755 index efe4dfcd..f691866c --- a/sop-support/sop-doc-plugin/pom.xml +++ b/sop-support/sop-doc-plugin/pom.xml @@ -99,6 +99,7 @@ org.apache.maven.plugins maven-compiler-plugin + 3.13.0 ${java.version} ${java.version} diff --git a/sop-support/sop-doc-plugin/readme.md b/sop-support/sop-doc-plugin/readme.md old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/SwaggerPlugin.java b/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/SwaggerPlugin.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/SwaggerPluginService.java b/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/SwaggerPluginService.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/bean/ApiModelPropertyWrapper.java b/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/bean/ApiModelPropertyWrapper.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/bean/ApiParamInfo.java b/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/bean/ApiParamInfo.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/bean/ApiParamWrapper.java b/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/bean/ApiParamWrapper.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/bean/Booleans.java b/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/bean/Booleans.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/bean/CodeInfo.java b/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/bean/CodeInfo.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/bean/CodeItem.java b/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/bean/CodeItem.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/bean/ControllerInfo.java b/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/bean/ControllerInfo.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/bean/DocParamInfo.java b/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/bean/DocParamInfo.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/bean/ModeEnum.java b/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/bean/ModeEnum.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/bean/PluginConstants.java b/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/bean/PluginConstants.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/bean/PushFeature.java b/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/bean/PushFeature.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/bean/TornaConfig.java b/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/bean/TornaConfig.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/builder/ApiDocBuilder.java b/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/builder/ApiDocBuilder.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/builder/DataType.java b/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/builder/DataType.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/builder/FieldDocInfo.java b/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/builder/FieldDocInfo.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/builder/HttpMethodInfoBuilder.java b/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/builder/HttpMethodInfoBuilder.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/builder/MvcRequestInfoBuilder.java b/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/builder/MvcRequestInfoBuilder.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/builder/RequestInfoBuilder.java b/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/builder/RequestInfoBuilder.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/exception/HiddenException.java b/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/exception/HiddenException.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/exception/IgnoreException.java b/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/exception/IgnoreException.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/scaner/ClassScanner.java b/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/scaner/ClassScanner.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/util/ClassUtil.java b/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/util/ClassUtil.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/util/PluginUtil.java b/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/util/PluginUtil.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/util/StringUtil.java b/sop-support/sop-doc-plugin/src/main/java/cn/torna/swaggerplugin/util/StringUtil.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/test/java/cn/torna/swaggerplugin/ClassTest.java b/sop-support/sop-doc-plugin/src/test/java/cn/torna/swaggerplugin/ClassTest.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/test/java/cn/torna/swaggerplugin/EnumTest.java b/sop-support/sop-doc-plugin/src/test/java/cn/torna/swaggerplugin/EnumTest.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/test/java/cn/torna/swaggerplugin/GenericParadigmUtilTest.java b/sop-support/sop-doc-plugin/src/test/java/cn/torna/swaggerplugin/GenericParadigmUtilTest.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/test/java/cn/torna/swaggerplugin/SwaggerPluginServiceTest.java b/sop-support/sop-doc-plugin/src/test/java/cn/torna/swaggerplugin/SwaggerPluginServiceTest.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/test/java/cn/torna/swaggerplugin/pkg1/UserInterface.java b/sop-support/sop-doc-plugin/src/test/java/cn/torna/swaggerplugin/pkg1/UserInterface.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/test/java/cn/torna/swaggerplugin/pkg1/pkg2/OrderInterface.java b/sop-support/sop-doc-plugin/src/test/java/cn/torna/swaggerplugin/pkg1/pkg2/OrderInterface.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-doc-plugin/src/test/java/cn/torna/swaggerplugin/pkg1/pkg3/AddressInterface.java b/sop-support/sop-doc-plugin/src/test/java/cn/torna/swaggerplugin/pkg1/pkg3/AddressInterface.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-service-support/pom.xml b/sop-support/sop-service-support/pom.xml old mode 100644 new mode 100755 index 523e570e..39a554a5 --- a/sop-support/sop-service-support/pom.xml +++ b/sop-support/sop-service-support/pom.xml @@ -51,7 +51,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.3 + 3.6.2 ${java.version} ${java.version} diff --git a/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/annotation/Open.java b/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/annotation/Open.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/context/DefaultOpenContext.java b/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/context/DefaultOpenContext.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/context/OpenContext.java b/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/context/OpenContext.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/dto/CommonFileData.java b/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/dto/CommonFileData.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/dto/FileData.java b/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/dto/FileData.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/dto/NotifyInfo.java b/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/dto/NotifyInfo.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/exception/OpenException.java b/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/exception/OpenException.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/message/DefaultOpenMessage.java b/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/message/DefaultOpenMessage.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/message/I18nMessage.java b/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/message/I18nMessage.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/message/OpenMessage.java b/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/message/OpenMessage.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/message/OpenMessageFactory.java b/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/message/OpenMessageFactory.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/register/ApiRegister.java b/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/register/ApiRegister.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/register/RegisterCallback.java b/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/register/RegisterCallback.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/service/ApiRegisterService.java b/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/service/ApiRegisterService.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/service/RefreshService.java b/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/service/RefreshService.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/service/dto/RegisterDTO.java b/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/service/dto/RegisterDTO.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/service/dto/RegisterResult.java b/sop-support/sop-service-support/src/main/java/com/gitee/sop/support/service/dto/RegisterResult.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-service-support/src/main/resources/security/serialize.allowlist b/sop-support/sop-service-support/src/main/resources/security/serialize.allowlist old mode 100644 new mode 100755 diff --git a/sop-support/sop-service-support/src/test/java/com/gitee/sop/support/FindTest.java b/sop-support/sop-service-support/src/test/java/com/gitee/sop/support/FindTest.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-spring-boot-starter/pom.xml b/sop-support/sop-spring-boot-starter/pom.xml old mode 100644 new mode 100755 diff --git a/sop-support/sop-spring-boot-starter/src/main/java/com/gitee/sop/support/springboot/config/SopAutoConfiguration.java b/sop-support/sop-spring-boot-starter/src/main/java/com/gitee/sop/support/springboot/config/SopAutoConfiguration.java old mode 100644 new mode 100755 diff --git a/sop-support/sop-spring-boot-starter/src/main/resources/META-INF/spring.factories b/sop-support/sop-spring-boot-starter/src/main/resources/META-INF/spring.factories old mode 100644 new mode 100755 diff --git a/sop-support/sop-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sop-support/sop-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports old mode 100644 new mode 100755 diff --git a/sop-test/.gitignore b/sop-test/.gitignore old mode 100644 new mode 100755 diff --git a/sop-test/pom.xml b/sop-test/pom.xml old mode 100644 new mode 100755 diff --git a/sop-test/readme.md b/sop-test/readme.md old mode 100644 new mode 100755 diff --git a/sop-test/src/main/java/com/gitee/sop/test/Client.java b/sop-test/src/main/java/com/gitee/sop/test/Client.java old mode 100644 new mode 100755 diff --git a/sop-test/src/main/java/com/gitee/sop/test/HttpTool.java b/sop-test/src/main/java/com/gitee/sop/test/HttpTool.java old mode 100644 new mode 100755 diff --git a/sop-test/src/main/java/com/gitee/sop/test/sign/AlipayApiException.java b/sop-test/src/main/java/com/gitee/sop/test/sign/AlipayApiException.java old mode 100644 new mode 100755 diff --git a/sop-test/src/main/java/com/gitee/sop/test/sign/AlipayConstants.java b/sop-test/src/main/java/com/gitee/sop/test/sign/AlipayConstants.java old mode 100644 new mode 100755 diff --git a/sop-test/src/main/java/com/gitee/sop/test/sign/AlipaySignature.java b/sop-test/src/main/java/com/gitee/sop/test/sign/AlipaySignature.java old mode 100644 new mode 100755 diff --git a/sop-test/src/main/java/com/gitee/sop/test/sign/StreamUtil.java b/sop-test/src/main/java/com/gitee/sop/test/sign/StreamUtil.java old mode 100644 new mode 100755 diff --git a/sop-test/src/main/java/com/gitee/sop/test/sign/StringUtils.java b/sop-test/src/main/java/com/gitee/sop/test/sign/StringUtils.java old mode 100644 new mode 100755 diff --git a/sop-test/src/main/resources/file1.txt b/sop-test/src/main/resources/file1.txt old mode 100644 new mode 100755 diff --git a/sop-test/src/main/resources/file2.txt b/sop-test/src/main/resources/file2.txt old mode 100644 new mode 100755 diff --git a/sop-test/src/main/resources/img.png b/sop-test/src/main/resources/img.png old mode 100644 new mode 100755 diff --git a/sop-test/src/main/resources/large_data.txt b/sop-test/src/main/resources/large_data.txt old mode 100644 new mode 100755 diff --git a/sop-test/src/main/resources/large_img.png b/sop-test/src/main/resources/large_img.png old mode 100644 new mode 100755 diff --git a/sop-test/src/test/java/com/gitee/sop/test/AlipayClientPostTest.java b/sop-test/src/test/java/com/gitee/sop/test/AlipayClientPostTest.java old mode 100644 new mode 100755 diff --git a/sop-test/src/test/java/com/gitee/sop/test/AllInOneTest.java b/sop-test/src/test/java/com/gitee/sop/test/AllInOneTest.java old mode 100644 new mode 100755 diff --git a/sop-test/src/test/java/com/gitee/sop/test/TestBase.java b/sop-test/src/test/java/com/gitee/sop/test/TestBase.java old mode 100644 new mode 100755 diff --git a/sop-website/pom.xml b/sop-website/pom.xml new file mode 100755 index 00000000..5f2daed9 --- /dev/null +++ b/sop-website/pom.xml @@ -0,0 +1,18 @@ + + + + 4.0.0 + + com.gitee.sop + sop-parent + 5.0.0-SNAPSHOT + + sop-website + pom + + + sop-website-backend + + diff --git a/sop-website/sop-website-backend/pom.xml b/sop-website/sop-website-backend/pom.xml new file mode 100755 index 00000000..acca2bd9 --- /dev/null +++ b/sop-website/sop-website-backend/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + + com.gitee.sop + sop-website + 5.0.0-SNAPSHOT + + + sop-website-backend + pom + + + 8 + 8 + UTF-8 + + + + + website-common + website-service + website-dao + website-boot + website-web + + + diff --git a/sop-website/sop-website-backend/website-boot/pom.xml b/sop-website/sop-website-backend/website-boot/pom.xml new file mode 100755 index 00000000..9b4759da --- /dev/null +++ b/sop-website/sop-website-backend/website-boot/pom.xml @@ -0,0 +1,121 @@ + + + 4.0.0 + + com.gitee.sop + sop-website-backend + 5.0.0-SNAPSHOT + + + website-boot + + + 8 + 8 + UTF-8 + + + + + com.gitee.sop + website-web + 5.0.0-SNAPSHOT + + + org.springframework.boot + spring-boot-starter + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + org.springframework.boot + spring-boot-starter-jdbc + + + + mysql + mysql-connector-java + + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + org.projectlombok + lombok + true + + + + + + + + aliyun + aliyun + https://maven.aliyun.com/repository/public + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.12.4 + + true + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + ${java.version} + ${java.version} + UTF-8 + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.3.1 + + checkstyle.xml + true + true + false + + + + validate + validate + + check + + + + + + + + + diff --git a/sop-website/sop-website-backend/website-boot/src/main/java/com/gitee/sop/website/SopWebsiteApplication.java b/sop-website/sop-website-backend/website-boot/src/main/java/com/gitee/sop/website/SopWebsiteApplication.java new file mode 100755 index 00000000..b10b08e1 --- /dev/null +++ b/sop-website/sop-website-backend/website-boot/src/main/java/com/gitee/sop/website/SopWebsiteApplication.java @@ -0,0 +1,13 @@ +package com.gitee.sop.website; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SopWebsiteApplication { + + public static void main(String[] args) { + SpringApplication.run(SopWebsiteApplication.class, args); + } + +} diff --git a/sop-website/sop-website-backend/website-boot/src/main/java/com/gitee/sop/website/config/SopWebsiteConfiguration.java b/sop-website/sop-website-backend/website-boot/src/main/java/com/gitee/sop/website/config/SopWebsiteConfiguration.java new file mode 100755 index 00000000..2c399230 --- /dev/null +++ b/sop-website/sop-website-backend/website-boot/src/main/java/com/gitee/sop/website/config/SopWebsiteConfiguration.java @@ -0,0 +1,79 @@ +package com.gitee.sop.website.config; + +import com.gitee.sop.website.common.context.SpringContext; +import com.gitee.sop.website.common.util.SystemUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.util.StringUtils; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +import org.springframework.web.filter.CorsFilter; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +/** + * @author 六如 + */ +@Configuration +@Slf4j +public class SopWebsiteConfiguration implements ApplicationContextAware, WebMvcConfigurer { + + @Value("${front-location:}") + private String frontLocation; + + @Override + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { + SpringContext.setApplicationContext(applicationContext); + } + + /** + * 跨域设置 + */ + @Bean + public CorsFilter corsFilter( + @Value("${torna.cors.allowed-origin-pattern:*}") String allowedOriginPattern, + @Value("${torna.cors.allowed-header:*}") String allowedHeader + ) { + CorsConfiguration corsConfiguration = new CorsConfiguration(); + // SpringBoot升级2.4.0之后，跨域配置中的.allowedOrigins不再可用,改成addAllowedOriginPattern + corsConfiguration.addAllowedOriginPattern(allowedOriginPattern); + corsConfiguration.addAllowedHeader(allowedHeader); + corsConfiguration.addAllowedMethod(CorsConfiguration.ALL); + corsConfiguration.addExposedHeader("Content-Disposition"); + corsConfiguration.setAllowCredentials(true); + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + source.registerCorsConfiguration("/**", corsConfiguration); + return new CorsFilter(source); + } + + + /** + * 配置静态资源 + * + * @param registry + */ + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + String homeDir = SystemUtil.getBinPath(); + String frontRoot; + if (StringUtils.hasText(frontLocation)) { + frontRoot = StringUtils.trimTrailingCharacter(frontLocation, '/'); + } else { + frontRoot = homeDir + "/dist"; + } + log.info("前端资源目录：{}", frontRoot); + String location = "file:" + frontRoot; + registry.addResourceHandler("/index.html").addResourceLocations(location + "/index.html"); + 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("/assets/**").addResourceLocations(location + "/assets/"); + } + +} diff --git a/sop-website/sop-website-backend/website-boot/src/main/resources/application-dev.properties b/sop-website/sop-website-backend/website-boot/src/main/resources/application-dev.properties new file mode 100755 index 00000000..d22b1025 --- /dev/null +++ b/sop-website/sop-website-backend/website-boot/src/main/resources/application-dev.properties @@ -0,0 +1,6 @@ +mybatis.print-sql=true + +# mysql config +mysql.host=127.0.0.1:3306 +mysql.username=root +mysql.password=root diff --git a/sop-website/sop-website-backend/website-boot/src/main/resources/application-test.properties b/sop-website/sop-website-backend/website-boot/src/main/resources/application-test.properties new file mode 100755 index 00000000..d22b1025 --- /dev/null +++ b/sop-website/sop-website-backend/website-boot/src/main/resources/application-test.properties @@ -0,0 +1,6 @@ +mybatis.print-sql=true + +# mysql config +mysql.host=127.0.0.1:3306 +mysql.username=root +mysql.password=root diff --git a/sop-website/sop-website-backend/website-boot/src/main/resources/application.properties b/sop-website/sop-website-backend/website-boot/src/main/resources/application.properties new file mode 100755 index 00000000..056a1452 --- /dev/null +++ b/sop-website/sop-website-backend/website-boot/src/main/resources/application.properties @@ -0,0 +1,28 @@ +server.port=8083 +spring.profiles.active=dev + +spring.application.name=sop-website + +####### mysql config ####### +mysql.host=127.0.0.1:3306 +mysql.username= +mysql.password= +mysql.db=sop + +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.url=jdbc:mysql://${mysql.host}/${mysql.db}?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai +spring.datasource.username=${mysql.username} +spring.datasource.password=${mysql.password} + +####### mybatis config ####### +mybatis.fill.com.gitee.fastmybatis.core.support.LocalDateTimeFillInsert=add_time +mybatis.fill.com.gitee.fastmybatis.core.support.LocalDateTimeFillUpdate=update_time +# mybatis config file +mybatis.config-location=classpath:mybatis/mybatisConfig.xml +mybatis.mapper-locations=classpath:mybatis/mapper/*.xml + + +# print SQL +logging.level.com.gitee.sop.website.dao=error +logging.level.com.gitee.fastmybatis=info +mybatis.print-sql=false diff --git a/sop-website/sop-website-backend/website-common/pom.xml b/sop-website/sop-website-backend/website-common/pom.xml new file mode 100644 index 00000000..f63eea0f --- /dev/null +++ b/sop-website/sop-website-backend/website-common/pom.xml @@ -0,0 +1,44 @@ + + + 4.0.0 + + com.gitee.sop + sop-website-backend + 5.0.0-SNAPSHOT + + + website-common + + + 8 + 8 + UTF-8 + + + + + org.springframework.boot + spring-boot-starter-web + + + com.google.guava + guava + + + com.alibaba.fastjson2 + fastjson2 + + + io.gitee.durcframework + fastmybatis-spring-boot-starter + + + org.projectlombok + lombok + provided + + + + diff --git a/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/config/Configs.java b/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/config/Configs.java new file mode 100755 index 00000000..59842964 --- /dev/null +++ b/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/config/Configs.java @@ -0,0 +1,46 @@ +package com.gitee.sop.website.common.config; + + +import com.gitee.sop.website.common.context.SpringContext; +import com.gitee.sop.website.common.enums.ConfigKeyEnum; + +import java.util.function.Supplier; + +/** + * @author 六如 + */ +public class Configs { + + /** + * 获取配置参数 + * + * @param keyGetter 配置key + * @return 返回配参数，没有则返回null + */ + public static String getValue(ConfigKeyEnum keyGetter) { + return getValue(keyGetter, keyGetter.getDefaultValue()); + } + + /** + * 获取配置参数 + * + * @param keyGetter 配置key + * @param defaultValue 默认值 + * @return 返回配参数，没有则返回默认值 + */ + public static String getValue(ConfigKeyEnum keyGetter, String defaultValue) { + return SpringContext.getBean(IConfig.class).getConfig(keyGetter.getKey(), defaultValue); + } + + /** + * 获取配置参数 + * + * @param keyGetter 配置key + * @param defaultValue 默认值 + * @return 返回配参数，没有则返回默认值 + */ + public static String getValue(ConfigKeyEnum keyGetter, Supplier defaultValue) { + return getValue(keyGetter, defaultValue.get()); + } + +} diff --git a/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/config/IConfig.java b/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/config/IConfig.java new file mode 100755 index 00000000..418697c7 --- /dev/null +++ b/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/config/IConfig.java @@ -0,0 +1,9 @@ +package com.gitee.sop.website.common.config; + +public interface IConfig { + + String getConfig(String key); + + String getConfig(String key, String defaultValue); + +} diff --git a/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/constants/YesOrNo.java b/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/constants/YesOrNo.java new file mode 100755 index 00000000..5771dde2 --- /dev/null +++ b/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/constants/YesOrNo.java @@ -0,0 +1,20 @@ +package com.gitee.sop.website.common.constants; + +import java.util.Objects; + +/** + * @author 六如 + */ +public class YesOrNo { + public static final int YES = 1; + public static final int NO = 0; + + public static boolean yes(Number value) { + return value != null && value.intValue() == YES; + } + + public static int of(Boolean b) { + return Objects.equals(b, true) ? YES : NO; + } + +} diff --git a/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/context/SpringContext.java b/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/context/SpringContext.java new file mode 100755 index 00000000..51682f8f --- /dev/null +++ b/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/context/SpringContext.java @@ -0,0 +1,31 @@ +package com.gitee.sop.website.common.context; + +import org.springframework.context.ApplicationContext; + +/** + * @author 六如 + */ +public class SpringContext { + + private static ApplicationContext ctx; + + public static T getBean(Class clazz) { + return ctx.getBean(clazz); + } + + public static Object getBean(String beanName) { + return ctx.getBean(beanName); + } + + public static void setApplicationContext(ApplicationContext ctx) { + SpringContext.ctx = ctx; + } + + public static ApplicationContext getApplicationContext() { + return ctx; + } + + public static void publishEvent(Object event) { + ctx.publishEvent(event); + } +} diff --git a/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/enums/ConfigKeyEnum.java b/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/enums/ConfigKeyEnum.java new file mode 100755 index 00000000..6e999c55 --- /dev/null +++ b/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/enums/ConfigKeyEnum.java @@ -0,0 +1,33 @@ +package com.gitee.sop.website.common.enums; + + +import com.gitee.sop.website.common.config.Configs; +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @author 六如 + */ +@AllArgsConstructor +@Getter +public enum ConfigKeyEnum { + PASSWORD_SALT("admin.password-salt", ""), + JWT_TIMEOUT_DAYS("admin.jwt-timeout-days", "365"), + JWT_SECRET("admin.jwt.secret", ""), + TORNA_SERVER_ADDR("admin.torna-server-addr", ""), + OPEN_PROD_URL("admin.open-prod-url", ""), + OPEN_SANDBOX_URL("admin.open-sandbox-url", ""); + + private final String key; + + private final String defaultValue; + + public String getValue() { + return getValue(this.defaultValue); + } + + public String getValue(String defaultValue) { + return Configs.getValue(this, defaultValue); + } + +} diff --git a/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/resp/Result.java b/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/resp/Result.java new file mode 100755 index 00000000..6f15c6f4 --- /dev/null +++ b/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/resp/Result.java @@ -0,0 +1,47 @@ +package com.gitee.sop.website.common.resp; + +import lombok.Data; + +import java.util.Objects; + +/** + * @param 数据 + * @author thc + */ +@Data +public class Result { + + private static final Result RESULT = new Result<>(); + + private String code = "0"; + private T data; + private String msg = "success"; + + public static Result ok() { + return RESULT; + } + + public static Result ok(E obj) { + Result result = new Result<>(); + result.setData(obj); + return result; + } + + public static Result err(String msg) { + Result result = new Result<>(); + result.setCode("1"); + result.setMsg(msg); + return result; + } + + public static Result err(String code, String msg) { + Result result = new Result<>(); + result.setCode(code); + result.setMsg(msg); + return result; + } + + public boolean getSuccess() { + return Objects.equals("0", code); + } +} diff --git a/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/util/CopyUtil.java b/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/util/CopyUtil.java new file mode 100755 index 00000000..3076b065 --- /dev/null +++ b/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/util/CopyUtil.java @@ -0,0 +1,360 @@ +package com.gitee.sop.website.common.util; + +import com.alibaba.fastjson2.JSON; +import com.gitee.fastmybatis.core.PageInfo; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.BeansException; +import org.springframework.beans.FatalBeanException; +import org.springframework.util.Assert; +import org.springframework.util.ClassUtils; + +import java.beans.PropertyDescriptor; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.Collectors; + +/** + * 属性拷贝工具类 + * + * @author 六如 + */ +public class CopyUtil extends BeanUtils { + + /** + * 属性拷贝,第一个参数中的属性值拷贝到第二个参数中
+ * 注意:当第一个参数中的属性有null值时,不会拷贝进去 + * + * @param from 源对象 + * @param to 目标对象 + * @param ignoreProperties 忽略的字段 + * @throws BeansException + */ + public static void copyPropertiesIgnoreNull(Object from, Object to, String... ignoreProperties) + throws BeansException { + Assert.notNull(from, "Source must not be null"); + Assert.notNull(to, "Target must not be null"); + + Class actualEditable = to.getClass(); + PropertyDescriptor[] targetPds = getPropertyDescriptors(actualEditable); + List ignoreList = (ignoreProperties != null ? Arrays.asList(ignoreProperties) : Collections.emptyList()); + + for (PropertyDescriptor targetPd : targetPds) { + if (ignoreList.contains(targetPd.getName())) { + continue; + } + Method writeMethod = targetPd.getWriteMethod(); + if (writeMethod != null) { + PropertyDescriptor sourcePd = getPropertyDescriptor(from.getClass(), targetPd.getName()); + if (sourcePd != null) { + Method readMethod = sourcePd.getReadMethod(); + if (readMethod != null && + ClassUtils.isAssignable(writeMethod.getParameterTypes()[0], readMethod.getReturnType())) { + try { + if (!Modifier.isPublic(readMethod.getDeclaringClass().getModifiers())) { + readMethod.setAccessible(true); + } + Object value = readMethod.invoke(from); + if (!Modifier.isPublic(writeMethod.getDeclaringClass().getModifiers())) { + writeMethod.setAccessible(true); + } + // 这里判断value是否为空 当然这里也能进行一些特殊要求的处理 + // 例如绑定时格式转换等等 + if (value != null) { + writeMethod.invoke(to, value); + } + } catch (Throwable ex) { + throw new FatalBeanException( + "Could not copy property '" + targetPd.getName() + "' from source to target", ex); + } + } + } + } + } + } + + /** + * 拷贝指定的字段 + * + * @param from 源对象 + * @param to 目标对象 + * @param includeFields 指定字段 + */ + public static void copyPropertiesInclude(Object from, Object to, Set includeFields) { + Objects.requireNonNull(includeFields, "includeFields can not null"); + Assert.notNull(from, "Source must not be null"); + Assert.notNull(to, "Target must not be null"); + if (includeFields.isEmpty()) { + return; + } + Class actualEditable = to.getClass(); + PropertyDescriptor[] targetPds = getPropertyDescriptors(actualEditable); + + for (PropertyDescriptor targetPd : targetPds) { + if (!includeFields.contains(targetPd.getName())) { + continue; + } + Method writeMethod = targetPd.getWriteMethod(); + if (writeMethod != null) { + PropertyDescriptor sourcePd = getPropertyDescriptor(from.getClass(), targetPd.getName()); + if (sourcePd != null) { + Method readMethod = sourcePd.getReadMethod(); + if (readMethod != null && + ClassUtils.isAssignable(writeMethod.getParameterTypes()[0], readMethod.getReturnType())) { + try { + if (!Modifier.isPublic(readMethod.getDeclaringClass().getModifiers())) { + readMethod.setAccessible(true); + } + Object value = readMethod.invoke(from); + if (!Modifier.isPublic(writeMethod.getDeclaringClass().getModifiers())) { + writeMethod.setAccessible(true); + } + writeMethod.invoke(to, value); + } catch (Throwable ex) { + throw new FatalBeanException( + "Could not copy property '" + targetPd.getName() + "' from source to target", ex); + } + } + } + } + } + } + + /** + * 拷贝属性 + * + * @param from 被拷贝类 + * @param to 目标类 + */ + public static void copyProperties(Object from, Object to) { + BeanUtils.copyProperties(from, to); + } + + /** + * 拷贝bean成为一个新类 + * + * @param from 被拷贝类 + * @param supplier 新的类获取回调 + * @param 新的类 + * @return 返回新的类实例，from为null时，返回null + */ + public static T copyBean(Object from, Supplier supplier) { + if (from == null) { + return null; + } + T to = supplier.get(); + BeanUtils.copyProperties(from, to); + return to; + } + + /** + * 拷贝实例 + * + * @param from 被拷贝类 + * @param supplier 新的类获取回调 + * @param after 对新的类最后续处理回调 + * @param 新的类 + * @return 返回新的类 + */ + public static T copyBean(Object from, Supplier supplier, Consumer after) { + if (from == null) { + return null; + } + T to = supplier.get(); + BeanUtils.copyProperties(from, to); + after.accept(to); + return to; + } + + /** + * 拷贝List，将list中的类转换成新的对象 + * + * @param collection 被拷贝的集合 + * @param toElement List新元素 + * @param 新元素类型 + * @return 返回新的List + */ + public static List copyList(Collection collection, Supplier toElement) { + if (collection == null || collection.isEmpty()) { + return new ArrayList<>(); + } + return collection.stream() + .map(source -> { + T target = toElement.get(); + BeanUtils.copyProperties(source, target); + return target; + }) + .collect(Collectors.toList()); + } + + public static List copyList(Collection fromList, Function function) { + if (fromList == null) { + return new ArrayList<>(); + } + return fromList.stream() + .map(source -> { + R target = function.apply(source); + BeanUtils.copyProperties(source, target); + return target; + }) + .collect(Collectors.toList()); + } + + /** + * 拷贝List，并做后续处理 + * + * @param fromList 被拷贝的list + * @param toElement 新元素 + * @param after 对新元素做后续处理 + * @param 新类型 + * @return 返回新的List + */ + public static List copyList(Collection fromList, Supplier toElement, Consumer after) { + if (fromList == null) { + return new ArrayList<>(); + } + return fromList.stream() + .map(source -> { + T target = toElement.get(); + BeanUtils.copyProperties(source, target); + after.accept(target); + return target; + }) + .collect(Collectors.toList()); + } + + /** + * 拷贝List，并做后续处理 + * + * @param fromList 被拷贝的list + * @param toElement 新元素 + * @param after 对新元素做后续处理 + * @param 新类型 + * @return 返回新的List + */ + public static List copyList(Collection fromList, Supplier toElement, CopyConsumer after) { + if (fromList == null) { + return new ArrayList<>(); + } + return fromList.stream() + .map(source -> { + T target = toElement.get(); + BeanUtils.copyProperties(source, target); + after.apply(source, target); + return target; + }) + .collect(Collectors.toList()); + } + + /** + * 深层次拷贝，通过json转换的方式实现 + * + * @param from 待转换的类 + * @param toClass 目标类class + * @param 目标类 + * @return 返回目标类 + */ + public static T deepCopy(Object from, Class toClass) { + String json = JSON.toJSONString(from); + return JSON.parseObject(json, toClass); + } + + /** + * 深层次拷贝，通过json转换的方式实现 + * + * @param from 待转换的类 + * @param toClass 目标类class + * @param 目标类 + * @return 返回目标类 + */ + public static List deepCopyList(Object from, Class toClass) { + String json = JSON.toJSONString(from); + return JSON.parseArray(json, toClass); + } + + + /** + * 拷贝map + * + * @param srcMap 原map + * @param valueGetter 值转换 + * @param Key类型 + * @param Value类型 + * @return 返回新map + */ + public static Map copyMap(Map srcMap, Supplier valueGetter) { + Map ret = new LinkedHashMap<>(srcMap.size() * 2); + for (Map.Entry entry : srcMap.entrySet()) { + V value = copyBean(entry.getValue(), valueGetter); + ret.put(entry.getKey(), value); + } + return ret; + } + + /** + * 拷贝map + * + * @param srcMap 原map + * @param function 值转换 + * @param Key类型 + * @param Value类型 + * @return 返回新map + */ + public static Map copyMap(Map srcMap, Function function) { + Map ret = new LinkedHashMap<>(srcMap.size() * 2); + for (Map.Entry entry : srcMap.entrySet()) { + V value = function.apply(entry.getValue()); + ret.put(entry.getKey(), value); + } + return ret; + } + + /** + * 拷贝map,value是list + * + * @param srcMap 原map + * @param valueGetter 值转换 + * @param Key类型 + * @param Value类型 + * @return 返回新map + */ + public static Map> copyMapList(Map> srcMap, Function, List> valueGetter) { + Map> ret = new LinkedHashMap<>(srcMap.size() * 2); + for (Map.Entry> entry : srcMap.entrySet()) { + List value = valueGetter.apply(entry.getValue()); + ret.put(entry.getKey(), value); + } + return ret; + } + + public static PageInfo copyPageInfo(PageInfo srcPageInfo, Function, List> function) { + PageInfo pageInfo = new PageInfo<>(); + List list = srcPageInfo.getList(); + if (list != null && !list.isEmpty()) { + pageInfo.setList(function.apply(list)); + } else { + pageInfo.setList(new ArrayList<>(0)); + } + pageInfo.setPageCount(srcPageInfo.getPageCount()); + pageInfo.setPageIndex(srcPageInfo.getPageIndex()); + pageInfo.setPageSize(srcPageInfo.getPageSize()); + pageInfo.setTotal(srcPageInfo.getTotal()); + return pageInfo; + } + + public interface CopyConsumer { + void apply(F from, T to); + } + +} diff --git a/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/util/SystemUtil.java b/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/util/SystemUtil.java new file mode 100644 index 00000000..dd776eee --- /dev/null +++ b/sop-website/sop-website-backend/website-common/src/main/java/com/gitee/sop/website/common/util/SystemUtil.java @@ -0,0 +1,32 @@ +package com.gitee.sop.website.common.util; + +import org.springframework.boot.system.ApplicationHome; + +import java.io.File; + +/** + * @author tanghc + */ +public class SystemUtil { + + /** + * 获取程序执行目录，即jar包所在的目录。此方法只在部署后有用，开发模式下，这里返回target路径 + * @return 返回路径 + */ + public static String getBinPath() { + ApplicationHome applicationHome = new ApplicationHome(SystemUtil.class); + File file = applicationHome.getSource(); + if (file == null) { + return getUserDir(); + } + return file.getParentFile().toString(); + } + + public static String getUserDir() { + return System.getProperty("user.dir"); + } + + public static String getUserHome() { + return System.getProperty("user.home"); + } +} diff --git a/sop-website/sop-website-backend/website-dao/pom.xml b/sop-website/sop-website-backend/website-dao/pom.xml new file mode 100755 index 00000000..4c3b6770 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/pom.xml @@ -0,0 +1,33 @@ + + + 4.0.0 + + com.gitee.sop + sop-website-backend + 5.0.0-SNAPSHOT + + + website-dao + + + 8 + 8 + UTF-8 + + + + + io.gitee.durcframework + fastmybatis-spring-boot-starter + + + + org.projectlombok + lombok + true + + + + diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/ApiInfo.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/ApiInfo.java new file mode 100755 index 00000000..c106be1c --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/ApiInfo.java @@ -0,0 +1,111 @@ +package com.gitee.sop.website.dao.entity; + +import com.gitee.fastmybatis.annotation.Pk; +import com.gitee.fastmybatis.annotation.PkStrategy; +import com.gitee.fastmybatis.annotation.Table; +import lombok.Data; + +import java.time.LocalDateTime; + + +/** + * 表名：api_info + * 备注：接口信息表 + * + * @author 六如 + */ +@Table(name = "api_info", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) +@Data +public class ApiInfo { + + /** + * id + */ + private Long id; + + /** + * 所属应用 + */ + private String application; + + /** + * 接口名称 + */ + private String apiName; + + /** + * 版本号 + */ + private String apiVersion; + + /** + * 接口描述 + */ + private String description; + + /** + * 备注 + */ + private String remark; + + /** + * 接口class + */ + private String interfaceClassName; + + /** + * 方法名称 + */ + private String methodName; + + /** + * 参数信息 + */ + private String paramInfo; + + /** + * 接口是否需要授权访问 + */ + private Integer isPermission; + + /** + * 是否需要appAuthToken + */ + private Integer isNeedToken; + + /** + * 是否有公共响应参数 + */ + private Integer hasCommonResponse; + + /** + * 注册来源，1-系统注册,2-手动注册 + */ + private Integer regSource; + + /** + * 1启用，0禁用 + */ + private Integer status; + + /** + * 添加时间 + */ + private LocalDateTime addTime; + + /** + * 修改时间 + */ + private LocalDateTime updateTime; + + /** + * 创建人id + */ + private Long addBy; + + /** + * 最后更新人id + */ + private Long updateBy; + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/DocApp.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/DocApp.java new file mode 100755 index 00000000..54550bff --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/DocApp.java @@ -0,0 +1,63 @@ +package com.gitee.sop.website.dao.entity; + +import java.time.LocalDateTime; + +import com.gitee.fastmybatis.annotation.Pk; +import com.gitee.fastmybatis.annotation.PkStrategy; +import com.gitee.fastmybatis.annotation.Table; + +import lombok.Data; + + +/** + * 表名：doc_app + * 备注：文档应用 + * + * @author 六如 + */ +@Table(name = "doc_app", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) +@Data +public class DocApp { + + /** + * id + */ + private Long id; + + /** + * 应用名称 + */ + private String appName; + + /** + * Torna应用token + */ + private String token; + + /** + * 状态, 0-未发布,1-已发布 + */ + private Integer isPublish; + + /** + * 添加时间 + */ + private LocalDateTime addTime; + + /** + * 修改时间 + */ + private LocalDateTime updateTime; + + /** + * 创建人id + */ + private Long addBy; + + /** + * 修改人id + */ + private Long updateBy; + + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/DocContent.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/DocContent.java new file mode 100755 index 00000000..207a2d15 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/DocContent.java @@ -0,0 +1,58 @@ +package com.gitee.sop.website.dao.entity; + +import java.time.LocalDateTime; + +import com.gitee.fastmybatis.annotation.Pk; +import com.gitee.fastmybatis.annotation.PkStrategy; +import com.gitee.fastmybatis.annotation.Table; + +import lombok.Data; + + +/** + * 表名：doc_content + * 备注：文档内容 + * + * @author 六如 + */ +@Table(name = "doc_content", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) +@Data +public class DocContent { + + /** + * id + */ + private Long id; + + /** + * doc_info.id + */ + private Long docInfoId; + + /** + * 文档内容 + */ + private String content; + + /** + * 添加时间 + */ + private LocalDateTime addTime; + + /** + * 修改时间 + */ + private LocalDateTime updateTime; + + /** + * 创建人id + */ + private Long addBy; + + /** + * 修改人id + */ + private Long updateBy; + + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/DocInfo.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/DocInfo.java new file mode 100755 index 00000000..21031d02 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/DocInfo.java @@ -0,0 +1,108 @@ +package com.gitee.sop.website.dao.entity; + +import java.time.LocalDateTime; + +import com.gitee.fastmybatis.annotation.Pk; +import com.gitee.fastmybatis.annotation.PkStrategy; +import com.gitee.fastmybatis.annotation.Table; + +import lombok.Data; + + +/** + * 表名：doc_info + * 备注：文档信息 + * + * @author 六如 + */ +@Table(name = "doc_info", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) +@Data +public class DocInfo { + + /** + * id + */ + private Long id; + + /** + * doc_app.id + */ + private Long docAppId; + + /** + * 远程文档id + */ + private Long docId; + + /** + * 文档标题 + */ + private String docTitle; + + /** + * 文档code + */ + private String docCode; + + /** + * 文档类型,1-dubbo,2-富文本,3-Markdown + */ + private Integer docType; + + /** + * 来源类型,1-torna,2-自建 + */ + private Integer sourceType; + + /** + * 文档名称 + */ + private String docName; + + /** + * 版本号 + */ + private String docVersion; + + /** + * 描述 + */ + private String description; + + /** + * 是否分类 + */ + private Integer isFolder; + + /** + * 状态, 0-未发布,1-已发布 + */ + private Integer isPublish; + + /** + * 父节点id, 对应docId + */ + private Long parentId; + + /** + * 添加时间 + */ + private LocalDateTime addTime; + + /** + * 修改时间 + */ + private LocalDateTime updateTime; + + /** + * 创建人id + */ + private Long addBy; + + /** + * 修改人id + */ + private Long updateBy; + + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/IsvInfo.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/IsvInfo.java new file mode 100755 index 00000000..4879e28c --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/IsvInfo.java @@ -0,0 +1,60 @@ +package com.gitee.sop.website.dao.entity; + +import com.gitee.fastmybatis.annotation.Pk; +import com.gitee.fastmybatis.annotation.PkStrategy; +import com.gitee.fastmybatis.annotation.Table; +import lombok.Data; + +import java.time.LocalDateTime; + + +/** + * 表名：isv_info + * 备注：isv信息表 + * + * @author 六如 + */ +@Table(name = "isv_info", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) +@Data +public class IsvInfo { + + /** + * id + */ + private Long id; + + /** + * appKey + */ + private String appId; + + /** + * 1启用，2禁用 + */ + private Integer status; + + /** + * 备注 + */ + private String remark; + + /** + * 添加时间 + */ + private LocalDateTime addTime; + + /** + * 修改时间 + */ + private LocalDateTime updateTime; + + /** + * 创建人id + */ + private Long addBy; + + /** + * 最后更新人id + */ + private Long updateBy; +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/IsvKeys.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/IsvKeys.java new file mode 100755 index 00000000..328bede1 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/IsvKeys.java @@ -0,0 +1,75 @@ +package com.gitee.sop.website.dao.entity; + +import com.gitee.fastmybatis.annotation.Pk; +import com.gitee.fastmybatis.annotation.PkStrategy; +import com.gitee.fastmybatis.annotation.Table; +import lombok.Data; + +import java.time.LocalDateTime; + + +/** + * 表名：isv_keys + * 备注：ISV秘钥管理 + * + * @author 六如 + */ +@Table(name = "isv_keys", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) +@Data +public class IsvKeys { + + /** + * id + */ + private Long id; + + /** + * isv_info.id + */ + private Long isvId; + + /** + * 秘钥格式，1：PKCS8(JAVA适用)，2：PKCS1(非JAVA适用) + */ + private Integer keyFormat; + + /** + * 开发者生成的公钥 + */ + private String publicKeyIsv; + + /** + * 开发者生成的私钥（交给开发者） + */ + private String privateKeyIsv; + + /** + * 平台生成的公钥（交给开发者） + */ + private String publicKeyPlatform; + + /** + * 平台生成的私钥 + */ + private String privateKeyPlatform; + + /** + * 添加时间 + */ + private LocalDateTime addTime; + + /** + * 修改时间 + */ + private LocalDateTime updateTime; + + /** + * 创建人id + */ + private Long addBy; + + /** + * 最后更新人id + */ + private Long updateBy; +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/PermGroup.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/PermGroup.java new file mode 100755 index 00000000..42daa7a5 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/PermGroup.java @@ -0,0 +1,56 @@ +package com.gitee.sop.website.dao.entity; + +import com.gitee.fastmybatis.annotation.Pk; +import com.gitee.fastmybatis.annotation.PkStrategy; +import com.gitee.fastmybatis.annotation.Table; +import lombok.Data; + +import java.time.LocalDateTime; + + +/** + * 表名：perm_group + * 备注：分组表 + * + * @author 六如 + */ +@Table(name = "perm_group", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) +@Data +public class PermGroup { + + /** + * id + */ + private Long id; + + /** + * 分组名称 + */ + private String groupName; + + /** + * 是否删除 + */ + @com.gitee.fastmybatis.annotation.Column(logicDelete = true) + private Integer isDeleted; + + /** + * 添加时间 + */ + private LocalDateTime addTime; + + /** + * 修改时间 + */ + private LocalDateTime updateTime; + + /** + * 创建人id + */ + private Long addBy; + + /** + * 最后更新人id + */ + private Long updateBy; +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/PermGroupPermission.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/PermGroupPermission.java new file mode 100755 index 00000000..7676f7c7 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/PermGroupPermission.java @@ -0,0 +1,55 @@ +package com.gitee.sop.website.dao.entity; + +import com.gitee.fastmybatis.annotation.Pk; +import com.gitee.fastmybatis.annotation.PkStrategy; +import com.gitee.fastmybatis.annotation.Table; +import lombok.Data; + +import java.time.LocalDateTime; + + +/** + * 表名：perm_group_permission + * 备注：组权限表 + * + * @author 六如 + */ +@Table(name = "perm_group_permission", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) +@Data +public class PermGroupPermission { + + /** + * id + */ + private Long id; + + /** + * 组id + */ + private Long groupId; + + /** + * api_info.id + */ + private Long apiId; + + /** + * 添加时间 + */ + private LocalDateTime addTime; + + /** + * 修改时间 + */ + private LocalDateTime updateTime; + + /** + * 创建人id + */ + private Long addBy; + + /** + * 最后更新人id + */ + private Long updateBy; +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/PermIsvGroup.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/PermIsvGroup.java new file mode 100755 index 00000000..b2b49856 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/PermIsvGroup.java @@ -0,0 +1,46 @@ +package com.gitee.sop.website.dao.entity; + +import com.gitee.fastmybatis.annotation.Pk; +import com.gitee.fastmybatis.annotation.PkStrategy; +import com.gitee.fastmybatis.annotation.Table; +import lombok.Data; + +import java.time.LocalDateTime; + + +/** + * 表名：perm_isv_group + * 备注：isv分组 + * + * @author 六如 + */ +@Table(name = "perm_isv_group", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) +@Data +public class PermIsvGroup { + + private Long id; + + /** + * isv_info表id + */ + private Long isvId; + + /** + * 组id + */ + private Long groupId; + + private LocalDateTime addTime; + + private LocalDateTime updateTime; + + /** + * 创建人id + */ + private Long addBy; + + /** + * 最后更新人id + */ + private Long updateBy; +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysAdminUser.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysAdminUser.java new file mode 100755 index 00000000..7a9f65e3 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysAdminUser.java @@ -0,0 +1,80 @@ +package com.gitee.sop.website.dao.entity; + +import com.gitee.fastmybatis.annotation.Pk; +import com.gitee.fastmybatis.annotation.PkStrategy; +import com.gitee.fastmybatis.annotation.Table; +import lombok.Data; + +import java.time.LocalDateTime; + + +/** + * 表名：sys_admin_user + * 备注：系统用户表 + * + * @author 六如 + */ +@Table(name = "sys_admin_user", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) +@Data +public class SysAdminUser { + + /** + * id + */ + private Long id; + + /** + * 用户名 + */ + private String username; + + /** + * 密码 + */ + private String password; + + /** + * 用户名 + */ + private String nickname; + + /** + * 邮箱 + */ + private String email; + + /** + * 头像 + */ + private String avatar; + + /** + * 状态，1：启用，2：禁用 + */ + private Integer status; + + /** + * 注册类型，1-系统，2-手动 + */ + private String regType; + + /** + * 添加时间 + */ + private LocalDateTime addTime; + + /** + * 修改时间 + */ + private LocalDateTime updateTime; + + /** + * 创建人id + */ + private Long addBy; + + /** + * 最后更新人id + */ + private Long updateBy; +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysConfig.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysConfig.java new file mode 100755 index 00000000..e0ac3a2e --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysConfig.java @@ -0,0 +1,45 @@ +package com.gitee.sop.website.dao.entity; + +import com.gitee.fastmybatis.annotation.Pk; +import com.gitee.fastmybatis.annotation.PkStrategy; +import com.gitee.fastmybatis.annotation.Table; +import lombok.Data; + +import java.time.LocalDateTime; + + +/** + * 表名：sys_config + * 备注：系统配置表 + * + * @author 六如 + */ +@Table(name = "sys_config", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) +@Data +public class SysConfig { + + private Long id; + + private String configKey; + + private String configValue; + + private String remark; + + @com.gitee.fastmybatis.annotation.Column(logicDelete = true) + private Integer isDeleted; + + private LocalDateTime addTime; + + private LocalDateTime updateTime; + + /** + * 创建人id + */ + private Long addBy; + + /** + * 最后更新人id + */ + private Long updateBy; +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysDept.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysDept.java new file mode 100755 index 00000000..f64d7e30 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysDept.java @@ -0,0 +1,73 @@ +package com.gitee.sop.website.dao.entity; + +import java.time.LocalDateTime; + +import com.gitee.fastmybatis.annotation.Pk; +import com.gitee.fastmybatis.annotation.PkStrategy; +import com.gitee.fastmybatis.annotation.Table; + +import lombok.Data; + + +/** + * 表名：sys_dept + * 备注：部门表 + * + * @author 六如 + */ +@Table(name = "sys_dept", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) +@Data +public class SysDept { + + /** + * id + */ + private Long id; + + /** + * 部门名称 + */ + private String name; + + /** + * 排序 + */ + private Integer sort; + + /** + * 状态，1：启用，2：禁用 + */ + private Integer status; + + /** + * 备注 + */ + private String remark; + + /** + * 父级id + */ + private Long parentId; + + /** + * 添加时间 + */ + private LocalDateTime addTime; + + /** + * 修改时间 + */ + private LocalDateTime updateTime; + + /** + * 创建人id + */ + private Long addBy; + + /** + * 修改人id + */ + private Long updateBy; + + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysResource.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysResource.java new file mode 100755 index 00000000..bd72ece1 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysResource.java @@ -0,0 +1,159 @@ +package com.gitee.sop.website.dao.entity; + +import java.time.LocalDateTime; + +import com.gitee.fastmybatis.annotation.Pk; +import com.gitee.fastmybatis.annotation.PkStrategy; +import com.gitee.fastmybatis.annotation.Table; + +import lombok.Data; + + +/** + * 表名：sys_resource + * 备注：菜单资源表 + * + * @author 六如 + */ +@Table(name = "sys_resource", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) +@Data +public class SysResource { + + /** + * id + */ + private Long id; + + /** + * 菜单类型（0代表菜单、1代表iframe、2代表外链、3代表按钮） + */ + private Integer menuType; + + /** + * 菜单名称 + */ + private String title; + + /** + * 路由名称 + */ + private String name; + + /** + * 路由路径 + */ + private String path; + + /** + * 路由路径 + */ + private String component; + + /** + * 排序 + */ + private Integer rank; + + /** + * 路由重定向 + */ + private String redirect; + + /** + * 菜单图标 + */ + private String icon; + + /** + * 右侧图标 + */ + private String extraIcon; + + /** + * 进场动画（页面加载动画） + */ + private String enterTransition; + + /** + * 离场动画（页面加载动画） + */ + private String leaveTransition; + + /** + * 菜单激活 + */ + private String activePath; + + /** + * 权限标识 + */ + private String auths; + + /** + * 链接地址（需要内嵌的`iframe`链接地址） + */ + private String frameSrc; + + /** + * 加载动画（内嵌的`iframe`页面是否开启首次加载动画） + */ + private Integer frameLoading; + + /** + * 缓存页面 + */ + private Integer keepAlive; + + /** + * 标签页（当前菜单名称或自定义信息禁止添加到标签页） + */ + private Integer hiddenTag; + + /** + * 固定标签页（当前菜单名称是否固定显示在标签页且不可关闭） + */ + private Integer fixedTag; + + /** + * 菜单（是否显示该菜单） + */ + private Integer showLink; + + /** + * 父级菜单（是否显示父级菜单 + */ + private Integer showParent; + + /** + * 父级id + */ + private Long parentId; + + /** + * 是否删除 + */ + @com.gitee.fastmybatis.annotation.Column(logicDelete = true) + private Integer isDeleted; + + /** + * 添加时间 + */ + private LocalDateTime addTime; + + /** + * 修改时间 + */ + private LocalDateTime updateTime; + + /** + * 创建人id + */ + private Long addBy; + + /** + * 修改人id + */ + private Long updateBy; + + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysRole.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysRole.java new file mode 100755 index 00000000..b3708538 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysRole.java @@ -0,0 +1,71 @@ +package com.gitee.sop.website.dao.entity; + +import java.time.LocalDateTime; + +import com.gitee.fastmybatis.annotation.Pk; +import com.gitee.fastmybatis.annotation.PkStrategy; +import com.gitee.fastmybatis.annotation.Table; + +import lombok.Data; + + +/** + * 表名：sys_role + * 备注：角色表 + * + * @author 六如 + */ +@Table(name = "sys_role", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) +@Data +public class SysRole { + + /** + * id + */ + private Long id; + + /** + * 角色名称 + */ + private String name; + + /** + * 角色code + */ + private String code; + + /** + * 备注 + */ + private String remark; + + /** + * 状态，1：启用，2：禁用 + */ + private Integer status; + + @com.gitee.fastmybatis.annotation.Column(logicDelete = true) + private Integer isDeleted; + + /** + * 添加时间 + */ + private LocalDateTime addTime; + + /** + * 修改时间 + */ + private LocalDateTime updateTime; + + /** + * 创建人id + */ + private Long addBy; + + /** + * 修改人id + */ + private Long updateBy; + + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysRoleResource.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysRoleResource.java new file mode 100755 index 00000000..a0848e92 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysRoleResource.java @@ -0,0 +1,58 @@ +package com.gitee.sop.website.dao.entity; + +import java.time.LocalDateTime; + +import com.gitee.fastmybatis.annotation.Pk; +import com.gitee.fastmybatis.annotation.PkStrategy; +import com.gitee.fastmybatis.annotation.Table; + +import lombok.Data; + + +/** + * 表名：sys_role_resource + * 备注：角色资源关联表 + * + * @author 六如 + */ +@Table(name = "sys_role_resource", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) +@Data +public class SysRoleResource { + + /** + * id + */ + private Long id; + + /** + * sys_role.id + */ + private Long roleId; + + /** + * sys_resource.id + */ + private Long resourceId; + + /** + * 添加时间 + */ + private LocalDateTime addTime; + + /** + * 修改时间 + */ + private LocalDateTime updateTime; + + /** + * 创建人id + */ + private Long addBy; + + /** + * 修改人id + */ + private Long updateBy; + + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysUser.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysUser.java new file mode 100755 index 00000000..a75d0b61 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysUser.java @@ -0,0 +1,98 @@ +package com.gitee.sop.website.dao.entity; + +import java.time.LocalDateTime; + +import com.gitee.fastmybatis.annotation.Pk; +import com.gitee.fastmybatis.annotation.PkStrategy; +import com.gitee.fastmybatis.annotation.Table; + +import lombok.Data; + + +/** + * 表名：sys_user + * 备注：系统用户表 + * + * @author 六如 + */ +@Table(name = "sys_user", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) +@Data +public class SysUser { + + /** + * id + */ + private Long id; + + /** + * 用户名 + */ + private String username; + + /** + * 密码 + */ + private String password; + + /** + * 昵称 + */ + private String nickname; + + /** + * 邮箱 + */ + private String phone; + + /** + * 邮箱 + */ + private String email; + + /** + * 头像 + */ + private String avatar; + + /** + * 性别,0-未知,1-男,2-女 + */ + private Integer gender; + + /** + * 状态，1：启用，2：禁用 + */ + private Integer status; + + /** + * 注册类型，1-系统，2-手动 + */ + private String regType; + + /** + * 备注 + */ + private String remark; + + /** + * 添加时间 + */ + private LocalDateTime addTime; + + /** + * 修改时间 + */ + private LocalDateTime updateTime; + + /** + * 创建人id + */ + private Long addBy; + + /** + * 修改人id + */ + private Long updateBy; + + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysUserDept.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysUserDept.java new file mode 100755 index 00000000..86273d02 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysUserDept.java @@ -0,0 +1,58 @@ +package com.gitee.sop.website.dao.entity; + +import java.time.LocalDateTime; + +import com.gitee.fastmybatis.annotation.Pk; +import com.gitee.fastmybatis.annotation.PkStrategy; +import com.gitee.fastmybatis.annotation.Table; + +import lombok.Data; + + +/** + * 表名：sys_user_dept + * 备注：用户部门关联表 + * + * @author 六如 + */ +@Table(name = "sys_user_dept", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) +@Data +public class SysUserDept { + + /** + * id + */ + private Long id; + + /** + * sys_user.id + */ + private Long userId; + + /** + * sys_dept.id + */ + private Long deptId; + + /** + * 添加时间 + */ + private LocalDateTime addTime; + + /** + * 修改时间 + */ + private LocalDateTime updateTime; + + /** + * 创建人id + */ + private Long addBy; + + /** + * 修改人id + */ + private Long updateBy; + + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysUserRole.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysUserRole.java new file mode 100755 index 00000000..8f837db3 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/entity/SysUserRole.java @@ -0,0 +1,58 @@ +package com.gitee.sop.website.dao.entity; + +import java.time.LocalDateTime; + +import com.gitee.fastmybatis.annotation.Pk; +import com.gitee.fastmybatis.annotation.PkStrategy; +import com.gitee.fastmybatis.annotation.Table; + +import lombok.Data; + + +/** + * 表名：sys_user_role + * 备注：用户角色关联表 + * + * @author 六如 + */ +@Table(name = "sys_user_role", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT)) +@Data +public class SysUserRole { + + /** + * id + */ + private Long id; + + /** + * sys_role.id + */ + private Long roleId; + + /** + * sys_user.id + */ + private Long userId; + + /** + * 添加时间 + */ + private LocalDateTime addTime; + + /** + * 修改时间 + */ + private LocalDateTime updateTime; + + /** + * 创建人id + */ + private Long addBy; + + /** + * 修改人id + */ + private Long updateBy; + + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/ApiInfoMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/ApiInfoMapper.java new file mode 100755 index 00000000..c179acab --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/ApiInfoMapper.java @@ -0,0 +1,21 @@ +package com.gitee.sop.website.dao.mapper; + + +import com.gitee.fastmybatis.core.mapper.BaseMapper; +import com.gitee.sop.website.dao.entity.ApiInfo; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author 六如 + */ +@Mapper +public interface ApiInfoMapper extends BaseMapper { + + default ApiInfo getByNameVersion(String apiName, String apiVersion) { + return this.query() + .eq(ApiInfo::getApiName, apiName) + .eq(ApiInfo::getApiVersion, apiVersion) + .get(); + } + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/DocAppMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/DocAppMapper.java new file mode 100755 index 00000000..e8a8c734 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/DocAppMapper.java @@ -0,0 +1,17 @@ +package com.gitee.sop.website.dao.mapper; + +import com.gitee.fastmybatis.core.mapper.BaseMapper; +import com.gitee.sop.website.dao.entity.DocApp; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author 六如 + */ +@Mapper +public interface DocAppMapper extends BaseMapper { + default String getToken(Long id) { + return this.query() + .eq(DocApp::getId, id) + .getValue(DocApp::getToken); + } +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/DocContentMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/DocContentMapper.java new file mode 100755 index 00000000..584b0d64 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/DocContentMapper.java @@ -0,0 +1,13 @@ +package com.gitee.sop.website.dao.mapper; + +import com.gitee.fastmybatis.core.mapper.BaseMapper; +import com.gitee.sop.website.dao.entity.DocContent; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author 六如 + */ +@Mapper +public interface DocContentMapper extends BaseMapper { + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/DocInfoMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/DocInfoMapper.java new file mode 100755 index 00000000..03c38191 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/DocInfoMapper.java @@ -0,0 +1,13 @@ +package com.gitee.sop.website.dao.mapper; + +import com.gitee.fastmybatis.core.mapper.BaseMapper; +import com.gitee.sop.website.dao.entity.DocInfo; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author 六如 + */ +@Mapper +public interface DocInfoMapper extends BaseMapper { + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/IsvInfoMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/IsvInfoMapper.java new file mode 100755 index 00000000..f7efbcb8 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/IsvInfoMapper.java @@ -0,0 +1,17 @@ +package com.gitee.sop.website.dao.mapper; + +import com.gitee.fastmybatis.core.mapper.BaseMapper; +import com.gitee.sop.website.dao.entity.IsvInfo; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author 六如 + */ +@Mapper +public interface IsvInfoMapper extends BaseMapper { + + default IsvInfo getByAppId(String appId) { + return this.get(IsvInfo::getAppId, appId); + } + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/IsvKeysMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/IsvKeysMapper.java new file mode 100755 index 00000000..eac8d22a --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/IsvKeysMapper.java @@ -0,0 +1,15 @@ +package com.gitee.sop.website.dao.mapper; + +import com.gitee.fastmybatis.core.mapper.BaseMapper; +import com.gitee.sop.website.dao.entity.IsvKeys; + +/** + * @author 六如 + */ +public interface IsvKeysMapper extends BaseMapper { + + default IsvKeys getByIsvInfoId(Long isvId) { + return this.get(IsvKeys::getIsvId, isvId); + } + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/PermGroupMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/PermGroupMapper.java new file mode 100755 index 00000000..ce53d847 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/PermGroupMapper.java @@ -0,0 +1,11 @@ +package com.gitee.sop.website.dao.mapper; + +import com.gitee.fastmybatis.core.mapper.BaseMapper; +import com.gitee.sop.website.dao.entity.PermGroup; + +/** + * @author 六如 + */ +public interface PermGroupMapper extends BaseMapper { + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/PermGroupPermissionMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/PermGroupPermissionMapper.java new file mode 100755 index 00000000..4d9de732 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/PermGroupPermissionMapper.java @@ -0,0 +1,11 @@ +package com.gitee.sop.website.dao.mapper; + +import com.gitee.fastmybatis.core.mapper.BaseMapper; +import com.gitee.sop.website.dao.entity.PermGroupPermission; + +/** + * @author 六如 + */ +public interface PermGroupPermissionMapper extends BaseMapper { + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/PermIsvGroupMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/PermIsvGroupMapper.java new file mode 100755 index 00000000..9841ccb5 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/PermIsvGroupMapper.java @@ -0,0 +1,13 @@ +package com.gitee.sop.website.dao.mapper; + +import com.gitee.fastmybatis.core.mapper.BaseMapper; +import com.gitee.sop.website.dao.entity.PermIsvGroup; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author 六如 + */ +@Mapper +public interface PermIsvGroupMapper extends BaseMapper { + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysAdminUserMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysAdminUserMapper.java new file mode 100755 index 00000000..fef45203 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysAdminUserMapper.java @@ -0,0 +1,11 @@ +package com.gitee.sop.website.dao.mapper; + +import com.gitee.fastmybatis.core.mapper.BaseMapper; +import com.gitee.sop.website.dao.entity.SysAdminUser; + +/** + * @author 六如 + */ +public interface SysAdminUserMapper extends BaseMapper { + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysConfigMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysConfigMapper.java new file mode 100755 index 00000000..f7a9abe7 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysConfigMapper.java @@ -0,0 +1,11 @@ +package com.gitee.sop.website.dao.mapper; + +import com.gitee.fastmybatis.core.mapper.BaseMapper; +import com.gitee.sop.website.dao.entity.SysConfig; + +/** + * @author 六如 + */ +public interface SysConfigMapper extends BaseMapper { + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysDeptMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysDeptMapper.java new file mode 100755 index 00000000..dd044b6c --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysDeptMapper.java @@ -0,0 +1,13 @@ +package com.gitee.sop.website.dao.mapper; + +import com.gitee.fastmybatis.core.mapper.BaseMapper; +import com.gitee.sop.website.dao.entity.SysDept; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author 六如 + */ +@Mapper +public interface SysDeptMapper extends BaseMapper { + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysResourceMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysResourceMapper.java new file mode 100755 index 00000000..501a63dd --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysResourceMapper.java @@ -0,0 +1,13 @@ +package com.gitee.sop.website.dao.mapper; + +import com.gitee.fastmybatis.core.mapper.BaseMapper; +import com.gitee.sop.website.dao.entity.SysResource; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author 六如 + */ +@Mapper +public interface SysResourceMapper extends BaseMapper { + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysRoleMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysRoleMapper.java new file mode 100755 index 00000000..de5d0bd6 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysRoleMapper.java @@ -0,0 +1,13 @@ +package com.gitee.sop.website.dao.mapper; + +import com.gitee.fastmybatis.core.mapper.BaseMapper; +import com.gitee.sop.website.dao.entity.SysRole; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author 六如 + */ +@Mapper +public interface SysRoleMapper extends BaseMapper { + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysRoleResourceMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysRoleResourceMapper.java new file mode 100755 index 00000000..604076fa --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysRoleResourceMapper.java @@ -0,0 +1,13 @@ +package com.gitee.sop.website.dao.mapper; + +import com.gitee.fastmybatis.core.mapper.BaseMapper; +import com.gitee.sop.website.dao.entity.SysRoleResource; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author 六如 + */ +@Mapper +public interface SysRoleResourceMapper extends BaseMapper { + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysUserDeptMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysUserDeptMapper.java new file mode 100755 index 00000000..e3ece350 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysUserDeptMapper.java @@ -0,0 +1,13 @@ +package com.gitee.sop.website.dao.mapper; + +import com.gitee.fastmybatis.core.mapper.BaseMapper; +import com.gitee.sop.website.dao.entity.SysUserDept; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author 六如 + */ +@Mapper +public interface SysUserDeptMapper extends BaseMapper { + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysUserMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysUserMapper.java new file mode 100755 index 00000000..fde6a0eb --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysUserMapper.java @@ -0,0 +1,13 @@ +package com.gitee.sop.website.dao.mapper; + +import com.gitee.fastmybatis.core.mapper.BaseMapper; +import com.gitee.sop.website.dao.entity.SysUser; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author 六如 + */ +@Mapper +public interface SysUserMapper extends BaseMapper { + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysUserRoleMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysUserRoleMapper.java new file mode 100755 index 00000000..290c7819 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/SysUserRoleMapper.java @@ -0,0 +1,13 @@ +package com.gitee.sop.website.dao.mapper; + +import com.gitee.fastmybatis.core.mapper.BaseMapper; +import com.gitee.sop.website.dao.entity.SysUserRole; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author 六如 + */ +@Mapper +public interface SysUserRoleMapper extends BaseMapper { + +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/UpgradeMapper.java b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/UpgradeMapper.java new file mode 100755 index 00000000..afda1b2e --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/java/com/gitee/sop/website/dao/mapper/UpgradeMapper.java @@ -0,0 +1,27 @@ +package com.gitee.sop.website.dao.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + * @author tanghc + */ +@Mapper +public interface UpgradeMapper { + + void runSql(@Param("sql") String sql); + + /** + * 查看MYSQL表字段信息 + * @param tableName 表名 + * @return 返回字段信息 + */ + List> listColumnInfo(@Param("tableName") String tableName); + + List listTableName(); + + List> listTableIndex(@Param("tableName") String tableName); +} diff --git a/sop-website/sop-website-backend/website-dao/src/main/resources/mybatis/mapper/UpgradeMapper.xml b/sop-website/sop-website-backend/website-dao/src/main/resources/mybatis/mapper/UpgradeMapper.xml new file mode 100755 index 00000000..9c0f5700 --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/resources/mybatis/mapper/UpgradeMapper.xml @@ -0,0 +1,22 @@ + + + + + + ${sql} + + + + + + + + + + diff --git a/sop-website/sop-website-backend/website-dao/src/main/resources/mybatis/mybatisConfig.xml b/sop-website/sop-website-backend/website-dao/src/main/resources/mybatis/mybatisConfig.xml new file mode 100755 index 00000000..3c4b234f --- /dev/null +++ b/sop-website/sop-website-backend/website-dao/src/main/resources/mybatis/mybatisConfig.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sop-website/sop-website-backend/website-service/pom.xml b/sop-website/sop-website-backend/website-service/pom.xml new file mode 100755 index 00000000..a99dd22c --- /dev/null +++ b/sop-website/sop-website-backend/website-service/pom.xml @@ -0,0 +1,44 @@ + + + 4.0.0 + + com.gitee.sop + sop-website-backend + 5.0.0-SNAPSHOT + + + website-service + + + 8 + 8 + UTF-8 + + + + + com.gitee.sop + website-common + 5.0.0-SNAPSHOT + + + com.gitee.sop + website-dao + 5.0.0-SNAPSHOT + + + org.apache.dubbo + dubbo + + + + org.projectlombok + lombok + true + + + + + diff --git a/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/DocAppService.java b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/DocAppService.java new file mode 100755 index 00000000..365865bd --- /dev/null +++ b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/DocAppService.java @@ -0,0 +1,15 @@ +package com.gitee.sop.website.service.doc; + +import com.gitee.fastmybatis.core.support.LambdaService; +import com.gitee.sop.website.dao.entity.DocApp; +import com.gitee.sop.website.dao.mapper.DocAppMapper; +import org.springframework.stereotype.Service; + + +/** + * @author 六如 + */ +@Service +public class DocAppService implements LambdaService { + +} diff --git a/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/DocContentService.java b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/DocContentService.java new file mode 100755 index 00000000..8d191760 --- /dev/null +++ b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/DocContentService.java @@ -0,0 +1,23 @@ +package com.gitee.sop.website.service.doc; + +import com.gitee.fastmybatis.core.support.LambdaService; +import com.gitee.sop.website.dao.entity.DocContent; +import com.gitee.sop.website.dao.mapper.DocContentMapper; +import org.springframework.stereotype.Service; + + +/** + * @author 六如 + */ +@Service +public class DocContentService implements LambdaService { + + public String getContent(Long docInfoId) { + return this.query() + .eq(DocContent::getDocInfoId, docInfoId) + .getValueOptional(DocContent::getContent) + .orElse(""); + } + + +} diff --git a/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/DocInfoService.java b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/DocInfoService.java new file mode 100755 index 00000000..a06d2916 --- /dev/null +++ b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/DocInfoService.java @@ -0,0 +1,33 @@ +package com.gitee.sop.website.service.doc; + +import com.alibaba.fastjson2.JSON; +import com.gitee.fastmybatis.core.support.LambdaService; +import com.gitee.sop.website.common.constants.YesOrNo; +import com.gitee.sop.website.dao.entity.DocInfo; +import com.gitee.sop.website.dao.mapper.DocInfoMapper; +import com.gitee.sop.website.service.doc.dto.torna.TornaDocInfoViewDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + + +/** + * @author 六如 + */ +@Service +public class DocInfoService implements LambdaService { + + @Autowired + private DocContentService docContentService; + + + public TornaDocInfoViewDTO getDocDetail(Long id) { + DocInfo docInfo = this.getById(id); + if (docInfo == null || !YesOrNo.yes(docInfo.getIsPublish())) { + throw new IllegalArgumentException("文档不存在"); + } + String content = docContentService.getContent(docInfo.getId()); + return JSON.parseObject(content, TornaDocInfoViewDTO.class); + } + + +} diff --git a/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/DocSettingService.java b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/DocSettingService.java new file mode 100755 index 00000000..086c76b5 --- /dev/null +++ b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/DocSettingService.java @@ -0,0 +1,22 @@ +package com.gitee.sop.website.service.doc; + +import com.gitee.sop.website.common.enums.ConfigKeyEnum; +import com.gitee.sop.website.service.doc.dto.DocSettingDTO; +import org.springframework.stereotype.Service; + + +/** + * @author 六如 + */ +@Service +public class DocSettingService { + + public DocSettingDTO getDocSetting() { + DocSettingDTO docSettingDTO = new DocSettingDTO(); + docSettingDTO.setTornaServerAddr(ConfigKeyEnum.TORNA_SERVER_ADDR.getValue()); + docSettingDTO.setOpenProdUrl(ConfigKeyEnum.OPEN_PROD_URL.getValue()); + docSettingDTO.setOpenSandboxUrl(ConfigKeyEnum.OPEN_SANDBOX_URL.getValue()); + return docSettingDTO; + } + +} diff --git a/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/dto/DocAppDTO.java b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/dto/DocAppDTO.java new file mode 100755 index 00000000..2757c180 --- /dev/null +++ b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/dto/DocAppDTO.java @@ -0,0 +1,52 @@ +package com.gitee.sop.admin.service.doc.dto; + +import lombok.Data; + +import java.time.LocalDateTime; + + +/** + * 备注：文档应用 + * + * @author 六如 + */ +@Data +public class DocAppDTO { + + /** + * id + */ + private Long id; + + /** + * 应用名称 + */ + private String appName; + + /** + * Torna应用token + */ + private String token; + + /** + * 添加时间 + */ + private LocalDateTime addTime; + + /** + * 修改时间 + */ + private LocalDateTime updateTime; + + /** + * 创建人id + */ + private Long addBy; + + /** + * 修改人id + */ + private Long updateBy; + + +} diff --git a/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/dto/DocInfoConfigDTO.java b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/dto/DocInfoConfigDTO.java new file mode 100755 index 00000000..64c8520a --- /dev/null +++ b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/dto/DocInfoConfigDTO.java @@ -0,0 +1,14 @@ +package com.gitee.sop.website.service.doc.dto; + +import lombok.Data; + +/** + * @author 六如 + */ +@Data +public class DocInfoConfigDTO { + + private String openProdUrl; + private String openSandboxUrl; + +} diff --git a/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/dto/DocInfoTreeDTO.java b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/dto/DocInfoTreeDTO.java new file mode 100755 index 00000000..303681ca --- /dev/null +++ b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/dto/DocInfoTreeDTO.java @@ -0,0 +1,106 @@ +package com.gitee.sop.website.service.doc.dto; + +import com.gitee.fastmybatis.core.support.TreeNode; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + + +/** + * 备注：文档信息 + * + * @author 六如 + */ +@Data +public class DocInfoTreeDTO implements TreeNode { + + /** + * id + */ + private Long id; + + /** + * doc_app.id + */ + private Long docAppId; + + /** + * 文档id + */ + private Long docId; + + /** + * 文档标题 + */ + private String docTitle; + + /** + * 文档code + */ + private String docCode; + + /** + * 文档类型,1-dubbo,2-富文本,3-Markdown + */ + private Integer docType; + + /** + * 来源类型,1-torna,2-自建 + */ + private Integer sourceType; + + /** + * 文档名称 + */ + private String docName; + + /** + * 版本号 + */ + private String docVersion; + + /** + * 描述 + */ + private String description; + + /** + * 是否分类 + */ + private Integer isFolder; + + /** + * 状态, 0-未发布,1-已发布 + */ + private Integer isPublish; + + /** + * 父节点id + */ + private Long parentId; + + /** + * 添加时间 + */ + private LocalDateTime addTime; + + /** + * 修改时间 + */ + private LocalDateTime updateTime; + + private List children; + + + @Override + public Long takeId() { + return docId; + } + + @Override + public Long takeParentId() { + return parentId; + } + +} diff --git a/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/dto/DocInfoViewDTO.java b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/dto/DocInfoViewDTO.java new file mode 100755 index 00000000..015a595a --- /dev/null +++ b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/dto/DocInfoViewDTO.java @@ -0,0 +1,16 @@ +package com.gitee.sop.website.service.doc.dto; + +import com.gitee.sop.website.service.doc.dto.torna.TornaDocInfoViewDTO; +import lombok.Data; + +/** + * @author 六如 + */ +@Data +public class DocInfoViewDTO { + + private TornaDocInfoViewDTO docInfoView; + + private DocInfoConfigDTO docInfoConfig; + +} diff --git a/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/dto/DocSettingDTO.java b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/dto/DocSettingDTO.java new file mode 100644 index 00000000..1a175e76 --- /dev/null +++ b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/dto/DocSettingDTO.java @@ -0,0 +1,16 @@ +package com.gitee.sop.website.service.doc.dto; + +import lombok.Data; + +/** + * @author 六如 + */ +@Data +public class DocSettingDTO { + + private String tornaServerAddr; + private String openProdUrl; + private String openSandboxUrl; + + +} diff --git a/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/dto/torna/TornaDocInfoViewDTO.java b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/dto/torna/TornaDocInfoViewDTO.java new file mode 100644 index 00000000..790bbe68 --- /dev/null +++ b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/dto/torna/TornaDocInfoViewDTO.java @@ -0,0 +1,178 @@ +package com.gitee.sop.website.service.doc.dto.torna; + +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.Collections; +import java.util.List; + +/** + * @author tanghc + */ +@Data +public class TornaDocInfoViewDTO { + private Long id; + + /** + * 文档名称 + */ + private String name; + + /** + * 文档概述 + */ + + private String description; + + /** + * 0:http,1:dubbo,2:富文本,3:Markdown + */ + private Byte type; + + /** + * 访问URL + */ + + private String url; + + /** + * 版本号 + */ + private String version = ""; + + private String docKey; + + /** + * http方法 + */ + + private String httpMethod; + + /** + * contentType + */ + + private String contentType; + + + /** + * 是否是分类，0：不是，1：是 + */ + private Byte isFolder; + + /** + * 父节点 + */ + + private Long parentId; + + /** + * 模块id，module.id + */ + + private Long moduleId; + + /** + * 项目id + */ + + private Long projectId; + + /** + * 是否使用全局请求参数 + */ + + private Byte isUseGlobalHeaders; + + /** + * 是否使用全局请求参数 + */ + + private Byte isUseGlobalParams; + + /** + * 是否使用全局返回参数 + */ + + private Byte isUseGlobalReturns; + + /** + * 是否请求数组 + */ + + private Byte isRequestArray; + + /** + * 是否返回数组 + */ + + private Byte isResponseArray; + + /** + * 请求数组时元素类型 + */ + + private String requestArrayType; + + /** + * 返回数组时元素类型 + */ + + private String responseArrayType; + + /** + * 文档状态 + */ + + private Byte status; + + private String remark; + + private Integer orderIndex; + + /** + * 数据库字段：gmt_create + */ + private LocalDateTime gmtCreate; + + /** + * 数据库字段：gmt_modified + */ + private LocalDateTime gmtModified; + + + private List pathParams = Collections.emptyList(); + + + private List headerParams = Collections.emptyList(); + + private List headerParamsRaw = Collections.emptyList(); + + + private List queryParams = Collections.emptyList(); + + + private List requestParams = Collections.emptyList(); + + + private List responseParams = Collections.emptyList(); + + private List errorCodeParams = Collections.emptyList(); + + private List globalHeaders = Collections.emptyList(); + private List globalParams = Collections.emptyList(); + private List globalReturns = Collections.emptyList(); + + private String errorCodeInfo; + + private List children = Collections.emptyList(); + + public String getDocName() { + return name; + } + + public String getDocTitle() { + return name; + } + +} diff --git a/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/dto/torna/TornaDocParamDTO.java b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/dto/torna/TornaDocParamDTO.java new file mode 100644 index 00000000..8017fca9 --- /dev/null +++ b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/doc/dto/torna/TornaDocParamDTO.java @@ -0,0 +1,128 @@ +package com.gitee.sop.website.service.doc.dto.torna; + +import com.gitee.fastmybatis.core.support.TreeNode; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Objects; + +/** + * @author tanghc + */ +@Data +public class TornaDocParamDTO implements TreeNode { + + private Long id; + + /** + * 字段名称 + */ + + private String name; + + /** + * 字段类型 + */ + + private String type; + + /** + * 是否必须，1：是，0：否 + */ + + private Byte required; + + /** + * 最大长度 + */ + + private String maxLength; + + /** + * 示例值 + */ + private String example; + + /** + * 描述 + */ + + private String description; + + + private Long enumId; + + /** + * doc_info.id + */ + + private Long docId; + + /** + * 父节点 + */ + + private Long parentId; + + /** + * 0：header, 1：请求参数，2：返回参数，3：错误码 + */ + private Byte style; + + /** + * 新增操作方式，0：人工操作，1：开放平台推送 + */ + private Byte createMode; + + /** + * 修改操作方式，0：人工操作，1：开放平台推送 + */ + private Byte modifyMode; + + /** + * 创建人 + */ + private String creatorName; + + /** + * 修改人 + */ + private String modifierName; + + /** + * 排序 + */ + private Integer orderIndex; + + private Byte isDeleted; + + /** + * 数据库字段：gmt_create + */ + private LocalDateTime gmtCreate; + + /** + * 数据库字段：gmt_modified + */ + private LocalDateTime gmtModified; + + private boolean global; + + private List children; + + + public boolean getRequire() { + return Objects.equals(this.required, 1); + } + + @Override + public Long takeId() { + return id; + } + + @Override + public Long takeParentId() { + return parentId; + } +} diff --git a/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/sys/SysConfigService.java b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/sys/SysConfigService.java new file mode 100755 index 00000000..39818445 --- /dev/null +++ b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/sys/SysConfigService.java @@ -0,0 +1,107 @@ +package com.gitee.sop.website.service.sys; + +import com.gitee.fastmybatis.core.support.BaseLambdaService; +import com.gitee.sop.website.common.config.IConfig; +import com.gitee.sop.website.common.util.CopyUtil; +import com.gitee.sop.website.dao.entity.SysConfig; +import com.gitee.sop.website.dao.mapper.SysConfigMapper; +import com.gitee.sop.website.service.sys.dto.SystemConfigDTO; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.Objects; +import java.util.Optional; +import java.util.concurrent.TimeUnit; + +/** + * @author 六如 + */ +@Service +public class SysConfigService extends BaseLambdaService implements IConfig { + + @Autowired + private Environment environment; + + // key: configKey, value: configValue + private final LoadingCache> configCache = CacheBuilder.newBuilder() + .expireAfterAccess(15, TimeUnit.MINUTES) + .build(new CacheLoader>() { + @Override + public Optional load(String key) throws Exception { + return Optional.ofNullable(getConfigValue(key, null)); + } + }); + + public void save(Collection configs) { + configs.forEach(this::setConfig); + } + + public String getRawValue(String key) { + return this.query() + .eq(SysConfig::getConfigKey, key) + .getValue(SysConfig::getConfigValue); + } + + public void setConfig(String key, String value) { + setConfig(key, value, ""); + } + + public void setConfig(String key, String value, String remark) { + SystemConfigDTO systemConfigDTO = new SystemConfigDTO(); + systemConfigDTO.setConfigKey(key); + systemConfigDTO.setConfigValue(value); + systemConfigDTO.setRemark(remark); + setConfig(systemConfigDTO); + } + + public void setConfig(SystemConfigDTO systemConfigDTO) { + Objects.requireNonNull(systemConfigDTO.getConfigKey(), "need key"); + Objects.requireNonNull(systemConfigDTO.getConfigValue(), "need value"); + SysConfig systemConfig = get(SysConfig::getConfigKey, systemConfigDTO.getConfigKey()); + if (systemConfig == null) { + systemConfig = CopyUtil.copyBean(systemConfigDTO, SysConfig::new); + this.save(systemConfig); + } else { + CopyUtil.copyPropertiesIgnoreNull(systemConfigDTO, systemConfig); + this.update(systemConfig); + } + configCache.invalidate(systemConfigDTO.getConfigKey()); + } + + /** + * 获取配置信息 + * 
+     *  优先级：
+     *  数据库
+     *  Environment
+     *  默认配置
+     *
+ * + * @param key 配置key + * @param defaultValue 没有获取到返回的默认值 + * @return 返回配置信息，如果没有获取到值，则返回默认值 + */ + public String getConfigValue(String key, String defaultValue) { + Objects.requireNonNull(key, "need key"); + SysConfig systemConfig = get(SysConfig::getConfigKey, key); + return Optional.ofNullable(systemConfig) + .map(SysConfig::getConfigValue) + .orElseGet(() -> environment.getProperty(key, defaultValue)); + } + + @Override + public String getConfig(String key) { + return configCache.getUnchecked(key).orElse(null); + } + + @Override + public String getConfig(String key, String defaultValue) { + return configCache.getUnchecked(key).orElse(defaultValue); + } + +} diff --git a/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/sys/dto/SystemConfigDTO.java b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/sys/dto/SystemConfigDTO.java new file mode 100755 index 00000000..d5fcee46 --- /dev/null +++ b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/sys/dto/SystemConfigDTO.java @@ -0,0 +1,19 @@ +package com.gitee.sop.website.service.sys.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author tanghc + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class SystemConfigDTO { + private String configKey; + + private String configValue; + + private String remark; +} diff --git a/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/website/WebsiteService.java b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/website/WebsiteService.java new file mode 100755 index 00000000..5b640463 --- /dev/null +++ b/sop-website/sop-website-backend/website-service/src/main/java/com/gitee/sop/website/service/website/WebsiteService.java @@ -0,0 +1,64 @@ +package com.gitee.sop.website.service.website; + +import com.gitee.fastmybatis.core.util.TreeUtil; +import com.gitee.sop.admin.service.doc.dto.DocAppDTO; +import com.gitee.sop.website.common.constants.YesOrNo; +import com.gitee.sop.website.common.util.CopyUtil; +import com.gitee.sop.website.dao.entity.DocApp; +import com.gitee.sop.website.dao.entity.DocInfo; +import com.gitee.sop.website.service.doc.DocAppService; +import com.gitee.sop.website.service.doc.DocInfoService; +import com.gitee.sop.website.service.doc.DocSettingService; +import com.gitee.sop.website.service.doc.dto.DocInfoConfigDTO; +import com.gitee.sop.website.service.doc.dto.DocInfoTreeDTO; +import com.gitee.sop.website.service.doc.dto.DocInfoViewDTO; +import com.gitee.sop.website.service.doc.dto.DocSettingDTO; +import com.gitee.sop.website.service.doc.dto.torna.TornaDocInfoViewDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author 六如 + */ +@Service +public class WebsiteService { + + @Autowired + private DocAppService docAppService; + @Autowired + private DocInfoService docInfoService; + @Autowired + private DocSettingService docSettingService; + + public List listDocApp() { + List docApps = docAppService.list(DocApp::getIsPublish, YesOrNo.YES); + return CopyUtil.copyList(docApps, DocAppDTO::new); + } + + public List listDocMenuTree(Long docAppId) { + List list = docInfoService.query() + .eq(DocInfo::getDocAppId, docAppId) + .eq(DocInfo::getIsPublish, YesOrNo.YES) + .list(); + List treeList = CopyUtil.copyList(list, DocInfoTreeDTO::new); + return TreeUtil.convertTree(treeList, 0L); + } + + public DocInfoViewDTO getDocDetail(Long id) { + TornaDocInfoViewDTO tornaDocInfoViewDTO = docInfoService.getDocDetail(id); + DocInfoConfigDTO docInfoConfigDTO = buildDocInfoConfig(); + + DocInfoViewDTO docInfoViewDTO = new DocInfoViewDTO(); + docInfoViewDTO.setDocInfoView(tornaDocInfoViewDTO); + docInfoViewDTO.setDocInfoConfig(docInfoConfigDTO); + return docInfoViewDTO; + } + + + private DocInfoConfigDTO buildDocInfoConfig() { + DocSettingDTO docSetting = docSettingService.getDocSetting(); + return CopyUtil.copyBean(docSetting, DocInfoConfigDTO::new); + } +} diff --git a/sop-website/sop-website-backend/website-web/pom.xml b/sop-website/sop-website-backend/website-web/pom.xml new file mode 100755 index 00000000..0fb15ec4 --- /dev/null +++ b/sop-website/sop-website-backend/website-web/pom.xml @@ -0,0 +1,39 @@ + + + 4.0.0 + + com.gitee.sop + sop-website-backend + 5.0.0-SNAPSHOT + + + website-web + + + 8 + 8 + UTF-8 + + + + + com.gitee.sop + website-service + 5.0.0-SNAPSHOT + + + + org.springframework.boot + spring-boot-starter-web + + + + org.projectlombok + lombok + true + + + + diff --git a/sop-website/sop-website-backend/website-web/src/main/java/com/gitee/sop/website/controller/website/WebsiteController.java b/sop-website/sop-website-backend/website-web/src/main/java/com/gitee/sop/website/controller/website/WebsiteController.java new file mode 100755 index 00000000..6369e08f --- /dev/null +++ b/sop-website/sop-website-backend/website-web/src/main/java/com/gitee/sop/website/controller/website/WebsiteController.java @@ -0,0 +1,65 @@ +package com.gitee.sop.website.controller.website; + +import com.gitee.sop.admin.service.doc.dto.DocAppDTO; +import com.gitee.sop.website.controller.website.vo.DocAppVO; +import com.gitee.sop.website.controller.website.vo.DocInfoTreeVO; +import com.gitee.sop.website.controller.website.vo.DocInfoViewVO; +import com.gitee.sop.website.common.resp.Result; +import com.gitee.sop.website.common.util.CopyUtil; +import com.gitee.sop.website.service.doc.dto.DocInfoTreeDTO; +import com.gitee.sop.website.service.doc.dto.DocInfoViewDTO; +import com.gitee.sop.website.service.website.WebsiteService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 提供给网站的接口,不需要校验token + * + * @author 六如 + */ +@RestController +@RequestMapping("website") +public class WebsiteController { + + @Autowired + private WebsiteService websiteService; + + /** + * 获取文档应用列表 + */ + @GetMapping("docapp/list") + public Result> listDocApp() { + List docAppDTOS = websiteService.listDocApp(); + List docAppVOS = CopyUtil.deepCopyList(docAppDTOS, DocAppVO.class); + return Result.ok(docAppVOS); + } + + /** + * 获取文档菜单树 + * + * @param docAppId 应用id + */ + @GetMapping("docinfo/tree") + public Result> listDocMenuTree(Long docAppId) { + List docInfoTreeDTOS = websiteService.listDocMenuTree(docAppId); + List docAppVOS = CopyUtil.deepCopyList(docInfoTreeDTOS, DocInfoTreeVO.class); + return Result.ok(docAppVOS); + } + + /** + * 获取文档详情 + * + * @param id id + */ + @GetMapping("docinfo/detail") + public Result getDocDetail(Long id) { + DocInfoViewDTO docInfoViewDTO = websiteService.getDocDetail(id); + DocInfoViewVO docInfoViewVO = CopyUtil.deepCopy(docInfoViewDTO, DocInfoViewVO.class); + return Result.ok(docInfoViewVO); + } + +} diff --git a/sop-website/sop-website-backend/website-web/src/main/java/com/gitee/sop/website/controller/website/WebsiteHomeController.java b/sop-website/sop-website-backend/website-web/src/main/java/com/gitee/sop/website/controller/website/WebsiteHomeController.java new file mode 100755 index 00000000..1d720f95 --- /dev/null +++ b/sop-website/sop-website-backend/website-web/src/main/java/com/gitee/sop/website/controller/website/WebsiteHomeController.java @@ -0,0 +1,17 @@ +package com.gitee.sop.website.controller.website; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +public class WebsiteHomeController { + + private static final String REDIRECT_INDEX = "forward:index.html"; + + // 后台admin入口地址 + @GetMapping("/") + public String index() { + return REDIRECT_INDEX; + } + +} diff --git a/sop-website/sop-website-backend/website-web/src/main/java/com/gitee/sop/website/controller/website/vo/DocAppVO.java b/sop-website/sop-website-backend/website-web/src/main/java/com/gitee/sop/website/controller/website/vo/DocAppVO.java new file mode 100755 index 00000000..6f8183f7 --- /dev/null +++ b/sop-website/sop-website-backend/website-web/src/main/java/com/gitee/sop/website/controller/website/vo/DocAppVO.java @@ -0,0 +1,24 @@ +package com.gitee.sop.website.controller.website.vo; + +import lombok.Data; + + +/** + * 备注：文档应用 + * + * @author 六如 + */ +@Data +public class DocAppVO { + + /** + * id + */ + private Long id; + + /** + * 应用名称 + */ + private String appName; + +} diff --git a/sop-website/sop-website-backend/website-web/src/main/java/com/gitee/sop/website/controller/website/vo/DocInfoConfigVO.java b/sop-website/sop-website-backend/website-web/src/main/java/com/gitee/sop/website/controller/website/vo/DocInfoConfigVO.java new file mode 100755 index 00000000..66763977 --- /dev/null +++ b/sop-website/sop-website-backend/website-web/src/main/java/com/gitee/sop/website/controller/website/vo/DocInfoConfigVO.java @@ -0,0 +1,14 @@ +package com.gitee.sop.website.controller.website.vo; + +import lombok.Data; + +/** + * @author 六如 + */ +@Data +public class DocInfoConfigVO { + + private String openProdUrl; + private String openSandboxUrl; + +} diff --git a/sop-website/sop-website-backend/website-web/src/main/java/com/gitee/sop/website/controller/website/vo/DocInfoTreeVO.java b/sop-website/sop-website-backend/website-web/src/main/java/com/gitee/sop/website/controller/website/vo/DocInfoTreeVO.java new file mode 100755 index 00000000..03b75e2e --- /dev/null +++ b/sop-website/sop-website-backend/website-web/src/main/java/com/gitee/sop/website/controller/website/vo/DocInfoTreeVO.java @@ -0,0 +1,99 @@ +package com.gitee.sop.website.controller.website.vo; + +import com.gitee.fastmybatis.core.support.TreeNode; +import lombok.Data; + +import java.util.List; +import java.util.Objects; + + +/** + * 备注：文档信息 + * + * @author 六如 + */ +@Data +public class DocInfoTreeVO implements TreeNode { + + /** + * id + */ + private Long id; + + /** + * doc_app.id + */ + private Long docAppId; + + /** + * 文档id + */ + private Long docId; + + /** + * 文档标题 + */ + private String docTitle; + + /** + * 文档code + */ + private String docCode; + + /** + * 文档类型,1-dubbo,2-富文本,3-Markdown + */ + private Integer docType; + + /** + * 来源类型,1-torna,2-自建 + */ + private Integer sourceType; + + /** + * 文档名称 + */ + private String docName; + + /** + * 版本号 + */ + private String docVersion; + + /** + * 描述 + */ + private String description; + + /** + * 是否分类 + */ + private Integer isFolder; + + /** + * 父节点id + */ + private Long parentId; + + + private List children; + + + @Override + public Long takeId() { + return docId; + } + + @Override + public Long takeParentId() { + return parentId; + } + + + public String getDocName() { + if (Objects.equals(isFolder, 1)) { + return ""; + } + return docName; + } +} diff --git a/sop-website/sop-website-backend/website-web/src/main/java/com/gitee/sop/website/controller/website/vo/DocInfoViewVO.java b/sop-website/sop-website-backend/website-web/src/main/java/com/gitee/sop/website/controller/website/vo/DocInfoViewVO.java new file mode 100755 index 00000000..f6c586a3 --- /dev/null +++ b/sop-website/sop-website-backend/website-web/src/main/java/com/gitee/sop/website/controller/website/vo/DocInfoViewVO.java @@ -0,0 +1,15 @@ +package com.gitee.sop.website.controller.website.vo; + +import lombok.Data; + +/** + * @author 六如 + */ +@Data +public class DocInfoViewVO { + + private TornaDocInfoViewVO docInfoView; + + private DocInfoConfigVO docInfoConfig; + +} diff --git a/sop-website/sop-website-backend/website-web/src/main/java/com/gitee/sop/website/controller/website/vo/TornaDocInfoViewVO.java b/sop-website/sop-website-backend/website-web/src/main/java/com/gitee/sop/website/controller/website/vo/TornaDocInfoViewVO.java new file mode 100755 index 00000000..f01c4cfa --- /dev/null +++ b/sop-website/sop-website-backend/website-web/src/main/java/com/gitee/sop/website/controller/website/vo/TornaDocInfoViewVO.java @@ -0,0 +1,179 @@ +package com.gitee.sop.website.controller.website.vo; + +import com.gitee.sop.website.service.doc.dto.torna.TornaDocParamDTO; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.Collections; +import java.util.List; + +/** + * @author tanghc + */ +@Data +public class TornaDocInfoViewVO { + private Long id; + + /** + * 文档名称 + */ + private String name; + + /** + * 文档概述 + */ + + private String description; + + /** + * 0:http,1:dubbo + */ + private Byte type; + + /** + * 访问URL + */ + + private String url; + + /** + * 版本号 + */ + private String version = ""; + + private String docKey; + + /** + * http方法 + */ + + private String httpMethod; + + /** + * contentType + */ + + private String contentType; + + + /** + * 是否是分类，0：不是，1：是 + */ + private Byte isFolder; + + /** + * 父节点 + */ + + private Long parentId; + + /** + * 模块id，module.id + */ + + private Long moduleId; + + /** + * 项目id + */ + + private Long projectId; + + /** + * 是否使用全局请求参数 + */ + + private Byte isUseGlobalHeaders; + + /** + * 是否使用全局请求参数 + */ + + private Byte isUseGlobalParams; + + /** + * 是否使用全局返回参数 + */ + + private Byte isUseGlobalReturns; + + /** + * 是否请求数组 + */ + + private Byte isRequestArray; + + /** + * 是否返回数组 + */ + + private Byte isResponseArray; + + /** + * 请求数组时元素类型 + */ + + private String requestArrayType; + + /** + * 返回数组时元素类型 + */ + + private String responseArrayType; + + /** + * 文档状态 + */ + + private Byte status; + + private String remark; + + private Integer orderIndex; + + /** + * 数据库字段：gmt_create + */ + private LocalDateTime gmtCreate; + + /** + * 数据库字段：gmt_modified + */ + private LocalDateTime gmtModified; + + + private List pathParams = Collections.emptyList(); + + + private List headerParams = Collections.emptyList(); + + private List headerParamsRaw = Collections.emptyList(); + + + private List queryParams = Collections.emptyList(); + + + private List requestParams = Collections.emptyList(); + + + private List responseParams = Collections.emptyList(); + + private List errorCodeParams = Collections.emptyList(); + + private List globalHeaders = Collections.emptyList(); + private List globalParams = Collections.emptyList(); + private List globalReturns = Collections.emptyList(); + + private String errorCodeInfo; + + private List children = Collections.emptyList(); + + public String getDocName() { + return url; + } + + public String getDocTitle() { + return name; + } + +} diff --git a/sop-website/sop-website-frontend/.browserslistrc b/sop-website/sop-website-frontend/.browserslistrc old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/.dockerignore b/sop-website/sop-website-frontend/.dockerignore old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/.editorconfig b/sop-website/sop-website-frontend/.editorconfig old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/.env b/sop-website/sop-website-frontend/.env old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/.env.development b/sop-website/sop-website-frontend/.env.development old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/.env.staging b/sop-website/sop-website-frontend/.env.staging old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/.gitignore b/sop-website/sop-website-frontend/.gitignore old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/.husky/common.sh b/sop-website/sop-website-frontend/.husky/common.sh old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/.lintstagedrc b/sop-website/sop-website-frontend/.lintstagedrc old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/.markdownlint.json b/sop-website/sop-website-frontend/.markdownlint.json old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/.npmrc b/sop-website/sop-website-frontend/.npmrc old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/.nvmrc b/sop-website/sop-website-frontend/.nvmrc old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/.prettierrc.js b/sop-website/sop-website-frontend/.prettierrc.js old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/.stylelintignore b/sop-website/sop-website-frontend/.stylelintignore old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/.vscode/extensions.json b/sop-website/sop-website-frontend/.vscode/extensions.json old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/.vscode/settings.json b/sop-website/sop-website-frontend/.vscode/settings.json old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/.vscode/vue3.0.code-snippets b/sop-website/sop-website-frontend/.vscode/vue3.0.code-snippets old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/.vscode/vue3.2.code-snippets b/sop-website/sop-website-frontend/.vscode/vue3.2.code-snippets old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/.vscode/vue3.3.code-snippets b/sop-website/sop-website-frontend/.vscode/vue3.3.code-snippets old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/Dockerfile b/sop-website/sop-website-frontend/Dockerfile old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/LICENSE b/sop-website/sop-website-frontend/LICENSE old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/README.md b/sop-website/sop-website-frontend/README.md old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/build.sh b/sop-website/sop-website-frontend/build.sh new file mode 100755 index 00000000..2633fe08 --- /dev/null +++ b/sop-website/sop-website-frontend/build.sh @@ -0,0 +1,2 @@ +# 构建 +sudo pnpm build diff --git a/sop-website/sop-website-frontend/commitlint.config.js b/sop-website/sop-website-frontend/commitlint.config.js old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/eslint.config.js b/sop-website/sop-website-frontend/eslint.config.js old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/index.html b/sop-website/sop-website-frontend/index.html old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/locales/en.yaml b/sop-website/sop-website-frontend/locales/en.yaml old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/locales/zh-CN.yaml b/sop-website/sop-website-frontend/locales/zh-CN.yaml old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/mock/asyncRoutes.ts b/sop-website/sop-website-frontend/mock/asyncRoutes.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/mock/login.ts b/sop-website/sop-website-frontend/mock/login.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/mock/refreshToken.ts b/sop-website/sop-website-frontend/mock/refreshToken.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/pnpm-lock.yaml b/sop-website/sop-website-frontend/pnpm-lock.yaml old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/postcss.config.js b/sop-website/sop-website-frontend/postcss.config.js old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/public/favicon.ico b/sop-website/sop-website-frontend/public/favicon.ico old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/public/logo.png b/sop-website/sop-website-frontend/public/logo.png old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/public/static/md/sign.md b/sop-website/sop-website-frontend/public/static/md/sign.md old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/public/static/md/test.md b/sop-website/sop-website-frontend/public/static/md/test.md old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/App.vue b/sop-website/sop-website-frontend/src/App.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/api/doc.ts b/sop-website/sop-website-frontend/src/api/doc.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/api/routes.ts b/sop-website/sop-website-frontend/src/api/routes.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/api/user.ts b/sop-website/sop-website-frontend/src/api/user.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/iconfont/iconfont.css b/sop-website/sop-website-frontend/src/assets/iconfont/iconfont.css old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/iconfont/iconfont.js b/sop-website/sop-website-frontend/src/assets/iconfont/iconfont.js old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/iconfont/iconfont.json b/sop-website/sop-website-frontend/src/assets/iconfont/iconfont.json old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/iconfont/iconfont.ttf b/sop-website/sop-website-frontend/src/assets/iconfont/iconfont.ttf old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/iconfont/iconfont.woff b/sop-website/sop-website-frontend/src/assets/iconfont/iconfont.woff old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/iconfont/iconfont.woff2 b/sop-website/sop-website-frontend/src/assets/iconfont/iconfont.woff2 old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/login/avatar.svg b/sop-website/sop-website-frontend/src/assets/login/avatar.svg old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/login/bg.png b/sop-website/sop-website-frontend/src/assets/login/bg.png old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/login/illustration.svg b/sop-website/sop-website-frontend/src/assets/login/illustration.svg old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/status/403.svg b/sop-website/sop-website-frontend/src/assets/status/403.svg old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/status/404.svg b/sop-website/sop-website-frontend/src/assets/status/404.svg old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/status/500.svg b/sop-website/sop-website-frontend/src/assets/status/500.svg old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/svg/back_top.svg b/sop-website/sop-website-frontend/src/assets/svg/back_top.svg old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/svg/dark.svg b/sop-website/sop-website-frontend/src/assets/svg/dark.svg old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/svg/day.svg b/sop-website/sop-website-frontend/src/assets/svg/day.svg old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/svg/enter_outlined.svg b/sop-website/sop-website-frontend/src/assets/svg/enter_outlined.svg old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/svg/exit_screen.svg b/sop-website/sop-website-frontend/src/assets/svg/exit_screen.svg old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/svg/full_screen.svg b/sop-website/sop-website-frontend/src/assets/svg/full_screen.svg old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/svg/globalization.svg b/sop-website/sop-website-frontend/src/assets/svg/globalization.svg old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/svg/keyboard_esc.svg b/sop-website/sop-website-frontend/src/assets/svg/keyboard_esc.svg old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/svg/system.svg b/sop-website/sop-website-frontend/src/assets/svg/system.svg old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/table-bar/collapse.svg b/sop-website/sop-website-frontend/src/assets/table-bar/collapse.svg old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/table-bar/drag.svg b/sop-website/sop-website-frontend/src/assets/table-bar/drag.svg old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/table-bar/expand.svg b/sop-website/sop-website-frontend/src/assets/table-bar/expand.svg old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/table-bar/refresh.svg b/sop-website/sop-website-frontend/src/assets/table-bar/refresh.svg old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/table-bar/settings.svg b/sop-website/sop-website-frontend/src/assets/table-bar/settings.svg old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/assets/user.jpg b/sop-website/sop-website-frontend/src/assets/user.jpg old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/ApiParamTable/index.ts b/sop-website/sop-website-frontend/src/components/ApiParamTable/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/ApiParamTable/index.vue b/sop-website/sop-website-frontend/src/components/ApiParamTable/index.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/MarkdownEditor/index.ts b/sop-website/sop-website-frontend/src/components/MarkdownEditor/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/MarkdownEditor/index.vue b/sop-website/sop-website-frontend/src/components/MarkdownEditor/index.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/ReAuth/index.ts b/sop-website/sop-website-frontend/src/components/ReAuth/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/ReAuth/src/auth.tsx b/sop-website/sop-website-frontend/src/components/ReAuth/src/auth.tsx old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/ReCol/index.ts b/sop-website/sop-website-frontend/src/components/ReCol/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/ReDialog/index.ts b/sop-website/sop-website-frontend/src/components/ReDialog/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/ReDialog/index.vue b/sop-website/sop-website-frontend/src/components/ReDialog/index.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/ReDialog/type.ts b/sop-website/sop-website-frontend/src/components/ReDialog/type.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/ReIcon/index.ts b/sop-website/sop-website-frontend/src/components/ReIcon/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/ReIcon/src/hooks.ts b/sop-website/sop-website-frontend/src/components/ReIcon/src/hooks.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/ReIcon/src/iconfont.ts b/sop-website/sop-website-frontend/src/components/ReIcon/src/iconfont.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/ReIcon/src/iconifyIconOffline.ts b/sop-website/sop-website-frontend/src/components/ReIcon/src/iconifyIconOffline.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/ReIcon/src/iconifyIconOnline.ts b/sop-website/sop-website-frontend/src/components/ReIcon/src/iconifyIconOnline.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/ReIcon/src/offlineIcon.ts b/sop-website/sop-website-frontend/src/components/ReIcon/src/offlineIcon.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/ReIcon/src/types.ts b/sop-website/sop-website-frontend/src/components/ReIcon/src/types.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/RePerms/index.ts b/sop-website/sop-website-frontend/src/components/RePerms/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/RePerms/src/perms.tsx b/sop-website/sop-website-frontend/src/components/RePerms/src/perms.tsx old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/RePureTableBar/index.ts b/sop-website/sop-website-frontend/src/components/RePureTableBar/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/RePureTableBar/src/bar.tsx b/sop-website/sop-website-frontend/src/components/RePureTableBar/src/bar.tsx old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/ReSegmented/index.ts b/sop-website/sop-website-frontend/src/components/ReSegmented/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/ReSegmented/src/index.css b/sop-website/sop-website-frontend/src/components/ReSegmented/src/index.css old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/ReSegmented/src/index.tsx b/sop-website/sop-website-frontend/src/components/ReSegmented/src/index.tsx old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/ReSegmented/src/type.ts b/sop-website/sop-website-frontend/src/components/ReSegmented/src/type.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/ReText/index.ts b/sop-website/sop-website-frontend/src/components/ReText/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/components/ReText/src/index.vue b/sop-website/sop-website-frontend/src/components/ReText/src/index.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/config/index.ts b/sop-website/sop-website-frontend/src/config/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/directives/auth/index.ts b/sop-website/sop-website-frontend/src/directives/auth/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/directives/copy/index.ts b/sop-website/sop-website-frontend/src/directives/copy/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/directives/index.ts b/sop-website/sop-website-frontend/src/directives/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/directives/longpress/index.ts b/sop-website/sop-website-frontend/src/directives/longpress/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/directives/optimize/index.ts b/sop-website/sop-website-frontend/src/directives/optimize/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/directives/perms/index.ts b/sop-website/sop-website-frontend/src/directives/perms/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/directives/ripple/index.scss b/sop-website/sop-website-frontend/src/directives/ripple/index.scss old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/directives/ripple/index.ts b/sop-website/sop-website-frontend/src/directives/ripple/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-content/index.vue b/sop-website/sop-website-frontend/src/layout/components/lay-content/index.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-footer/index.vue b/sop-website/sop-website-frontend/src/layout/components/lay-footer/index.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-frame/index.vue b/sop-website/sop-website-frontend/src/layout/components/lay-frame/index.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-navbar/index.vue b/sop-website/sop-website-frontend/src/layout/components/lay-navbar/index.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-notice/components/NoticeItem.vue b/sop-website/sop-website-frontend/src/layout/components/lay-notice/components/NoticeItem.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-notice/components/NoticeList.vue b/sop-website/sop-website-frontend/src/layout/components/lay-notice/components/NoticeList.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-notice/data.ts b/sop-website/sop-website-frontend/src/layout/components/lay-notice/data.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-notice/index.vue b/sop-website/sop-website-frontend/src/layout/components/lay-notice/index.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-panel/index.vue b/sop-website/sop-website-frontend/src/layout/components/lay-panel/index.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-search/components/SearchFooter.vue b/sop-website/sop-website-frontend/src/layout/components/lay-search/components/SearchFooter.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-search/components/SearchHistory.vue b/sop-website/sop-website-frontend/src/layout/components/lay-search/components/SearchHistory.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-search/components/SearchHistoryItem.vue b/sop-website/sop-website-frontend/src/layout/components/lay-search/components/SearchHistoryItem.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-search/components/SearchModal.vue b/sop-website/sop-website-frontend/src/layout/components/lay-search/components/SearchModal.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-search/components/SearchResult.vue b/sop-website/sop-website-frontend/src/layout/components/lay-search/components/SearchResult.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-search/index.vue b/sop-website/sop-website-frontend/src/layout/components/lay-search/index.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-search/types.ts b/sop-website/sop-website-frontend/src/layout/components/lay-search/types.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-setting/index.vue b/sop-website/sop-website-frontend/src/layout/components/lay-setting/index.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-sidebar/NavHorizontal.vue b/sop-website/sop-website-frontend/src/layout/components/lay-sidebar/NavHorizontal.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-sidebar/NavMix.vue b/sop-website/sop-website-frontend/src/layout/components/lay-sidebar/NavMix.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-sidebar/NavVertical.vue b/sop-website/sop-website-frontend/src/layout/components/lay-sidebar/NavVertical.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-sidebar/components/SidebarBreadCrumb.vue b/sop-website/sop-website-frontend/src/layout/components/lay-sidebar/components/SidebarBreadCrumb.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-sidebar/components/SidebarCenterCollapse.vue b/sop-website/sop-website-frontend/src/layout/components/lay-sidebar/components/SidebarCenterCollapse.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-sidebar/components/SidebarExtraIcon.vue b/sop-website/sop-website-frontend/src/layout/components/lay-sidebar/components/SidebarExtraIcon.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-sidebar/components/SidebarFullScreen.vue b/sop-website/sop-website-frontend/src/layout/components/lay-sidebar/components/SidebarFullScreen.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-sidebar/components/SidebarItem.vue b/sop-website/sop-website-frontend/src/layout/components/lay-sidebar/components/SidebarItem.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-sidebar/components/SidebarLeftCollapse.vue b/sop-website/sop-website-frontend/src/layout/components/lay-sidebar/components/SidebarLeftCollapse.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-sidebar/components/SidebarLinkItem.vue b/sop-website/sop-website-frontend/src/layout/components/lay-sidebar/components/SidebarLinkItem.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-sidebar/components/SidebarLogo.vue b/sop-website/sop-website-frontend/src/layout/components/lay-sidebar/components/SidebarLogo.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-sidebar/components/SidebarTopCollapse.vue b/sop-website/sop-website-frontend/src/layout/components/lay-sidebar/components/SidebarTopCollapse.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-tag/components/TagChrome.vue b/sop-website/sop-website-frontend/src/layout/components/lay-tag/components/TagChrome.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-tag/index.scss b/sop-website/sop-website-frontend/src/layout/components/lay-tag/index.scss old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/components/lay-tag/index.vue b/sop-website/sop-website-frontend/src/layout/components/lay-tag/index.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/frame.vue b/sop-website/sop-website-frontend/src/layout/frame.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/hooks/useBoolean.ts b/sop-website/sop-website-frontend/src/layout/hooks/useBoolean.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/hooks/useDataThemeChange.ts b/sop-website/sop-website-frontend/src/layout/hooks/useDataThemeChange.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/hooks/useLayout.ts b/sop-website/sop-website-frontend/src/layout/hooks/useLayout.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/hooks/useMultiFrame.ts b/sop-website/sop-website-frontend/src/layout/hooks/useMultiFrame.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/hooks/useNav.ts b/sop-website/sop-website-frontend/src/layout/hooks/useNav.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/hooks/useTag.ts b/sop-website/sop-website-frontend/src/layout/hooks/useTag.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/hooks/useTranslationLang.ts b/sop-website/sop-website-frontend/src/layout/hooks/useTranslationLang.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/index.vue b/sop-website/sop-website-frontend/src/layout/index.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/redirect.vue b/sop-website/sop-website-frontend/src/layout/redirect.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/theme/index.ts b/sop-website/sop-website-frontend/src/layout/theme/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/layout/types.ts b/sop-website/sop-website-frontend/src/layout/types.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/main.ts b/sop-website/sop-website-frontend/src/main.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/model/enum/index.ts b/sop-website/sop-website-frontend/src/model/enum/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/model/index.ts b/sop-website/sop-website-frontend/src/model/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/plugins/echarts.ts b/sop-website/sop-website-frontend/src/plugins/echarts.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/plugins/elementPlus.ts b/sop-website/sop-website-frontend/src/plugins/elementPlus.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/plugins/i18n.ts b/sop-website/sop-website-frontend/src/plugins/i18n.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/router/index.ts b/sop-website/sop-website-frontend/src/router/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/router/modules/error.ts b/sop-website/sop-website-frontend/src/router/modules/error.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/router/modules/home.ts b/sop-website/sop-website-frontend/src/router/modules/home.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/router/modules/remaining.ts b/sop-website/sop-website-frontend/src/router/modules/remaining.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/router/utils.ts b/sop-website/sop-website-frontend/src/router/utils.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/store/index.ts b/sop-website/sop-website-frontend/src/store/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/store/modules/app.ts b/sop-website/sop-website-frontend/src/store/modules/app.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/store/modules/epTheme.ts b/sop-website/sop-website-frontend/src/store/modules/epTheme.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/store/modules/multiTags.ts b/sop-website/sop-website-frontend/src/store/modules/multiTags.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/store/modules/permission.ts b/sop-website/sop-website-frontend/src/store/modules/permission.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/store/modules/settings.ts b/sop-website/sop-website-frontend/src/store/modules/settings.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/store/modules/user.ts b/sop-website/sop-website-frontend/src/store/modules/user.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/store/types.ts b/sop-website/sop-website-frontend/src/store/types.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/store/utils.ts b/sop-website/sop-website-frontend/src/store/utils.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/style/dark.scss b/sop-website/sop-website-frontend/src/style/dark.scss old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/style/element-plus.scss b/sop-website/sop-website-frontend/src/style/element-plus.scss old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/style/index.scss b/sop-website/sop-website-frontend/src/style/index.scss old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/style/login.css b/sop-website/sop-website-frontend/src/style/login.css old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/style/reset.scss b/sop-website/sop-website-frontend/src/style/reset.scss old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/style/sidebar.scss b/sop-website/sop-website-frontend/src/style/sidebar.scss old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/style/tailwind.css b/sop-website/sop-website-frontend/src/style/tailwind.css old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/style/transition.scss b/sop-website/sop-website-frontend/src/style/transition.scss old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/utils/auth.ts b/sop-website/sop-website-frontend/src/utils/auth.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/utils/globalPolyfills.ts b/sop-website/sop-website-frontend/src/utils/globalPolyfills.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/utils/http/index.ts b/sop-website/sop-website-frontend/src/utils/http/index.ts old mode 100644 new mode 100755 index c69aac7a..1d63071e --- a/sop-website/sop-website-frontend/src/utils/http/index.ts +++ b/sop-website/sop-website-frontend/src/utils/http/index.ts @@ -15,6 +15,8 @@ import { getToken, formatToken } from "@/utils/auth"; import { useUserStoreHook } from "@/store/modules/user"; import { ElMessage } from "element-plus"; +const isDev = process.env.NODE_ENV === "development"; + export const baseUrl = (url: string) => { if (!url) { throw new Error("url不能为空"); @@ -22,7 +24,7 @@ export const baseUrl = (url: string) => { if (url.startsWith("/")) { url = url.substring(1); } - return `/api/${url}`; + return isDev ? `/api/${url}` : `/${url}`; }; export const createUrl = (data: object) => { diff --git a/sop-website/sop-website-frontend/src/utils/http/types.d.ts b/sop-website/sop-website-frontend/src/utils/http/types.d.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/utils/localforage/index.ts b/sop-website/sop-website-frontend/src/utils/localforage/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/utils/localforage/types.d.ts b/sop-website/sop-website-frontend/src/utils/localforage/types.d.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/utils/message.ts b/sop-website/sop-website-frontend/src/utils/message.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/utils/mitt.ts b/sop-website/sop-website-frontend/src/utils/mitt.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/utils/preventDefault.ts b/sop-website/sop-website-frontend/src/utils/preventDefault.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/utils/print.ts b/sop-website/sop-website-frontend/src/utils/print.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/utils/progress/index.ts b/sop-website/sop-website-frontend/src/utils/progress/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/utils/propTypes.ts b/sop-website/sop-website-frontend/src/utils/propTypes.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/utils/responsive.ts b/sop-website/sop-website-frontend/src/utils/responsive.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/utils/sso.ts b/sop-website/sop-website-frontend/src/utils/sso.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/utils/tree.ts b/sop-website/sop-website-frontend/src/utils/tree.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/views/doc/api/index.ts b/sop-website/sop-website-frontend/src/views/doc/api/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/views/doc/api/index.vue b/sop-website/sop-website-frontend/src/views/doc/api/index.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/views/doc/sign/index.ts b/sop-website/sop-website-frontend/src/views/doc/sign/index.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/views/doc/sign/index.vue b/sop-website/sop-website-frontend/src/views/doc/sign/index.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/views/error/403.vue b/sop-website/sop-website-frontend/src/views/error/403.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/views/error/404.vue b/sop-website/sop-website-frontend/src/views/error/404.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/views/error/500.vue b/sop-website/sop-website-frontend/src/views/error/500.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/views/login/index.vue b/sop-website/sop-website-frontend/src/views/login/index.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/views/login/utils/motion.ts b/sop-website/sop-website-frontend/src/views/login/utils/motion.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/views/login/utils/rule.ts b/sop-website/sop-website-frontend/src/views/login/utils/rule.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/views/login/utils/static.ts b/sop-website/sop-website-frontend/src/views/login/utils/static.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/src/views/welcome/index.vue b/sop-website/sop-website-frontend/src/views/welcome/index.vue old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/stylelint.config.js b/sop-website/sop-website-frontend/stylelint.config.js old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/tailwind.config.ts b/sop-website/sop-website-frontend/tailwind.config.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/tsconfig.json b/sop-website/sop-website-frontend/tsconfig.json old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/types/directives.d.ts b/sop-website/sop-website-frontend/types/directives.d.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/types/global-components.d.ts b/sop-website/sop-website-frontend/types/global-components.d.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/types/global.d.ts b/sop-website/sop-website-frontend/types/global.d.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/types/index.d.ts b/sop-website/sop-website-frontend/types/index.d.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/types/router.d.ts b/sop-website/sop-website-frontend/types/router.d.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/types/shims-tsx.d.ts b/sop-website/sop-website-frontend/types/shims-tsx.d.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/types/shims-vue.d.ts b/sop-website/sop-website-frontend/types/shims-vue.d.ts old mode 100644 new mode 100755 diff --git a/sop-website/sop-website-frontend/vite.config.ts b/sop-website/sop-website-frontend/vite.config.ts old mode 100644 new mode 100755 diff --git a/sop.sql b/sop.sql old mode 100644 new mode 100755