diff --git a/.gitignore b/.gitignore index 877ad0b..d68c8a4 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,8 @@ target/ Thumbs.db Servers .metadata +/.gitee/ISSUE_TEMPLATE/config.yml +/.gitee/ISSUE_TEMPLATE/issue.yml +/.github/workflows/image.yml +/.github/workflows/maven.yml +/.github/workflows/mirror.yml diff --git a/README.md b/README.md index 1a491f7..5a847ec 100644 --- a/README.md +++ b/README.md @@ -1,40 +1,3 @@ -

- Build Status - Coverage Status - Downloads - Downloads - -

- -## 分支说明 - -- master: java8 + springboot 2.7 + springcloud 2021 -- jdk17: java17 + springboot 3.2 + springcloud 2023 -- boot(单体版本): java17 + springboot 3.2 - -## 系统说明 - -- 基于 Spring Cloud 、Spring Boot、 OAuth2 的 RBAC **权限管理系统** -- 基于数据驱动视图的理念封装 element-plus，即使没有 vue 的使用经验也能快速上手 -- 提供对常见容器化支持 Docker、Kubernetes、Rancher2 支持 -- 提供 lambda 、stream api 、webflux 的生产实践 - -## 文档视频 - -[ 🚀🚀🚀 低代码数据可视化](http://datav.pig4cloud.com) - -[ 配套文档 wiki.pig4cloud.com](https://wiki.pig4cloud.com) - -[ 配套视频 tv.pig4cloud.com](https://www.bilibili.com/video/BV12t411B7e9) - -[PIGX 在线体验 pigx.pigx.top](http://pigx.pigx.top) - -[产品白皮书 paper.pig4cloud.com](https://paper.pig4cloud.com) - -## 微信群 [禁广告] - -![](https://minio.pigx.top/oss/1648184189.png) - ## 快速开始 @@ -51,41 +14,35 @@ ### 模块说明 -```lua -pig-ui -- https://gitee.com/log4j/pig-ui - -pig -├── pig-auth -- 授权服务提供[3000] -└── pig-common -- 系统公共模块 - ├── pig-common-bom -- 全局依赖管理控制 - ├── pig-common-core -- 公共工具类核心包 - ├── pig-common-datasource -- 动态数据源包 - ├── pig-common-log -- 日志服务 - ├── pig-common-oss -- 文件上传工具类 - ├── pig-common-mybatis -- mybatis 扩展封装 - ├── pig-common-seata -- 分布式事务 - ├── pig-common-security -- 安全工具类 - ├── pig-common-swagger -- 接口文档 - ├── pig-common-feign -- feign 扩展封装 - └── pig-common-xss -- xss 安全封装 -├── pig-register -- Nacos Server[8848] -├── pig-gateway -- Spring Cloud Gateway网关[9999] -└── pig-upms -- 通用用户权限管理模块 - └── pig-upms-api -- 通用用户权限管理系统公共api模块 - └── pig-upms-biz -- 通用用户权限管理系统业务处理模块[4000] -└── pig-visual - └── pig-monitor -- 服务监控 [5001] - ├── pig-codegen -- 图形化代码生成 [5002] - └── pig-quartz -- 定时任务管理台 [5007] +rax-web +├── auth -- 授权服务提供[3000] +└── common -- 系统公共模块 + ├── common-bom -- 全局依赖管理控制 + ├── common-core -- 公共工具类核心包 + ├── common-datasource -- 动态数据源包 + ├── common-log -- 日志服务 + ├── common-oss -- 文件上传工具类 + ├── common-mybatis -- mybatis 扩展封装 + ├── common-seata -- 分布式事务 + ├── common-security -- 安全工具类 + ├── common-swagger -- 接口文档 + ├── common-feign -- feign 扩展封装 + └── common-xss -- xss 安全封装 +├── register -- Nacos Server[8848] +├── gateway -- Spring Cloud Gateway网关[9999] +└── upms -- 通用用户权限管理模块 + └── upms-api -- 通用用户权限管理系统公共api模块 + └── upms-biz -- 通用用户权限管理系统业务处理模块[4000] +└── visual + └── monitor -- 服务监控 [5001] + ├── codegen -- 图形化代码生成 [5002] + └── quartz -- 定时任务管理台 [5007] ``` ### 本地开发 运行 -pig 提供了详细的[部署文档 wiki.pig4cloud.com](https://www.yuque.com/pig4cloud/pig/vsdox9)，包括开发环境安装、服务端代码运行、前端代码运行等。 - 请务必**完全按照**文档部署运行章节 进行操作，减少踩坑弯路！！ - ### Docker 运行 ``` @@ -103,47 +60,4 @@ cd pig-ui && npm install -g cnpm --registry=https://registry.npm.taobao.org cnpm install && cnpm run build:docker && cd docker && docker-compose up -d ``` -## 免费公开课 - - - - - - - - - -
- -## 开源共建 - -### 开源协议 - -pig 开源软件遵循 [Apache 2.0 协议](https://www.apache.org/licenses/LICENSE-2.0.html)。 -允许商业使用，但务必保留类作者、Copyright 信息。 - -![](https://minio.pigx.top/oss/1655474288.jpg) - -### 其他说明 - -1. 欢迎提交 [PR](https://dwz.cn/2KURd5Vf)，注意对应提交对应 `dev` 分支 - 代码规范 [spring-javaformat](https://github.com/spring-io/spring-javaformat) - -
- 代码规范说明 - - 1. 由于 spring-javaformat - 强制所有代码按照指定格式排版，未按此要求提交的代码将不能通过合并（打包） - 2. 如果使用 IntelliJ IDEA - 开发，请安装自动格式化软件 - spring-javaformat-intellij-idea-plugin - 3. 其他开发工具，请参考 - spring-javaformat - 说明，或`提交代码前`在项目根目录运行下列命令（需要开发者电脑支持`mvn`命令）进行代码格式化 - ``` - mvn spring-javaformat:apply - ``` -
- -2. 欢迎提交 [issue](https://gitee.com/log4j/pig/issues)，请写清楚遇到问题的原因、开发环境、复显步骤。 diff --git a/pig-auth/Dockerfile b/auth/Dockerfile similarity index 81% rename from pig-auth/Dockerfile rename to auth/Dockerfile index 76f09a2..c21ed54 100644 --- a/pig-auth/Dockerfile +++ b/auth/Dockerfile @@ -1,8 +1,8 @@ FROM alibabadragonwell/dragonwell:17-anolis -WORKDIR /pig-auth +WORKDIR /auth -ARG JAR_FILE=target/pig-auth.jar +ARG JAR_FILE=target/auth.jar COPY ${JAR_FILE} app.jar diff --git a/auth/pom.xml b/auth/pom.xml new file mode 100644 index 0000000..a48394a --- /dev/null +++ b/auth/pom.xml @@ -0,0 +1,63 @@ + + + + 4.0.0 + + com.rax + rax + 3.7.3 + + + auth + jar + + rax 认证授权中心，基于 spring security oAuth2 + + + + + com.rax + common-feign + + + + com.rax + upms-api + + + + com.rax + common-security + + + + org.springframework.boot + spring-boot-starter-security + + + + com.rax + common-log + + + + io.springboot.plugin + captcha-core + ${captcha.version} + + + + cn.hutool + hutool-captcha + ${hutool-captcha.version} + + + + + cn.hutool + hutool-crypto + + + + diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/AuthorizationServerConfiguration.java b/auth/src/main/java/com/rax/auth/config/AuthorizationServerConfiguration.java similarity index 75% rename from pig-auth/src/main/java/com/pig4cloud/pig/auth/config/AuthorizationServerConfiguration.java rename to auth/src/main/java/com/rax/auth/config/AuthorizationServerConfiguration.java index 166ac3e..605bb6d 100644 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/AuthorizationServerConfiguration.java +++ b/auth/src/main/java/com/rax/auth/config/AuthorizationServerConfiguration.java @@ -1,36 +1,17 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ +package com.rax.auth.config; -package com.pig4cloud.pig.auth.config; - -import com.pig4cloud.pig.auth.support.CustomeOAuth2AccessTokenGenerator; -import com.pig4cloud.pig.auth.support.core.CustomeOAuth2TokenCustomizer; -import com.pig4cloud.pig.auth.support.core.PigDaoAuthenticationProvider; -import com.pig4cloud.pig.auth.support.handler.*; -import com.pig4cloud.pig.auth.support.password.OAuth2ResourceOwnerPasswordAuthenticationConverter; -import com.pig4cloud.pig.auth.support.password.OAuth2ResourceOwnerPasswordAuthenticationProvider; -import com.pig4cloud.pig.auth.support.sms.OAuth2ResourceOwnerSmsAuthenticationConverter; -import com.pig4cloud.pig.auth.support.sms.OAuth2ResourceOwnerSmsAuthenticationProvider; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import com.pig4cloud.pig.common.security.component.PermitAllUrlProperties; -import com.pig4cloud.pig.common.security.component.PigBearerTokenExtractor; -import com.pig4cloud.pig.common.security.component.ResourceAuthExceptionEntryPoint; +import com.rax.auth.support.CustomeOAuth2AccessTokenGenerator; +import com.rax.auth.support.core.CustomeOAuth2TokenCustomizer; +import com.rax.auth.support.core.RaxDaoAuthenticationProvider; +import com.rax.auth.support.handler.*; +import com.rax.auth.support.password.OAuth2ResourceOwnerPasswordAuthenticationConverter; +import com.rax.auth.support.password.OAuth2ResourceOwnerPasswordAuthenticationProvider; +import com.rax.auth.support.sms.OAuth2ResourceOwnerSmsAuthenticationConverter; +import com.rax.auth.support.sms.OAuth2ResourceOwnerSmsAuthenticationProvider; +import com.rax.common.core.constant.SecurityConstants; +import com.rax.common.security.component.PermitAllUrlProperties; +import com.rax.common.security.component.RaxBearerTokenExtractor; +import com.rax.common.security.component.ResourceAuthExceptionEntryPoint; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -40,7 +21,6 @@ import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; -import org.springframework.security.config.annotation.web.configurers.CorsConfigurer; import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer; import org.springframework.security.oauth2.server.authorization.OAuth2AuthorizationService; import org.springframework.security.oauth2.server.authorization.config.annotation.web.configurers.OAuth2AuthorizationServerConfigurer; @@ -64,10 +44,6 @@ import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import java.time.Duration; import java.util.Arrays; -/** - * @author lengleng - * @date 2018/6/22 认证服务器配置 - */ @Configuration @RequiredArgsConstructor public class AuthorizationServerConfiguration { @@ -76,24 +52,24 @@ public class AuthorizationServerConfiguration { protected final ResourceAuthExceptionEntryPoint resourceAuthExceptionEntryPoint; - private final PigBearerTokenExtractor pigBearerTokenExtractor; + private final RaxBearerTokenExtractor raxBearerTokenExtractor; private final OpaqueTokenIntrospector customOpaqueTokenIntrospector; private final PermitAllUrlProperties permitAllUrl; - private final PigLoginPreFilter pigLoginPreFilter; + private final RaxLoginPreFilter raxLoginPreFilter; @Bean @Order(Ordered.HIGHEST_PRECEDENCE) public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http, - PigAuthenticationSuccessEventHandler successEventHandler, - PigAuthenticationFailureEventHandler failureEventHandler) throws Exception { + RaxAuthenticationSuccessEventHandler successEventHandler, + RaxAuthenticationFailureEventHandler failureEventHandler) throws Exception { OAuth2AuthorizationServerConfigurer authorizationServerConfigurer = new OAuth2AuthorizationServerConfigurer(); http.cors(httpSecurityCorsConfigurer -> httpSecurityCorsConfigurer.configurationSource(corsConfigurationSource())); - http.addFilterAfter(pigLoginPreFilter, UsernamePasswordAuthenticationFilter.class); + http.addFilterAfter(raxLoginPreFilter, UsernamePasswordAuthenticationFilter.class); http.with(authorizationServerConfigurer.tokenEndpoint((tokenEndpoint) -> {// 个性化认证授权端点 tokenEndpoint.accessTokenRequestConverter(accessTokenRequestConverter()) // 注入自定义的授权认证Converter .accessTokenResponseHandler(successEventHandler) // 登录成功处理器 @@ -104,7 +80,7 @@ public class AuthorizationServerConfiguration { .consentPage(SecurityConstants.CUSTOM_CONSENT_PAGE_URI)), Customizer.withDefaults()) .with(authorizationServerConfigurer.authorizationService(authorizationService)// redis存储token的实现 .authorizationServerSettings( - AuthorizationServerSettings.builder().issuer(SecurityConstants.PROJECT_LICENSE).build()), + AuthorizationServerSettings.builder()/*.issuer(SecurityConstants.PROJECT_LICENSE)*/.build()), Customizer.withDefaults()); AntPathRequestMatcher[] requestMatchers = permitAllUrl.getUrls() @@ -120,14 +96,14 @@ public class AuthorizationServerConfiguration { .oauth2ResourceServer( oauth2 -> oauth2.opaqueToken(token -> token.introspector(customOpaqueTokenIntrospector)) .authenticationEntryPoint(resourceAuthExceptionEntryPoint) - .bearerTokenResolver(pigBearerTokenExtractor)) + .bearerTokenResolver(raxBearerTokenExtractor)) .exceptionHandling(configurer -> configurer.authenticationEntryPoint(resourceAuthExceptionEntryPoint)) .headers(headers -> headers.frameOptions(HeadersConfigurer.FrameOptionsConfig::disable)) .csrf(AbstractHttpConfigurer::disable); http.with(authorizationServerConfigurer.authorizationService(authorizationService)// redis存储token的实现 .authorizationServerSettings( - AuthorizationServerSettings.builder().issuer(SecurityConstants.PROJECT_LICENSE).build()), + AuthorizationServerSettings.builder()/*.issuer(SecurityConstants.PROJECT_LICENSE)*/.build()), Customizer.withDefaults()); DefaultSecurityFilterChain securityFilterChain = http.build(); @@ -190,7 +166,7 @@ public class AuthorizationServerConfiguration { authenticationManager, authorizationService, oAuth2TokenGenerator()); // 处理 UsernamePasswordAuthenticationToken - http.authenticationProvider(new PigDaoAuthenticationProvider()); + http.authenticationProvider(new RaxDaoAuthenticationProvider()); // 处理 OAuth2ResourceOwnerPasswordAuthenticationToken http.authenticationProvider(resourceOwnerPasswordAuthenticationProvider); // 处理 OAuth2ResourceOwnerSmsAuthenticationToken @@ -206,7 +182,7 @@ public class AuthorizationServerConfiguration { configuration.setAllowedMethods(Arrays.asList("*")); configuration.setAllowedHeaders(Arrays.asList("*")); configuration.setMaxAge(Duration.ofHours(1)); - source.registerCorsConfiguration("/static/**",configuration); + source.registerCorsConfiguration("/static/**", configuration); return source; } diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/endpoint/ImageCodeEndpoint.java b/auth/src/main/java/com/rax/auth/endpoint/ImageCodeEndpoint.java similarity index 54% rename from pig-auth/src/main/java/com/pig4cloud/pig/auth/endpoint/ImageCodeEndpoint.java rename to auth/src/main/java/com/rax/auth/endpoint/ImageCodeEndpoint.java index 6a89003..aae2eb7 100644 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/endpoint/ImageCodeEndpoint.java +++ b/auth/src/main/java/com/rax/auth/endpoint/ImageCodeEndpoint.java @@ -1,9 +1,12 @@ -package com.pig4cloud.pig.auth.endpoint; +package com.rax.auth.endpoint; -import com.pig4cloud.pig.common.core.constant.CacheConstants; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import com.pig4cloud.pig.common.security.annotation.Inner; +import cn.hutool.captcha.CaptchaUtil; +import cn.hutool.captcha.CircleCaptcha; +import com.rax.common.core.constant.CacheConstants; +import com.rax.common.core.constant.SecurityConstants; +import com.rax.common.security.annotation.Inner; import io.springboot.captcha.ArithmeticCaptcha; +import jakarta.servlet.ServletOutputStream; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; @@ -12,6 +15,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; import java.util.concurrent.TimeUnit; /** @@ -42,9 +47,20 @@ public class ImageCodeEndpoint { String result = captcha.text(); redisTemplate.opsForValue() - .set(CacheConstants.DEFAULT_CODE_KEY + randomStr, result, SecurityConstants.CODE_TIME, TimeUnit.SECONDS); + .set(CacheConstants.DEFAULT_CODE_KEY + randomStr, result, SecurityConstants.CODE_TIME, TimeUnit.SECONDS); // 转换流信息写出 captcha.out(response.getOutputStream()); } + @SneakyThrows + @GetMapping("/textImage") + public void textImage(String randomStr, HttpServletResponse response) { + CircleCaptcha captcha = CaptchaUtil.createCircleCaptcha(200, 100, 4, 50); + String code = captcha.getCode(); + redisTemplate.opsForValue().set(CacheConstants.DEFAULT_CODE_KEY + randomStr, code, SecurityConstants.CODE_TIME, TimeUnit.SECONDS); + BufferedImage image = captcha.getImage(); + ServletOutputStream outputStream = response.getOutputStream(); + ImageIO.write(image, "png", outputStream); + } + } diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/endpoint/PigTokenEndpoint.java b/auth/src/main/java/com/rax/auth/endpoint/RaxTokenEndpoint.java similarity index 83% rename from pig-auth/src/main/java/com/pig4cloud/pig/auth/endpoint/PigTokenEndpoint.java rename to auth/src/main/java/com/rax/auth/endpoint/RaxTokenEndpoint.java index c02fe53..a66c148 100644 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/endpoint/PigTokenEndpoint.java +++ b/auth/src/main/java/com/rax/auth/endpoint/RaxTokenEndpoint.java @@ -1,40 +1,24 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.auth.endpoint; +package com.rax.auth.endpoint; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.TemporalAccessorUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pig4cloud.pig.admin.api.entity.SysOauthClientDetails; -import com.pig4cloud.pig.admin.api.feign.RemoteClientDetailsService; -import com.pig4cloud.pig.admin.api.vo.TokenVo; -import com.pig4cloud.pig.auth.support.handler.PigAuthenticationFailureEventHandler; -import com.pig4cloud.pig.common.core.constant.CacheConstants; -import com.pig4cloud.pig.common.core.constant.CommonConstants; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.core.util.RetOps; -import com.pig4cloud.pig.common.core.util.SpringContextHolder; -import com.pig4cloud.pig.common.security.annotation.Inner; -import com.pig4cloud.pig.common.security.util.OAuth2EndpointUtils; -import com.pig4cloud.pig.common.security.util.OAuth2ErrorCodesExpand; -import com.pig4cloud.pig.common.security.util.OAuthClientException; +import com.rax.admin.api.entity.SysOauthClientDetails; +import com.rax.admin.api.feign.RemoteClientDetailsService; +import com.rax.admin.api.vo.TokenVo; +import com.rax.auth.support.handler.RaxAuthenticationFailureEventHandler; +import com.rax.common.core.constant.CacheConstants; +import com.rax.common.core.constant.CommonConstants; +import com.rax.common.core.constant.SecurityConstants; +import com.rax.common.core.util.R; +import com.rax.common.core.util.RetOps; +import com.rax.common.core.util.SpringContextHolder; +import com.rax.common.security.annotation.Inner; +import com.rax.common.security.util.OAuth2EndpointUtils; +import com.rax.common.security.util.OAuth2ErrorCodesExpand; +import com.rax.common.security.util.OAuthClientException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; @@ -76,11 +60,11 @@ import java.util.stream.Collectors; @RestController @RequiredArgsConstructor @RequestMapping("/token") -public class PigTokenEndpoint { +public class RaxTokenEndpoint { private final HttpMessageConverter accessTokenHttpResponseConverter = new OAuth2AccessTokenResponseHttpMessageConverter(); - private final AuthenticationFailureHandler authenticationFailureHandler = new PigAuthenticationFailureEventHandler(); + private final AuthenticationFailureHandler authenticationFailureHandler = new RaxAuthenticationFailureEventHandler(); private final OAuth2AuthorizationService authorizationService; diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/CustomeOAuth2AccessTokenGenerator.java b/auth/src/main/java/com/rax/auth/support/CustomeOAuth2AccessTokenGenerator.java similarity index 99% rename from pig-auth/src/main/java/com/pig4cloud/pig/auth/support/CustomeOAuth2AccessTokenGenerator.java rename to auth/src/main/java/com/rax/auth/support/CustomeOAuth2AccessTokenGenerator.java index af438da..143191f 100644 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/CustomeOAuth2AccessTokenGenerator.java +++ b/auth/src/main/java/com/rax/auth/support/CustomeOAuth2AccessTokenGenerator.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.auth.support; +package com.rax.auth.support; import org.springframework.lang.Nullable; import org.springframework.security.crypto.keygen.Base64StringKeyGenerator; diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationConverter.java b/auth/src/main/java/com/rax/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationConverter.java similarity index 96% rename from pig-auth/src/main/java/com/pig4cloud/pig/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationConverter.java rename to auth/src/main/java/com/rax/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationConverter.java index ea1ce77..f381ed8 100644 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationConverter.java +++ b/auth/src/main/java/com/rax/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationConverter.java @@ -1,6 +1,6 @@ -package com.pig4cloud.pig.auth.support.base; +package com.rax.auth.support.base; -import com.pig4cloud.pig.common.security.util.OAuth2EndpointUtils; +import com.rax.common.security.util.OAuth2EndpointUtils; import jakarta.servlet.http.HttpServletRequest; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationProvider.java b/auth/src/main/java/com/rax/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationProvider.java similarity index 98% rename from pig-auth/src/main/java/com/pig4cloud/pig/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationProvider.java rename to auth/src/main/java/com/rax/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationProvider.java index 22044ec..bb302ac 100644 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationProvider.java +++ b/auth/src/main/java/com/rax/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationProvider.java @@ -1,8 +1,8 @@ -package com.pig4cloud.pig.auth.support.base; +package com.rax.auth.support.base; import cn.hutool.extra.spring.SpringUtil; -import com.pig4cloud.pig.common.security.util.OAuth2ErrorCodesExpand; -import com.pig4cloud.pig.common.security.util.ScopeException; +import com.rax.common.security.util.OAuth2ErrorCodesExpand; +import com.rax.common.security.util.ScopeException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.context.support.MessageSourceAccessor; diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationToken.java b/auth/src/main/java/com/rax/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationToken.java similarity index 97% rename from pig-auth/src/main/java/com/pig4cloud/pig/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationToken.java rename to auth/src/main/java/com/rax/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationToken.java index a995e4f..d359200 100644 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationToken.java +++ b/auth/src/main/java/com/rax/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationToken.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.auth.support.base; +package com.rax.auth.support.base; import lombok.Getter; import org.springframework.lang.Nullable; diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/base/package-info.java b/auth/src/main/java/com/rax/auth/support/base/package-info.java similarity index 54% rename from pig-auth/src/main/java/com/pig4cloud/pig/auth/support/base/package-info.java rename to auth/src/main/java/com/rax/auth/support/base/package-info.java index c4a3df8..75dccae 100644 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/base/package-info.java +++ b/auth/src/main/java/com/rax/auth/support/base/package-info.java @@ -1,4 +1,4 @@ /** * 自定义认证模式接入的抽象实现 */ -package com.pig4cloud.pig.auth.support.base; +package com.rax.auth.support.base; diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/core/CustomeOAuth2TokenCustomizer.java b/auth/src/main/java/com/rax/auth/support/core/CustomeOAuth2TokenCustomizer.java similarity index 66% rename from pig-auth/src/main/java/com/pig4cloud/pig/auth/support/core/CustomeOAuth2TokenCustomizer.java rename to auth/src/main/java/com/rax/auth/support/core/CustomeOAuth2TokenCustomizer.java index 400bc1d..e8f27e2 100644 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/core/CustomeOAuth2TokenCustomizer.java +++ b/auth/src/main/java/com/rax/auth/support/core/CustomeOAuth2TokenCustomizer.java @@ -1,7 +1,7 @@ -package com.pig4cloud.pig.auth.support.core; +package com.rax.auth.support.core; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import com.pig4cloud.pig.common.security.service.PigUser; +import com.rax.common.core.constant.SecurityConstants; +import com.rax.common.security.service.RaxUser; import org.springframework.security.oauth2.server.authorization.token.OAuth2TokenClaimsContext; import org.springframework.security.oauth2.server.authorization.token.OAuth2TokenClaimsSet; import org.springframework.security.oauth2.server.authorization.token.OAuth2TokenCustomizer; @@ -21,7 +21,7 @@ public class CustomeOAuth2TokenCustomizer implements OAuth2TokenCustomizer userDetailsServiceMap = SpringUtil - .getBeansOfType(PigUserDetailsService.class); + Map userDetailsServiceMap = SpringUtil + .getBeansOfType(RaxUserDetailsService.class); String finalClientId = clientId; - Optional optional = userDetailsServiceMap.values() + Optional optional = userDetailsServiceMap.values() .stream() .filter(service -> service.support(finalClientId, grantType)) .max(Comparator.comparingInt(Ordered::getOrder)); @@ -205,7 +205,7 @@ public class PigDaoAuthenticationProvider extends AbstractUserDetailsAuthenticat private String decode(String presentedPassword) { // 构建前端对应解密AES 因子 String key = SpringContextHolder.getBean(Environment.class) - .getProperty("gateway.encodeKey", "pigxpigxpigxpigx"); + .getProperty("gateway.encodeKey", "raxsraxsraxsraxs"); AES aes = new AES(Mode.CFB, Padding.NoPadding, new SecretKeySpec(key.getBytes(), "AES"), new IvParameterSpec(key.getBytes())); return aes.decryptStr(presentedPassword); diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/handler/FormAuthenticationFailureHandler.java b/auth/src/main/java/com/rax/auth/support/handler/FormAuthenticationFailureHandler.java similarity index 62% rename from pig-auth/src/main/java/com/pig4cloud/pig/auth/support/handler/FormAuthenticationFailureHandler.java rename to auth/src/main/java/com/rax/auth/support/handler/FormAuthenticationFailureHandler.java index bf6e425..fd3ad57 100644 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/handler/FormAuthenticationFailureHandler.java +++ b/auth/src/main/java/com/rax/auth/support/handler/FormAuthenticationFailureHandler.java @@ -1,24 +1,8 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.auth.support.handler; +package com.rax.auth.support.handler; import cn.hutool.core.util.CharsetUtil; import cn.hutool.http.HttpUtil; -import com.pig4cloud.pig.common.core.util.WebUtils; +import com.rax.common.core.util.WebUtils; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.SneakyThrows; diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/handler/PigAuthenticationFailureEventHandler.java b/auth/src/main/java/com/rax/auth/support/handler/RaxAuthenticationFailureEventHandler.java similarity index 73% rename from pig-auth/src/main/java/com/pig4cloud/pig/auth/support/handler/PigAuthenticationFailureEventHandler.java rename to auth/src/main/java/com/rax/auth/support/handler/RaxAuthenticationFailureEventHandler.java index a967d79..af27a33 100644 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/handler/PigAuthenticationFailureEventHandler.java +++ b/auth/src/main/java/com/rax/auth/support/handler/RaxAuthenticationFailureEventHandler.java @@ -1,31 +1,15 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.auth.support.handler; +package com.rax.auth.support.handler; import cn.hutool.core.util.StrUtil; -import com.pig4cloud.pig.admin.api.entity.SysLog; -import com.pig4cloud.pig.common.core.constant.CommonConstants; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import com.pig4cloud.pig.common.core.util.MsgUtils; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.core.util.SpringContextHolder; -import com.pig4cloud.pig.common.log.event.SysLogEvent; -import com.pig4cloud.pig.common.log.util.LogTypeEnum; -import com.pig4cloud.pig.common.log.util.SysLogUtils; +import com.rax.admin.api.entity.SysLog; +import com.rax.common.core.constant.CommonConstants; +import com.rax.common.core.constant.SecurityConstants; +import com.rax.common.core.util.MsgUtils; +import com.rax.common.core.util.R; +import com.rax.common.core.util.SpringContextHolder; +import com.rax.common.log.event.SysLogEvent; +import com.rax.common.log.util.LogTypeEnum; +import com.rax.common.log.util.SysLogUtils; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.SneakyThrows; @@ -48,7 +32,7 @@ import java.io.IOException; */ @Slf4j @Component -public class PigAuthenticationFailureEventHandler implements AuthenticationFailureHandler { +public class RaxAuthenticationFailureEventHandler implements AuthenticationFailureHandler { private final MappingJackson2HttpMessageConverter errorHttpResponseConverter = new MappingJackson2HttpMessageConverter(); diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/handler/PigAuthenticationSuccessEventHandler.java b/auth/src/main/java/com/rax/auth/support/handler/RaxAuthenticationSuccessEventHandler.java similarity index 75% rename from pig-auth/src/main/java/com/pig4cloud/pig/auth/support/handler/PigAuthenticationSuccessEventHandler.java rename to auth/src/main/java/com/rax/auth/support/handler/RaxAuthenticationSuccessEventHandler.java index ecb4499..89e3a92 100644 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/handler/PigAuthenticationSuccessEventHandler.java +++ b/auth/src/main/java/com/rax/auth/support/handler/RaxAuthenticationSuccessEventHandler.java @@ -1,31 +1,15 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.auth.support.handler; +package com.rax.auth.support.handler; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; -import com.pig4cloud.pig.admin.api.entity.SysLog; -import com.pig4cloud.pig.common.core.constant.CommonConstants; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import com.pig4cloud.pig.common.core.util.SpringContextHolder; -import com.pig4cloud.pig.common.log.event.SysLogEvent; -import com.pig4cloud.pig.common.log.util.SysLogUtils; -import com.pig4cloud.pig.common.security.component.PigCustomOAuth2AccessTokenResponseHttpMessageConverter; -import com.pig4cloud.pig.common.security.service.PigUser; +import com.rax.admin.api.entity.SysLog; +import com.rax.common.core.constant.CommonConstants; +import com.rax.common.core.constant.SecurityConstants; +import com.rax.common.core.util.SpringContextHolder; +import com.rax.common.log.event.SysLogEvent; +import com.rax.common.log.util.SysLogUtils; +import com.rax.common.security.component.RaxCustomOAuth2AccessTokenResponseHttpMessageConverter; +import com.rax.common.security.service.RaxUser; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.SneakyThrows; @@ -52,9 +36,9 @@ import java.util.Map; */ @Slf4j @Component -public class PigAuthenticationSuccessEventHandler implements AuthenticationSuccessHandler { +public class RaxAuthenticationSuccessEventHandler implements AuthenticationSuccessHandler { - private final HttpMessageConverter accessTokenHttpResponseConverter = new PigCustomOAuth2AccessTokenResponseHttpMessageConverter(); + private final HttpMessageConverter accessTokenHttpResponseConverter = new RaxCustomOAuth2AccessTokenResponseHttpMessageConverter(); /** * Called when a user has been successfully authenticated. @@ -71,7 +55,7 @@ public class PigAuthenticationSuccessEventHandler implements AuthenticationSucce Map map = accessTokenAuthentication.getAdditionalParameters(); if (MapUtil.isNotEmpty(map)) { // 发送异步日志事件 - PigUser userInfo = (PigUser) map.get(SecurityConstants.DETAILS_USER); + RaxUser userInfo = (RaxUser) map.get(SecurityConstants.DETAILS_USER); log.info("用户：{} 登录成功", userInfo.getName()); SecurityContextHolder.getContext().setAuthentication(accessTokenAuthentication); SysLog logVo = SysLogUtils.getSysLog(); diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/handler/PigLoginPreFilter.java b/auth/src/main/java/com/rax/auth/support/handler/RaxLoginPreFilter.java similarity index 87% rename from pig-auth/src/main/java/com/pig4cloud/pig/auth/support/handler/PigLoginPreFilter.java rename to auth/src/main/java/com/rax/auth/support/handler/RaxLoginPreFilter.java index 96fdcad..cd5dc28 100644 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/handler/PigLoginPreFilter.java +++ b/auth/src/main/java/com/rax/auth/support/handler/RaxLoginPreFilter.java @@ -1,16 +1,16 @@ -package com.pig4cloud.pig.auth.support.handler; +package com.rax.auth.support.handler; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.ContentType; import com.fasterxml.jackson.databind.ObjectMapper; -import com.pig4cloud.pig.common.core.constant.CacheConstants; -import com.pig4cloud.pig.common.core.constant.CommonConstants; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import com.pig4cloud.pig.common.core.exception.ValidateCodeException; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.core.util.SpringContextHolder; -import com.pig4cloud.pig.common.core.util.WebUtils; +import com.rax.common.core.constant.CacheConstants; +import com.rax.common.core.constant.CommonConstants; +import com.rax.common.core.constant.SecurityConstants; +import com.rax.common.core.exception.ValidateCodeException; +import com.rax.common.core.util.R; +import com.rax.common.core.util.SpringContextHolder; +import com.rax.common.core.util.WebUtils; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; @@ -30,15 +30,13 @@ import java.util.List; import java.util.Optional; /** - * @author lbw - * @date 2024-01-06 *

* 登录前置处理器： 前端密码传输密文解密，验证码处理 */ @Slf4j @Component @RequiredArgsConstructor -public class PigLoginPreFilter extends OncePerRequestFilter { +public class RaxLoginPreFilter extends OncePerRequestFilter { private final ObjectMapper objectMapper; diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/handler/PigLogoutSuccessEventHandler.java b/auth/src/main/java/com/rax/auth/support/handler/RaxLogoutSuccessEventHandler.java similarity index 62% rename from pig-auth/src/main/java/com/pig4cloud/pig/auth/support/handler/PigLogoutSuccessEventHandler.java rename to auth/src/main/java/com/rax/auth/support/handler/RaxLogoutSuccessEventHandler.java index cbd1086..95fe545 100644 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/handler/PigLogoutSuccessEventHandler.java +++ b/auth/src/main/java/com/rax/auth/support/handler/RaxLogoutSuccessEventHandler.java @@ -1,26 +1,10 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +package com.rax.auth.support.handler; -package com.pig4cloud.pig.auth.support.handler; - -import com.pig4cloud.pig.admin.api.entity.SysLog; -import com.pig4cloud.pig.common.core.util.SpringContextHolder; -import com.pig4cloud.pig.common.core.util.WebUtils; -import com.pig4cloud.pig.common.log.event.SysLogEvent; -import com.pig4cloud.pig.common.log.util.SysLogUtils; +import com.rax.admin.api.entity.SysLog; +import com.rax.common.core.util.SpringContextHolder; +import com.rax.common.core.util.WebUtils; +import com.rax.common.log.event.SysLogEvent; +import com.rax.common.log.util.SysLogUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.context.ApplicationListener; import org.springframework.http.HttpHeaders; @@ -30,14 +14,13 @@ import org.springframework.security.web.authentication.preauth.PreAuthenticatedA import org.springframework.stereotype.Component; /** - * @author zhangran * @date 2022-06-02 * * 事件机制处理退出相关 */ @Slf4j @Component -public class PigLogoutSuccessEventHandler implements ApplicationListener { +public class RaxLogoutSuccessEventHandler implements ApplicationListener { @Override public void onApplicationEvent(LogoutSuccessEvent event) { diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/handler/SsoLogoutSuccessHandler.java b/auth/src/main/java/com/rax/auth/support/handler/SsoLogoutSuccessHandler.java similarity index 96% rename from pig-auth/src/main/java/com/pig4cloud/pig/auth/support/handler/SsoLogoutSuccessHandler.java rename to auth/src/main/java/com/rax/auth/support/handler/SsoLogoutSuccessHandler.java index dc50726..b17581b 100644 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/handler/SsoLogoutSuccessHandler.java +++ b/auth/src/main/java/com/rax/auth/support/handler/SsoLogoutSuccessHandler.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.auth.support.handler; +package com.rax.auth.support.handler; import cn.hutool.core.util.StrUtil; import jakarta.servlet.http.HttpServletRequest; diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/password/OAuth2ResourceOwnerPasswordAuthenticationConverter.java b/auth/src/main/java/com/rax/auth/support/password/OAuth2ResourceOwnerPasswordAuthenticationConverter.java similarity index 91% rename from pig-auth/src/main/java/com/pig4cloud/pig/auth/support/password/OAuth2ResourceOwnerPasswordAuthenticationConverter.java rename to auth/src/main/java/com/rax/auth/support/password/OAuth2ResourceOwnerPasswordAuthenticationConverter.java index cd23146..8c21ef5 100644 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/password/OAuth2ResourceOwnerPasswordAuthenticationConverter.java +++ b/auth/src/main/java/com/rax/auth/support/password/OAuth2ResourceOwnerPasswordAuthenticationConverter.java @@ -1,7 +1,7 @@ -package com.pig4cloud.pig.auth.support.password; +package com.rax.auth.support.password; -import com.pig4cloud.pig.auth.support.base.OAuth2ResourceOwnerBaseAuthenticationConverter; -import com.pig4cloud.pig.common.security.util.OAuth2EndpointUtils; +import com.rax.auth.support.base.OAuth2ResourceOwnerBaseAuthenticationConverter; +import com.rax.common.security.util.OAuth2EndpointUtils; import jakarta.servlet.http.HttpServletRequest; import org.springframework.security.core.Authentication; import org.springframework.security.oauth2.core.AuthorizationGrantType; diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/password/OAuth2ResourceOwnerPasswordAuthenticationProvider.java b/auth/src/main/java/com/rax/auth/support/password/OAuth2ResourceOwnerPasswordAuthenticationProvider.java similarity index 95% rename from pig-auth/src/main/java/com/pig4cloud/pig/auth/support/password/OAuth2ResourceOwnerPasswordAuthenticationProvider.java rename to auth/src/main/java/com/rax/auth/support/password/OAuth2ResourceOwnerPasswordAuthenticationProvider.java index 00adb1c..460833a 100644 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/password/OAuth2ResourceOwnerPasswordAuthenticationProvider.java +++ b/auth/src/main/java/com/rax/auth/support/password/OAuth2ResourceOwnerPasswordAuthenticationProvider.java @@ -1,6 +1,6 @@ -package com.pig4cloud.pig.auth.support.password; +package com.rax.auth.support.password; -import com.pig4cloud.pig.auth.support.base.OAuth2ResourceOwnerBaseAuthenticationProvider; +import com.rax.auth.support.base.OAuth2ResourceOwnerBaseAuthenticationProvider; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.security.authentication.AuthenticationManager; diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/password/OAuth2ResourceOwnerPasswordAuthenticationToken.java b/auth/src/main/java/com/rax/auth/support/password/OAuth2ResourceOwnerPasswordAuthenticationToken.java similarity index 82% rename from pig-auth/src/main/java/com/pig4cloud/pig/auth/support/password/OAuth2ResourceOwnerPasswordAuthenticationToken.java rename to auth/src/main/java/com/rax/auth/support/password/OAuth2ResourceOwnerPasswordAuthenticationToken.java index 4679f09..99d65de 100644 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/password/OAuth2ResourceOwnerPasswordAuthenticationToken.java +++ b/auth/src/main/java/com/rax/auth/support/password/OAuth2ResourceOwnerPasswordAuthenticationToken.java @@ -1,6 +1,6 @@ -package com.pig4cloud.pig.auth.support.password; +package com.rax.auth.support.password; -import com.pig4cloud.pig.auth.support.base.OAuth2ResourceOwnerBaseAuthenticationToken; +import com.rax.auth.support.base.OAuth2ResourceOwnerBaseAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.oauth2.core.AuthorizationGrantType; diff --git a/auth/src/main/java/com/rax/auth/support/password/package-info.java b/auth/src/main/java/com/rax/auth/support/password/package-info.java new file mode 100644 index 0000000..e0f850b --- /dev/null +++ b/auth/src/main/java/com/rax/auth/support/password/package-info.java @@ -0,0 +1,4 @@ +/** + * 密码模式 + */ +package com.rax.auth.support.password; diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/sms/OAuth2ResourceOwnerSmsAuthenticationConverter.java b/auth/src/main/java/com/rax/auth/support/sms/OAuth2ResourceOwnerSmsAuthenticationConverter.java similarity index 86% rename from pig-auth/src/main/java/com/pig4cloud/pig/auth/support/sms/OAuth2ResourceOwnerSmsAuthenticationConverter.java rename to auth/src/main/java/com/rax/auth/support/sms/OAuth2ResourceOwnerSmsAuthenticationConverter.java index 457c40a..21e153b 100644 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/sms/OAuth2ResourceOwnerSmsAuthenticationConverter.java +++ b/auth/src/main/java/com/rax/auth/support/sms/OAuth2ResourceOwnerSmsAuthenticationConverter.java @@ -1,8 +1,8 @@ -package com.pig4cloud.pig.auth.support.sms; +package com.rax.auth.support.sms; -import com.pig4cloud.pig.auth.support.base.OAuth2ResourceOwnerBaseAuthenticationConverter; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import com.pig4cloud.pig.common.security.util.OAuth2EndpointUtils; +import com.rax.auth.support.base.OAuth2ResourceOwnerBaseAuthenticationConverter; +import com.rax.common.core.constant.SecurityConstants; +import com.rax.common.security.util.OAuth2EndpointUtils; import jakarta.servlet.http.HttpServletRequest; import org.springframework.security.core.Authentication; import org.springframework.security.oauth2.core.AuthorizationGrantType; diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/sms/OAuth2ResourceOwnerSmsAuthenticationProvider.java b/auth/src/main/java/com/rax/auth/support/sms/OAuth2ResourceOwnerSmsAuthenticationProvider.java similarity index 92% rename from pig-auth/src/main/java/com/pig4cloud/pig/auth/support/sms/OAuth2ResourceOwnerSmsAuthenticationProvider.java rename to auth/src/main/java/com/rax/auth/support/sms/OAuth2ResourceOwnerSmsAuthenticationProvider.java index 264d77c..6884942 100644 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/sms/OAuth2ResourceOwnerSmsAuthenticationProvider.java +++ b/auth/src/main/java/com/rax/auth/support/sms/OAuth2ResourceOwnerSmsAuthenticationProvider.java @@ -1,7 +1,7 @@ -package com.pig4cloud.pig.auth.support.sms; +package com.rax.auth.support.sms; -import com.pig4cloud.pig.auth.support.base.OAuth2ResourceOwnerBaseAuthenticationProvider; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; +import com.rax.auth.support.base.OAuth2ResourceOwnerBaseAuthenticationProvider; +import com.rax.common.core.constant.SecurityConstants; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.security.authentication.AuthenticationManager; diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/sms/OAuth2ResourceOwnerSmsAuthenticationToken.java b/auth/src/main/java/com/rax/auth/support/sms/OAuth2ResourceOwnerSmsAuthenticationToken.java similarity index 82% rename from pig-auth/src/main/java/com/pig4cloud/pig/auth/support/sms/OAuth2ResourceOwnerSmsAuthenticationToken.java rename to auth/src/main/java/com/rax/auth/support/sms/OAuth2ResourceOwnerSmsAuthenticationToken.java index 7baa4a1..2d7f53b 100644 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/sms/OAuth2ResourceOwnerSmsAuthenticationToken.java +++ b/auth/src/main/java/com/rax/auth/support/sms/OAuth2ResourceOwnerSmsAuthenticationToken.java @@ -1,6 +1,6 @@ -package com.pig4cloud.pig.auth.support.sms; +package com.rax.auth.support.sms; -import com.pig4cloud.pig.auth.support.base.OAuth2ResourceOwnerBaseAuthenticationToken; +import com.rax.auth.support.base.OAuth2ResourceOwnerBaseAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.oauth2.core.AuthorizationGrantType; diff --git a/auth/src/main/java/com/rax/auth/support/sms/package-info.java b/auth/src/main/java/com/rax/auth/support/sms/package-info.java new file mode 100644 index 0000000..bcfe664 --- /dev/null +++ b/auth/src/main/java/com/rax/auth/support/sms/package-info.java @@ -0,0 +1,4 @@ +/** + * 短信模式 + */ +package com.rax.auth.support.sms; diff --git a/pig-codegen/Dockerfile b/codegen/Dockerfile similarity index 79% rename from pig-codegen/Dockerfile rename to codegen/Dockerfile index 8d8b850..e785f5a 100644 --- a/pig-codegen/Dockerfile +++ b/codegen/Dockerfile @@ -1,8 +1,8 @@ FROM alibabadragonwell/dragonwell:17-anolis -WORKDIR /pig-codegen +WORKDIR /codegen -ARG JAR_FILE=target/pig-codegen.jar +ARG JAR_FILE=target/codegen.jar COPY ${JAR_FILE} app.jar diff --git a/pig-codegen/pom.xml b/codegen/pom.xml similarity index 64% rename from pig-codegen/pom.xml rename to codegen/pom.xml index e4b1a04..32852d7 100644 --- a/pig-codegen/pom.xml +++ b/codegen/pom.xml @@ -1,31 +1,16 @@ - 4.0.0 - com.pig4cloud - pig + com.rax + rax 3.7.3 - pig-codegen + codegen jar 代码生成模块 @@ -33,18 +18,18 @@ - com.pig4cloud - pig-common-swagger + com.rax + common-swagger - com.pig4cloud - pig-common-feign + com.rax + common-feign - com.pig4cloud - pig-common-datasource + com.rax + common-datasource com.baomidou @@ -60,8 +45,8 @@ hutool-json - com.pig4cloud - pig-common-core + com.rax + common-core commons-configuration @@ -70,13 +55,13 @@ - com.pig4cloud - pig-common-log + com.rax + common-log - com.pig4cloud - pig-common-security + com.rax + common-security diff --git a/codegen/src/main/java/com/rax/codegen/RaxCodeGenApplication.java b/codegen/src/main/java/com/rax/codegen/RaxCodeGenApplication.java new file mode 100644 index 0000000..4a808c9 --- /dev/null +++ b/codegen/src/main/java/com/rax/codegen/RaxCodeGenApplication.java @@ -0,0 +1,21 @@ +package com.rax.codegen; + +import com.rax.common.datasource.annotation.EnableDynamicDataSource; +import com.rax.common.security.annotation.EnableRaxResourceServer; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @author lengleng + * @date 2018/07/29 代码生成模块 + */ +@EnableDynamicDataSource +@EnableRaxResourceServer +@SpringBootApplication +public class RaxCodeGenApplication { + + public static void main(String[] args) { + SpringApplication.run(RaxCodeGenApplication.class, args); + } + +} diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenDsConfController.java b/codegen/src/main/java/com/rax/codegen/controller/GenDsConfController.java similarity index 73% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenDsConfController.java rename to codegen/src/main/java/com/rax/codegen/controller/GenDsConfController.java index 2b4d739..6fb6f23 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenDsConfController.java +++ b/codegen/src/main/java/com/rax/codegen/controller/GenDsConfController.java @@ -1,20 +1,4 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ -package com.pig4cloud.pig.codegen.controller; +package com.rax.codegen.controller; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.StrUtil; @@ -25,11 +9,11 @@ import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pig4cloud.pig.codegen.entity.GenDatasourceConf; -import com.pig4cloud.pig.codegen.service.GenDatasourceConfService; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.core.util.SpringContextHolder; -import com.pig4cloud.pig.common.security.annotation.Inner; +import com.rax.codegen.entity.GenDatasourceConf; +import com.rax.codegen.service.GenDatasourceConfService; +import com.rax.common.core.util.R; +import com.rax.common.core.util.SpringContextHolder; +import com.rax.common.security.annotation.Inner; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; @@ -41,7 +25,6 @@ import javax.sql.DataSource; /** * 数据源管理 * - * @author lengleng * @date 2019-03-31 16:00:20 */ @RestController diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenFieldTypeController.java b/codegen/src/main/java/com/rax/codegen/controller/GenFieldTypeController.java similarity index 92% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenFieldTypeController.java rename to codegen/src/main/java/com/rax/codegen/controller/GenFieldTypeController.java index e0b8e8e..258c6e2 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenFieldTypeController.java +++ b/codegen/src/main/java/com/rax/codegen/controller/GenFieldTypeController.java @@ -15,17 +15,17 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.controller; +package com.rax.codegen.controller; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pig4cloud.pig.codegen.entity.GenFieldType; -import com.pig4cloud.pig.codegen.service.GenFieldTypeService; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.log.annotation.SysLog; -import com.pig4cloud.plugin.excel.annotation.ResponseExcel; +import com.rax.codegen.entity.GenFieldType; +import com.rax.codegen.service.GenFieldTypeService; +import com.rax.common.core.util.R; +import com.rax.common.log.annotation.SysLog; +import com.rax.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenGroupController.java b/codegen/src/main/java/com/rax/codegen/controller/GenGroupController.java similarity index 91% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenGroupController.java rename to codegen/src/main/java/com/rax/codegen/controller/GenGroupController.java index c603101..e1a59f9 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenGroupController.java +++ b/codegen/src/main/java/com/rax/codegen/controller/GenGroupController.java @@ -15,19 +15,19 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.controller; +package com.rax.codegen.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pig4cloud.pig.codegen.entity.GenGroupEntity; -import com.pig4cloud.pig.codegen.service.GenGroupService; -import com.pig4cloud.pig.codegen.util.vo.GroupVo; -import com.pig4cloud.pig.codegen.util.vo.TemplateGroupDTO; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.log.annotation.SysLog; -import com.pig4cloud.plugin.excel.annotation.ResponseExcel; +import com.rax.codegen.entity.GenGroupEntity; +import com.rax.codegen.service.GenGroupService; +import com.rax.codegen.util.vo.GroupVo; +import com.rax.codegen.util.vo.TemplateGroupDTO; +import com.rax.common.core.util.R; +import com.rax.common.log.annotation.SysLog; +import com.rax.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenTableController.java b/codegen/src/main/java/com/rax/codegen/controller/GenTableController.java similarity index 91% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenTableController.java rename to codegen/src/main/java/com/rax/codegen/controller/GenTableController.java index 4ee4819..6abd86f 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenTableController.java +++ b/codegen/src/main/java/com/rax/codegen/controller/GenTableController.java @@ -15,17 +15,17 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.controller; +package com.rax.codegen.controller; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pig4cloud.pig.codegen.entity.GenTable; -import com.pig4cloud.pig.codegen.entity.GenTableColumnEntity; -import com.pig4cloud.pig.codegen.service.GenTableColumnService; -import com.pig4cloud.pig.codegen.service.GenTableService; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.log.annotation.SysLog; -import com.pig4cloud.plugin.excel.annotation.ResponseExcel; +import com.rax.codegen.entity.GenTable; +import com.rax.codegen.entity.GenTableColumnEntity; +import com.rax.codegen.service.GenTableColumnService; +import com.rax.codegen.service.GenTableService; +import com.rax.common.core.util.R; +import com.rax.common.log.annotation.SysLog; +import com.rax.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenTemplateController.java b/codegen/src/main/java/com/rax/codegen/controller/GenTemplateController.java similarity index 93% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenTemplateController.java rename to codegen/src/main/java/com/rax/codegen/controller/GenTemplateController.java index 4b122c5..9978141 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenTemplateController.java +++ b/codegen/src/main/java/com/rax/codegen/controller/GenTemplateController.java @@ -15,18 +15,18 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.controller; +package com.rax.codegen.controller; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pig4cloud.pig.codegen.entity.GenTemplateEntity; -import com.pig4cloud.pig.codegen.service.GenTemplateService; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.log.annotation.SysLog; -import com.pig4cloud.plugin.excel.annotation.ResponseExcel; +import com.rax.codegen.entity.GenTemplateEntity; +import com.rax.codegen.service.GenTemplateService; +import com.rax.common.core.util.R; +import com.rax.common.log.annotation.SysLog; +import com.rax.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenTemplateGroupController.java b/codegen/src/main/java/com/rax/codegen/controller/GenTemplateGroupController.java similarity index 93% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenTemplateGroupController.java rename to codegen/src/main/java/com/rax/codegen/controller/GenTemplateGroupController.java index aeba360..cd7b9a0 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenTemplateGroupController.java +++ b/codegen/src/main/java/com/rax/codegen/controller/GenTemplateGroupController.java @@ -15,17 +15,17 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.controller; +package com.rax.codegen.controller; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pig4cloud.pig.codegen.entity.GenTemplateGroupEntity; -import com.pig4cloud.pig.codegen.service.GenTemplateGroupService; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.log.annotation.SysLog; -import com.pig4cloud.plugin.excel.annotation.ResponseExcel; +import com.rax.codegen.entity.GenTemplateGroupEntity; +import com.rax.codegen.service.GenTemplateGroupService; +import com.rax.common.core.util.R; +import com.rax.common.log.annotation.SysLog; +import com.rax.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GeneratorController.java b/codegen/src/main/java/com/rax/codegen/controller/GeneratorController.java similarity index 95% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GeneratorController.java rename to codegen/src/main/java/com/rax/codegen/controller/GeneratorController.java index cd1305c..af30312 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GeneratorController.java +++ b/codegen/src/main/java/com/rax/codegen/controller/GeneratorController.java @@ -15,12 +15,12 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.controller; +package com.rax.codegen.controller; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.StrUtil; -import com.pig4cloud.pig.codegen.service.GeneratorService; -import com.pig4cloud.pig.common.core.util.R; +import com.rax.codegen.service.GeneratorService; +import com.rax.common.core.util.R; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/ColumnEntity.java b/codegen/src/main/java/com/rax/codegen/entity/ColumnEntity.java similarity index 97% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/ColumnEntity.java rename to codegen/src/main/java/com/rax/codegen/entity/ColumnEntity.java index bcbc891..33c7be0 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/ColumnEntity.java +++ b/codegen/src/main/java/com/rax/codegen/entity/ColumnEntity.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.entity; +package com.rax.codegen.entity; import lombok.Data; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenConfig.java b/codegen/src/main/java/com/rax/codegen/entity/GenConfig.java similarity index 97% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenConfig.java rename to codegen/src/main/java/com/rax/codegen/entity/GenConfig.java index 7a6789f..58aab1f 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenConfig.java +++ b/codegen/src/main/java/com/rax/codegen/entity/GenConfig.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.entity; +package com.rax.codegen.entity; import lombok.Data; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenDatasourceConf.java b/codegen/src/main/java/com/rax/codegen/entity/GenDatasourceConf.java similarity index 98% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenDatasourceConf.java rename to codegen/src/main/java/com/rax/codegen/entity/GenDatasourceConf.java index ca85bcc..644ea58 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenDatasourceConf.java +++ b/codegen/src/main/java/com/rax/codegen/entity/GenDatasourceConf.java @@ -14,7 +14,7 @@ * this software without specific prior written permission. * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.entity; +package com.rax.codegen.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenFieldType.java b/codegen/src/main/java/com/rax/codegen/entity/GenFieldType.java similarity index 98% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenFieldType.java rename to codegen/src/main/java/com/rax/codegen/entity/GenFieldType.java index 8a5da8b..ae9f418 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenFieldType.java +++ b/codegen/src/main/java/com/rax/codegen/entity/GenFieldType.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.entity; +package com.rax.codegen.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenGroupEntity.java b/codegen/src/main/java/com/rax/codegen/entity/GenGroupEntity.java similarity index 98% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenGroupEntity.java rename to codegen/src/main/java/com/rax/codegen/entity/GenGroupEntity.java index 5418808..96f0706 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenGroupEntity.java +++ b/codegen/src/main/java/com/rax/codegen/entity/GenGroupEntity.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.entity; +package com.rax.codegen.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenTable.java b/codegen/src/main/java/com/rax/codegen/entity/GenTable.java similarity index 98% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenTable.java rename to codegen/src/main/java/com/rax/codegen/entity/GenTable.java index ca25c3b..ff53f12 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenTable.java +++ b/codegen/src/main/java/com/rax/codegen/entity/GenTable.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.entity; +package com.rax.codegen.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenTableColumnEntity.java b/codegen/src/main/java/com/rax/codegen/entity/GenTableColumnEntity.java similarity index 98% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenTableColumnEntity.java rename to codegen/src/main/java/com/rax/codegen/entity/GenTableColumnEntity.java index 65ee2a9..01700ba 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenTableColumnEntity.java +++ b/codegen/src/main/java/com/rax/codegen/entity/GenTableColumnEntity.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.entity; +package com.rax.codegen.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenTemplateEntity.java b/codegen/src/main/java/com/rax/codegen/entity/GenTemplateEntity.java similarity index 98% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenTemplateEntity.java rename to codegen/src/main/java/com/rax/codegen/entity/GenTemplateEntity.java index 10b0f18..d5800d2 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenTemplateEntity.java +++ b/codegen/src/main/java/com/rax/codegen/entity/GenTemplateEntity.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.entity; +package com.rax.codegen.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenTemplateGroupEntity.java b/codegen/src/main/java/com/rax/codegen/entity/GenTemplateGroupEntity.java similarity index 97% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenTemplateGroupEntity.java rename to codegen/src/main/java/com/rax/codegen/entity/GenTemplateGroupEntity.java index ebe3e95..ff69a62 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenTemplateGroupEntity.java +++ b/codegen/src/main/java/com/rax/codegen/entity/GenTemplateGroupEntity.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.entity; +package com.rax.codegen.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/TableEntity.java b/codegen/src/main/java/com/rax/codegen/entity/TableEntity.java similarity index 97% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/TableEntity.java rename to codegen/src/main/java/com/rax/codegen/entity/TableEntity.java index b909698..ac46e4f 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/TableEntity.java +++ b/codegen/src/main/java/com/rax/codegen/entity/TableEntity.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.entity; +package com.rax.codegen.entity; import lombok.Data; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenDatasourceConfMapper.java b/codegen/src/main/java/com/rax/codegen/mapper/GenDatasourceConfMapper.java similarity index 91% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenDatasourceConfMapper.java rename to codegen/src/main/java/com/rax/codegen/mapper/GenDatasourceConfMapper.java index 6192b5a..11f6eac 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenDatasourceConfMapper.java +++ b/codegen/src/main/java/com/rax/codegen/mapper/GenDatasourceConfMapper.java @@ -14,10 +14,10 @@ * this software without specific prior written permission. * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.mapper; +package com.rax.codegen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pig4cloud.pig.codegen.entity.GenDatasourceConf; +import com.rax.codegen.entity.GenDatasourceConf; import org.apache.ibatis.annotations.Mapper; /** diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenDynamicMapper.java b/codegen/src/main/java/com/rax/codegen/mapper/GenDynamicMapper.java similarity index 96% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenDynamicMapper.java rename to codegen/src/main/java/com/rax/codegen/mapper/GenDynamicMapper.java index d20c04f..eea0010 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenDynamicMapper.java +++ b/codegen/src/main/java/com/rax/codegen/mapper/GenDynamicMapper.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.mapper; +package com.rax.codegen.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import org.apache.ibatis.annotations.Mapper; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenFieldTypeMapper.java b/codegen/src/main/java/com/rax/codegen/mapper/GenFieldTypeMapper.java similarity index 93% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenFieldTypeMapper.java rename to codegen/src/main/java/com/rax/codegen/mapper/GenFieldTypeMapper.java index 0d92ab7..63bc210 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenFieldTypeMapper.java +++ b/codegen/src/main/java/com/rax/codegen/mapper/GenFieldTypeMapper.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.mapper; +package com.rax.codegen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pig4cloud.pig.codegen.entity.GenFieldType; +import com.rax.codegen.entity.GenFieldType; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenGroupMapper.java b/codegen/src/main/java/com/rax/codegen/mapper/GenGroupMapper.java similarity index 88% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenGroupMapper.java rename to codegen/src/main/java/com/rax/codegen/mapper/GenGroupMapper.java index 146e2fa..55b0e2d 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenGroupMapper.java +++ b/codegen/src/main/java/com/rax/codegen/mapper/GenGroupMapper.java @@ -15,11 +15,11 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.mapper; +package com.rax.codegen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pig4cloud.pig.codegen.entity.GenGroupEntity; -import com.pig4cloud.pig.codegen.util.vo.GroupVo; +import com.rax.codegen.entity.GenGroupEntity; +import com.rax.codegen.util.vo.GroupVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenTableColumnMapper.java b/codegen/src/main/java/com/rax/codegen/mapper/GenTableColumnMapper.java similarity index 91% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenTableColumnMapper.java rename to codegen/src/main/java/com/rax/codegen/mapper/GenTableColumnMapper.java index 3b2a66f..64f3a0a 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenTableColumnMapper.java +++ b/codegen/src/main/java/com/rax/codegen/mapper/GenTableColumnMapper.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.mapper; +package com.rax.codegen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pig4cloud.pig.codegen.entity.GenTableColumnEntity; +import com.rax.codegen.entity.GenTableColumnEntity; import org.apache.ibatis.annotations.Mapper; /** diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenTableMapper.java b/codegen/src/main/java/com/rax/codegen/mapper/GenTableMapper.java similarity index 92% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenTableMapper.java rename to codegen/src/main/java/com/rax/codegen/mapper/GenTableMapper.java index 27d2698..8bf08bd 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenTableMapper.java +++ b/codegen/src/main/java/com/rax/codegen/mapper/GenTableMapper.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.mapper; +package com.rax.codegen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pig4cloud.pig.codegen.entity.GenTable; +import com.rax.codegen.entity.GenTable; import org.apache.ibatis.annotations.Mapper; /** diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenTemplateGroupMapper.java b/codegen/src/main/java/com/rax/codegen/mapper/GenTemplateGroupMapper.java similarity index 91% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenTemplateGroupMapper.java rename to codegen/src/main/java/com/rax/codegen/mapper/GenTemplateGroupMapper.java index 4be972a..b82ccc2 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenTemplateGroupMapper.java +++ b/codegen/src/main/java/com/rax/codegen/mapper/GenTemplateGroupMapper.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.mapper; +package com.rax.codegen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pig4cloud.pig.codegen.entity.GenTemplateGroupEntity; +import com.rax.codegen.entity.GenTemplateGroupEntity; import org.apache.ibatis.annotations.Mapper; /** diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenTemplateMapper.java b/codegen/src/main/java/com/rax/codegen/mapper/GenTemplateMapper.java similarity index 92% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenTemplateMapper.java rename to codegen/src/main/java/com/rax/codegen/mapper/GenTemplateMapper.java index be2dc68..cf86600 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenTemplateMapper.java +++ b/codegen/src/main/java/com/rax/codegen/mapper/GenTemplateMapper.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.mapper; +package com.rax.codegen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pig4cloud.pig.codegen.entity.GenTemplateEntity; +import com.rax.codegen.entity.GenTemplateEntity; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GeneratorMapper.java b/codegen/src/main/java/com/rax/codegen/mapper/GeneratorMapper.java similarity index 96% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GeneratorMapper.java rename to codegen/src/main/java/com/rax/codegen/mapper/GeneratorMapper.java index 6952289..ffc51be 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GeneratorMapper.java +++ b/codegen/src/main/java/com/rax/codegen/mapper/GeneratorMapper.java @@ -15,14 +15,14 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.mapper; +package com.rax.codegen.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pig4cloud.pig.codegen.entity.ColumnEntity; +import com.rax.codegen.entity.ColumnEntity; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GeneratorMysqlMapper.java b/codegen/src/main/java/com/rax/codegen/mapper/GeneratorMysqlMapper.java similarity index 96% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GeneratorMysqlMapper.java rename to codegen/src/main/java/com/rax/codegen/mapper/GeneratorMysqlMapper.java index 26a7cb6..4938a25 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GeneratorMysqlMapper.java +++ b/codegen/src/main/java/com/rax/codegen/mapper/GeneratorMysqlMapper.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.mapper; +package com.rax.codegen.mapper; import org.apache.ibatis.annotations.Mapper; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenDatasourceConfService.java b/codegen/src/main/java/com/rax/codegen/service/GenDatasourceConfService.java similarity index 94% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenDatasourceConfService.java rename to codegen/src/main/java/com/rax/codegen/service/GenDatasourceConfService.java index 01ec1ce..05ae184 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenDatasourceConfService.java +++ b/codegen/src/main/java/com/rax/codegen/service/GenDatasourceConfService.java @@ -14,10 +14,10 @@ * this software without specific prior written permission. * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.service; +package com.rax.codegen.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pig.codegen.entity.GenDatasourceConf; +import com.rax.codegen.entity.GenDatasourceConf; /** * 数据源表 diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenFieldTypeService.java b/codegen/src/main/java/com/rax/codegen/service/GenFieldTypeService.java similarity index 92% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenFieldTypeService.java rename to codegen/src/main/java/com/rax/codegen/service/GenFieldTypeService.java index 9168cdd..37d4ec3 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenFieldTypeService.java +++ b/codegen/src/main/java/com/rax/codegen/service/GenFieldTypeService.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.service; +package com.rax.codegen.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pig.codegen.entity.GenFieldType; +import com.rax.codegen.entity.GenFieldType; import java.util.Set; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenGroupService.java b/codegen/src/main/java/com/rax/codegen/service/GenGroupService.java similarity index 86% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenGroupService.java rename to codegen/src/main/java/com/rax/codegen/service/GenGroupService.java index 555d140..6a4b156 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenGroupService.java +++ b/codegen/src/main/java/com/rax/codegen/service/GenGroupService.java @@ -15,12 +15,12 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.service; +package com.rax.codegen.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pig.codegen.entity.GenGroupEntity; -import com.pig4cloud.pig.codegen.util.vo.GroupVo; -import com.pig4cloud.pig.codegen.util.vo.TemplateGroupDTO; +import com.rax.codegen.entity.GenGroupEntity; +import com.rax.codegen.util.vo.GroupVo; +import com.rax.codegen.util.vo.TemplateGroupDTO; /** * 模板分组 diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenTableColumnService.java b/codegen/src/main/java/com/rax/codegen/service/GenTableColumnService.java similarity index 93% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenTableColumnService.java rename to codegen/src/main/java/com/rax/codegen/service/GenTableColumnService.java index 812ab1b..e7ee741 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenTableColumnService.java +++ b/codegen/src/main/java/com/rax/codegen/service/GenTableColumnService.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.service; +package com.rax.codegen.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pig.codegen.entity.GenTableColumnEntity; +import com.rax.codegen.entity.GenTableColumnEntity; import java.util.List; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenTableService.java b/codegen/src/main/java/com/rax/codegen/service/GenTableService.java similarity index 95% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenTableService.java rename to codegen/src/main/java/com/rax/codegen/service/GenTableService.java index 0b41754..fdfc83c 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenTableService.java +++ b/codegen/src/main/java/com/rax/codegen/service/GenTableService.java @@ -15,12 +15,12 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.service; +package com.rax.codegen.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pig.codegen.entity.GenTable; +import com.rax.codegen.entity.GenTable; import java.util.List; import java.util.Map; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenTemplateGroupService.java b/codegen/src/main/java/com/rax/codegen/service/GenTemplateGroupService.java similarity index 90% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenTemplateGroupService.java rename to codegen/src/main/java/com/rax/codegen/service/GenTemplateGroupService.java index d5241de..d1369db 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenTemplateGroupService.java +++ b/codegen/src/main/java/com/rax/codegen/service/GenTemplateGroupService.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.service; +package com.rax.codegen.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pig.codegen.entity.GenTemplateGroupEntity; +import com.rax.codegen.entity.GenTemplateGroupEntity; /** * 模板分组关联表 diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenTemplateService.java b/codegen/src/main/java/com/rax/codegen/service/GenTemplateService.java similarity index 90% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenTemplateService.java rename to codegen/src/main/java/com/rax/codegen/service/GenTemplateService.java index a465dc2..b60b3cf 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenTemplateService.java +++ b/codegen/src/main/java/com/rax/codegen/service/GenTemplateService.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.service; +package com.rax.codegen.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pig.codegen.entity.GenTemplateEntity; +import com.rax.codegen.entity.GenTemplateEntity; /** * 模板 diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GeneratorService.java b/codegen/src/main/java/com/rax/codegen/service/GeneratorService.java similarity index 96% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GeneratorService.java rename to codegen/src/main/java/com/rax/codegen/service/GeneratorService.java index 675dc0c..02977d0 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GeneratorService.java +++ b/codegen/src/main/java/com/rax/codegen/service/GeneratorService.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.service; +package com.rax.codegen.service; import java.util.List; import java.util.Map; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenDatasourceConfServiceImpl.java b/codegen/src/main/java/com/rax/codegen/service/impl/GenDatasourceConfServiceImpl.java similarity index 92% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenDatasourceConfServiceImpl.java rename to codegen/src/main/java/com/rax/codegen/service/impl/GenDatasourceConfServiceImpl.java index 5b83efb..15e5f07 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenDatasourceConfServiceImpl.java +++ b/codegen/src/main/java/com/rax/codegen/service/impl/GenDatasourceConfServiceImpl.java @@ -14,7 +14,7 @@ * this software without specific prior written permission. * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.service.impl; +package com.rax.codegen.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; @@ -23,12 +23,12 @@ import com.baomidou.dynamic.datasource.creator.DataSourceProperty; import com.baomidou.dynamic.datasource.creator.DefaultDataSourceCreator; import com.baomidou.dynamic.datasource.creator.druid.DruidConfig; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pig.codegen.entity.GenDatasourceConf; -import com.pig4cloud.pig.codegen.mapper.GenDatasourceConfMapper; -import com.pig4cloud.pig.codegen.service.GenDatasourceConfService; -import com.pig4cloud.pig.common.core.util.SpringContextHolder; -import com.pig4cloud.pig.common.datasource.enums.DsConfTypeEnum; -import com.pig4cloud.pig.common.datasource.enums.DsJdbcUrlEnum; +import com.rax.codegen.entity.GenDatasourceConf; +import com.rax.codegen.mapper.GenDatasourceConfMapper; +import com.rax.codegen.service.GenDatasourceConfService; +import com.rax.common.core.util.SpringContextHolder; +import com.rax.common.datasource.enums.DsConfTypeEnum; +import com.rax.common.datasource.enums.DsJdbcUrlEnum; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.jasypt.encryption.StringEncryptor; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenFieldTypeServiceImpl.java b/codegen/src/main/java/com/rax/codegen/service/impl/GenFieldTypeServiceImpl.java similarity index 87% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenFieldTypeServiceImpl.java rename to codegen/src/main/java/com/rax/codegen/service/impl/GenFieldTypeServiceImpl.java index 27d85f3..e2113b4 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenFieldTypeServiceImpl.java +++ b/codegen/src/main/java/com/rax/codegen/service/impl/GenFieldTypeServiceImpl.java @@ -14,13 +14,13 @@ * this software without specific prior written permission. * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.service.impl; +package com.rax.codegen.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pig.codegen.entity.GenFieldType; -import com.pig4cloud.pig.codegen.mapper.GenFieldTypeMapper; -import com.pig4cloud.pig.codegen.service.GenFieldTypeService; +import com.rax.codegen.entity.GenFieldType; +import com.rax.codegen.mapper.GenFieldTypeMapper; +import com.rax.codegen.service.GenFieldTypeService; import org.springframework.stereotype.Service; import java.util.Set; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenGroupServiceImpl.java b/codegen/src/main/java/com/rax/codegen/service/impl/GenGroupServiceImpl.java similarity index 88% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenGroupServiceImpl.java rename to codegen/src/main/java/com/rax/codegen/service/impl/GenGroupServiceImpl.java index 6e92bf7..263190d 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenGroupServiceImpl.java +++ b/codegen/src/main/java/com/rax/codegen/service/impl/GenGroupServiceImpl.java @@ -14,19 +14,19 @@ * this software without specific prior written permission. * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.service.impl; +package com.rax.codegen.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pig.codegen.entity.GenGroupEntity; -import com.pig4cloud.pig.codegen.entity.GenTemplateGroupEntity; -import com.pig4cloud.pig.codegen.mapper.GenGroupMapper; -import com.pig4cloud.pig.codegen.service.GenGroupService; -import com.pig4cloud.pig.codegen.service.GenTemplateGroupService; -import com.pig4cloud.pig.codegen.util.vo.GroupVo; -import com.pig4cloud.pig.codegen.util.vo.TemplateGroupDTO; +import com.rax.codegen.entity.GenGroupEntity; +import com.rax.codegen.entity.GenTemplateGroupEntity; +import com.rax.codegen.mapper.GenGroupMapper; +import com.rax.codegen.service.GenGroupService; +import com.rax.codegen.service.GenTemplateGroupService; +import com.rax.codegen.util.vo.GroupVo; +import com.rax.codegen.util.vo.TemplateGroupDTO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenTableColumnServiceImpl.java b/codegen/src/main/java/com/rax/codegen/service/impl/GenTableColumnServiceImpl.java similarity index 88% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenTableColumnServiceImpl.java rename to codegen/src/main/java/com/rax/codegen/service/impl/GenTableColumnServiceImpl.java index 57644d9..313bb3f 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenTableColumnServiceImpl.java +++ b/codegen/src/main/java/com/rax/codegen/service/impl/GenTableColumnServiceImpl.java @@ -1,13 +1,13 @@ -package com.pig4cloud.pig.codegen.service.impl; +package com.rax.codegen.service.impl; import cn.hutool.core.text.NamingCase; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pig.codegen.entity.GenFieldType; -import com.pig4cloud.pig.codegen.entity.GenTableColumnEntity; -import com.pig4cloud.pig.codegen.mapper.GenFieldTypeMapper; -import com.pig4cloud.pig.codegen.mapper.GenTableColumnMapper; -import com.pig4cloud.pig.codegen.service.GenTableColumnService; +import com.rax.codegen.entity.GenFieldType; +import com.rax.codegen.entity.GenTableColumnEntity; +import com.rax.codegen.mapper.GenFieldTypeMapper; +import com.rax.codegen.mapper.GenTableColumnMapper; +import com.rax.codegen.service.GenTableColumnService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenTableServiceImpl.java b/codegen/src/main/java/com/rax/codegen/service/impl/GenTableServiceImpl.java similarity index 91% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenTableServiceImpl.java rename to codegen/src/main/java/com/rax/codegen/service/impl/GenTableServiceImpl.java index 9c11e95..e18b174 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenTableServiceImpl.java +++ b/codegen/src/main/java/com/rax/codegen/service/impl/GenTableServiceImpl.java @@ -14,7 +14,7 @@ * this software without specific prior written permission. * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.service.impl; +package com.rax.codegen.service.impl; import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.resource.ClassPathResource; @@ -29,18 +29,18 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pig.codegen.entity.GenGroupEntity; -import com.pig4cloud.pig.codegen.entity.GenTable; -import com.pig4cloud.pig.codegen.entity.GenTableColumnEntity; -import com.pig4cloud.pig.codegen.mapper.GenTableMapper; -import com.pig4cloud.pig.codegen.mapper.GeneratorMapper; -import com.pig4cloud.pig.codegen.service.GenGroupService; -import com.pig4cloud.pig.codegen.service.GenTableColumnService; -import com.pig4cloud.pig.codegen.service.GenTableService; -import com.pig4cloud.pig.codegen.util.BoolFillEnum; -import com.pig4cloud.pig.codegen.util.CommonColumnFiledEnum; -import com.pig4cloud.pig.codegen.util.GenKit; -import com.pig4cloud.pig.codegen.util.GeneratorTypeEnum; +import com.rax.codegen.entity.GenGroupEntity; +import com.rax.codegen.entity.GenTable; +import com.rax.codegen.entity.GenTableColumnEntity; +import com.rax.codegen.mapper.GenTableMapper; +import com.rax.codegen.mapper.GeneratorMapper; +import com.rax.codegen.service.GenGroupService; +import com.rax.codegen.service.GenTableColumnService; +import com.rax.codegen.service.GenTableService; +import com.rax.codegen.util.BoolFillEnum; +import com.rax.codegen.util.CommonColumnFiledEnum; +import com.rax.codegen.util.GenKit; +import com.rax.codegen.util.GeneratorTypeEnum; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenTemplateGroupServiceImpl.java b/codegen/src/main/java/com/rax/codegen/service/impl/GenTemplateGroupServiceImpl.java similarity index 82% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenTemplateGroupServiceImpl.java rename to codegen/src/main/java/com/rax/codegen/service/impl/GenTemplateGroupServiceImpl.java index e360d0d..42699c3 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenTemplateGroupServiceImpl.java +++ b/codegen/src/main/java/com/rax/codegen/service/impl/GenTemplateGroupServiceImpl.java @@ -14,12 +14,12 @@ * this software without specific prior written permission. * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.service.impl; +package com.rax.codegen.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pig.codegen.entity.GenTemplateGroupEntity; -import com.pig4cloud.pig.codegen.mapper.GenTemplateGroupMapper; -import com.pig4cloud.pig.codegen.service.GenTemplateGroupService; +import com.rax.codegen.entity.GenTemplateGroupEntity; +import com.rax.codegen.mapper.GenTemplateGroupMapper; +import com.rax.codegen.service.GenTemplateGroupService; import org.springframework.stereotype.Service; /** diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenTemplateServiceImpl.java b/codegen/src/main/java/com/rax/codegen/service/impl/GenTemplateServiceImpl.java similarity index 83% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenTemplateServiceImpl.java rename to codegen/src/main/java/com/rax/codegen/service/impl/GenTemplateServiceImpl.java index 45d4f4d..b853e08 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenTemplateServiceImpl.java +++ b/codegen/src/main/java/com/rax/codegen/service/impl/GenTemplateServiceImpl.java @@ -14,12 +14,12 @@ * this software without specific prior written permission. * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.service.impl; +package com.rax.codegen.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pig.codegen.entity.GenTemplateEntity; -import com.pig4cloud.pig.codegen.mapper.GenTemplateMapper; -import com.pig4cloud.pig.codegen.service.GenTemplateService; +import com.rax.codegen.entity.GenTemplateEntity; +import com.rax.codegen.mapper.GenTemplateMapper; +import com.rax.codegen.service.GenTemplateService; import org.springframework.stereotype.Service; /** diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GeneratorServiceImpl.java b/codegen/src/main/java/com/rax/codegen/service/impl/GeneratorServiceImpl.java similarity index 95% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GeneratorServiceImpl.java rename to codegen/src/main/java/com/rax/codegen/service/impl/GeneratorServiceImpl.java index 00010d1..33dc0b3 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GeneratorServiceImpl.java +++ b/codegen/src/main/java/com/rax/codegen/service/impl/GeneratorServiceImpl.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.codegen.service.impl; +package com.rax.codegen.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; @@ -24,12 +24,13 @@ import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.BooleanUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; -import com.pig4cloud.pig.codegen.entity.GenTable; -import com.pig4cloud.pig.codegen.entity.GenTableColumnEntity; -import com.pig4cloud.pig.codegen.entity.GenTemplateEntity; -import com.pig4cloud.pig.codegen.service.*; -import com.pig4cloud.pig.codegen.util.VelocityKit; -import com.pig4cloud.pig.codegen.util.vo.GroupVo; +import com.rax.codegen.entity.GenTable; +import com.rax.codegen.entity.GenTableColumnEntity; +import com.rax.codegen.entity.GenTemplateEntity; +import com.rax.codegen.service.*; +import com.rax.codegen.util.VelocityKit; +import com.rax.codegen.util.vo.GroupVo; +import com.rax.codegen.service.*; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/BoolFillEnum.java b/codegen/src/main/java/com/rax/codegen/util/BoolFillEnum.java similarity index 86% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/BoolFillEnum.java rename to codegen/src/main/java/com/rax/codegen/util/BoolFillEnum.java index a401762..dbb6d7c 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/BoolFillEnum.java +++ b/codegen/src/main/java/com/rax/codegen/util/BoolFillEnum.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.codegen.util; +package com.rax.codegen.util; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/CommonColumnFiledEnum.java b/codegen/src/main/java/com/rax/codegen/util/CommonColumnFiledEnum.java similarity index 95% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/CommonColumnFiledEnum.java rename to codegen/src/main/java/com/rax/codegen/util/CommonColumnFiledEnum.java index 5ef0f83..555d4dd 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/CommonColumnFiledEnum.java +++ b/codegen/src/main/java/com/rax/codegen/util/CommonColumnFiledEnum.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.codegen.util; +package com.rax.codegen.util; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/DictTool.java b/codegen/src/main/java/com/rax/codegen/util/DictTool.java similarity index 94% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/DictTool.java rename to codegen/src/main/java/com/rax/codegen/util/DictTool.java index 50eaefb..b1c66b5 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/DictTool.java +++ b/codegen/src/main/java/com/rax/codegen/util/DictTool.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.codegen.util; +package com.rax.codegen.util; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/GenKit.java b/codegen/src/main/java/com/rax/codegen/util/GenKit.java similarity index 83% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/GenKit.java rename to codegen/src/main/java/com/rax/codegen/util/GenKit.java index 057c416..1193666 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/GenKit.java +++ b/codegen/src/main/java/com/rax/codegen/util/GenKit.java @@ -1,12 +1,12 @@ -package com.pig4cloud.pig.codegen.util; +package com.rax.codegen.util; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.pig4cloud.pig.codegen.entity.GenDatasourceConf; -import com.pig4cloud.pig.codegen.mapper.GenDatasourceConfMapper; -import com.pig4cloud.pig.codegen.mapper.GeneratorMapper; -import com.pig4cloud.pig.common.core.util.SpringContextHolder; -import com.pig4cloud.pig.common.datasource.enums.DsJdbcUrlEnum; +import com.rax.codegen.entity.GenDatasourceConf; +import com.rax.codegen.mapper.GenDatasourceConfMapper; +import com.rax.codegen.mapper.GeneratorMapper; +import com.rax.common.core.util.SpringContextHolder; +import com.rax.common.datasource.enums.DsJdbcUrlEnum; import lombok.experimental.UtilityClass; import org.springframework.context.ApplicationContext; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/GeneratorTypeEnum.java b/codegen/src/main/java/com/rax/codegen/util/GeneratorTypeEnum.java similarity index 86% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/GeneratorTypeEnum.java rename to codegen/src/main/java/com/rax/codegen/util/GeneratorTypeEnum.java index e991e88..05d406b 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/GeneratorTypeEnum.java +++ b/codegen/src/main/java/com/rax/codegen/util/GeneratorTypeEnum.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.codegen.util; +package com.rax.codegen.util; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/NamingCaseTool.java b/codegen/src/main/java/com/rax/codegen/util/NamingCaseTool.java similarity index 94% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/NamingCaseTool.java rename to codegen/src/main/java/com/rax/codegen/util/NamingCaseTool.java index afdd446..b22f29e 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/NamingCaseTool.java +++ b/codegen/src/main/java/com/rax/codegen/util/NamingCaseTool.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.codegen.util; +package com.rax.codegen.util; import cn.hutool.core.text.NamingCase; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/VelocityKit.java b/codegen/src/main/java/com/rax/codegen/util/VelocityKit.java similarity index 98% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/VelocityKit.java rename to codegen/src/main/java/com/rax/codegen/util/VelocityKit.java index 8f7f130..e3840f5 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/VelocityKit.java +++ b/codegen/src/main/java/com/rax/codegen/util/VelocityKit.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.codegen.util; +package com.rax.codegen.util; import cn.hutool.core.util.CharsetUtil; import org.apache.velocity.VelocityContext; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/vo/GroupVo.java b/codegen/src/main/java/com/rax/codegen/util/vo/GroupVo.java similarity index 87% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/vo/GroupVo.java rename to codegen/src/main/java/com/rax/codegen/util/vo/GroupVo.java index 23f6abb..f041cdf 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/vo/GroupVo.java +++ b/codegen/src/main/java/com/rax/codegen/util/vo/GroupVo.java @@ -1,8 +1,8 @@ -package com.pig4cloud.pig.codegen.util.vo; +package com.rax.codegen.util.vo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.pig4cloud.pig.codegen.entity.GenTemplateEntity; +import com.rax.codegen.entity.GenTemplateEntity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/vo/SqlDto.java b/codegen/src/main/java/com/rax/codegen/util/vo/SqlDto.java similarity index 82% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/vo/SqlDto.java rename to codegen/src/main/java/com/rax/codegen/util/vo/SqlDto.java index 25393e6..2c70f59 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/vo/SqlDto.java +++ b/codegen/src/main/java/com/rax/codegen/util/vo/SqlDto.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.codegen.util.vo; +package com.rax.codegen.util.vo; import lombok.Data; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/vo/TemplateGroupDTO.java b/codegen/src/main/java/com/rax/codegen/util/vo/TemplateGroupDTO.java similarity index 79% rename from pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/vo/TemplateGroupDTO.java rename to codegen/src/main/java/com/rax/codegen/util/vo/TemplateGroupDTO.java index 8ff2305..df26e66 100644 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/vo/TemplateGroupDTO.java +++ b/codegen/src/main/java/com/rax/codegen/util/vo/TemplateGroupDTO.java @@ -1,6 +1,6 @@ -package com.pig4cloud.pig.codegen.util.vo; +package com.rax.codegen.util.vo; -import com.pig4cloud.pig.codegen.entity.GenGroupEntity; +import com.rax.codegen.entity.GenGroupEntity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/pig-codegen/src/main/resources/application.yml b/codegen/src/main/resources/application.yml similarity index 100% rename from pig-codegen/src/main/resources/application.yml rename to codegen/src/main/resources/application.yml diff --git a/pig-codegen/src/main/resources/logback-spring.xml b/codegen/src/main/resources/logback-spring.xml similarity index 100% rename from pig-codegen/src/main/resources/logback-spring.xml rename to codegen/src/main/resources/logback-spring.xml diff --git a/pig-codegen/src/main/resources/mapper/GenFieldTypeMapper.xml b/codegen/src/main/resources/mapper/GenFieldTypeMapper.xml similarity index 90% rename from pig-codegen/src/main/resources/mapper/GenFieldTypeMapper.xml rename to codegen/src/main/resources/mapper/GenFieldTypeMapper.xml index 43b0728..0dce57b 100644 --- a/pig-codegen/src/main/resources/mapper/GenFieldTypeMapper.xml +++ b/codegen/src/main/resources/mapper/GenFieldTypeMapper.xml @@ -21,9 +21,9 @@ - + - + diff --git a/pig-codegen/src/main/resources/mapper/GenGroupMapper.xml b/codegen/src/main/resources/mapper/GenGroupMapper.xml similarity index 60% rename from pig-codegen/src/main/resources/mapper/GenGroupMapper.xml rename to codegen/src/main/resources/mapper/GenGroupMapper.xml index 83d3614..5b6cfff 100644 --- a/pig-codegen/src/main/resources/mapper/GenGroupMapper.xml +++ b/codegen/src/main/resources/mapper/GenGroupMapper.xml @@ -1,14 +1,14 @@ - + - + - + diff --git a/pig-codegen/src/main/resources/mapper/GenTableMapper.xml b/codegen/src/main/resources/mapper/GenTableMapper.xml similarity index 93% rename from pig-codegen/src/main/resources/mapper/GenTableMapper.xml rename to codegen/src/main/resources/mapper/GenTableMapper.xml index e9a6495..2c22b0a 100644 --- a/pig-codegen/src/main/resources/mapper/GenTableMapper.xml +++ b/codegen/src/main/resources/mapper/GenTableMapper.xml @@ -21,9 +21,9 @@ - + - + diff --git a/pig-codegen/src/main/resources/mapper/GenTemplateGroupMapper.xml b/codegen/src/main/resources/mapper/GenTemplateGroupMapper.xml similarity index 61% rename from pig-codegen/src/main/resources/mapper/GenTemplateGroupMapper.xml rename to codegen/src/main/resources/mapper/GenTemplateGroupMapper.xml index fff11eb..5d9b854 100644 --- a/pig-codegen/src/main/resources/mapper/GenTemplateGroupMapper.xml +++ b/codegen/src/main/resources/mapper/GenTemplateGroupMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/pig-codegen/src/main/resources/mapper/GenTemplateMapper.xml b/codegen/src/main/resources/mapper/GenTemplateMapper.xml similarity index 73% rename from pig-codegen/src/main/resources/mapper/GenTemplateMapper.xml rename to codegen/src/main/resources/mapper/GenTemplateMapper.xml index 02f10b2..5b560da 100644 --- a/pig-codegen/src/main/resources/mapper/GenTemplateMapper.xml +++ b/codegen/src/main/resources/mapper/GenTemplateMapper.xml @@ -1,16 +1,16 @@ - + - + - SELECT t.id as id,t.template_name,t.generator_path,t.template_desc,t.template_code FROM gen_template t , diff --git a/pig-codegen/src/main/resources/mapper/GeneratorMySqlMapper.xml b/codegen/src/main/resources/mapper/GeneratorMySqlMapper.xml similarity index 86% rename from pig-codegen/src/main/resources/mapper/GeneratorMySqlMapper.xml rename to codegen/src/main/resources/mapper/GeneratorMySqlMapper.xml index ca5b9eb..db9b12e 100644 --- a/pig-codegen/src/main/resources/mapper/GeneratorMySqlMapper.xml +++ b/codegen/src/main/resources/mapper/GeneratorMySqlMapper.xml @@ -1,7 +1,7 @@ - + + diff --git a/pig-codegen/src/main/resources/template/config.json b/codegen/src/main/resources/template/config.json similarity index 100% rename from pig-codegen/src/main/resources/template/config.json rename to codegen/src/main/resources/template/config.json diff --git a/pig-common/pig-common-bom/pom.xml b/common/common-bom/pom.xml similarity index 73% rename from pig-common/pig-common-bom/pom.xml rename to common/common-bom/pom.xml index 7c15363..d739eac 100644 --- a/pig-common/pig-common-bom/pom.xml +++ b/common/common-bom/pom.xml @@ -4,17 +4,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.pig4cloud - pig-common-bom + com.rax + common-bom 3.7.3 pom - pig-common-bom - pig cloud parent - pig cloud parent + common-bom + parent + parent - ${project.version} + ${project.version} 3.2.1 UTF-8 2.17.1 @@ -43,65 +43,75 @@ - com.pig4cloud - pig-common-core - ${pig.common.version} + com.rax + common-core + ${common.version} - com.pig4cloud - pig-common-datasource - ${pig.common.version} + com.rax + common-datasource + ${common.version} - com.pig4cloud - pig-common-log - ${pig.common.version} + com.rax + common-log + ${common.version} - com.pig4cloud - pig-common-mybatis - ${pig.common.version} + com.rax + common-mybatis + ${common.version} - com.pig4cloud - pig-common-oss - ${pig.common.version} + com.rax + common-oss + ${common.version} - com.pig4cloud - pig-common-security - ${pig.common.version} + com.rax + common-security + ${common.version} - com.pig4cloud - pig-common-feign - ${pig.common.version} + com.rax + common-feign + ${common.version} - com.pig4cloud - pig-common-swagger - ${pig.common.version} + com.rax + common-swagger + ${common.version} - com.pig4cloud - pig-common-xss - ${pig.common.version} + com.rax + common-xss + ${common.version} + + + com.rax + excel-spring-boot-starter + ${common.version} + + + com.rax + upms-api + ${common.version} - com.pig4cloud - pig-upms-api - ${pig.common.version} + com.rax + auth + ${common.version} - com.pig4cloud - pig-auth - ${pig.common.version} - - - com.pig4cloud - pig-quartz - ${pig.common.version} + com.rax + quartz + ${common.version} + + com.rax + vital-signs + ${common.version} + com.mysql mysql-connector-j @@ -139,12 +149,6 @@ fastjson ${fastjson.version} - - - com.pig4cloud.excel - excel-spring-boot-starter - ${excel.version} - org.apache.shardingsphere shardingsphere-jdbc-core diff --git a/pig-common/pig-common-core/pom.xml b/common/common-core/pom.xml similarity index 64% rename from pig-common/pig-common-core/pom.xml rename to common/common-core/pom.xml index f09b475..f1eaf4e 100644 --- a/pig-common/pig-common-core/pom.xml +++ b/common/common-core/pom.xml @@ -1,33 +1,18 @@ - 4.0.0 - com.pig4cloud - pig-common + com.rax + common 3.7.3 - pig-common-core + common-core jar - pig 公共工具类核心包 + 公共工具类核心包 diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/JacksonConfiguration.java b/common/common-core/src/main/java/com/rax/common/core/config/JacksonConfiguration.java similarity index 63% rename from pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/JacksonConfiguration.java rename to common/common-core/src/main/java/com/rax/common/core/config/JacksonConfiguration.java index 7e8b0c0..7a4381b 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/JacksonConfiguration.java +++ b/common/common-core/src/main/java/com/rax/common/core/config/JacksonConfiguration.java @@ -1,25 +1,9 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.common.core.config; +package com.rax.common.core.config; import cn.hutool.core.date.DatePattern; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.pig4cloud.pig.common.core.jackson.PigJavaTimeModule; +import com.rax.common.core.jackson.RaxJavaTimeModule; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; @@ -53,7 +37,7 @@ public class JacksonConfiguration { builder.timeZone(TimeZone.getTimeZone(ZoneId.systemDefault())); builder.simpleDateFormat(DatePattern.NORM_DATETIME_PATTERN); builder.serializerByType(Long.class, ToStringSerializer.instance); - builder.modules(new PigJavaTimeModule()); + builder.modules(new RaxJavaTimeModule()); }; } diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/RedisTemplateConfiguration.java b/common/common-core/src/main/java/com/rax/common/core/config/RedisTemplateConfiguration.java similarity index 74% rename from pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/RedisTemplateConfiguration.java rename to common/common-core/src/main/java/com/rax/common/core/config/RedisTemplateConfiguration.java index 12c4782..f9bf51a 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/RedisTemplateConfiguration.java +++ b/common/common-core/src/main/java/com/rax/common/core/config/RedisTemplateConfiguration.java @@ -1,20 +1,4 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.common.core.config; +package com.rax.common.core.config; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureBefore; diff --git a/common/common-core/src/main/java/com/rax/common/core/config/RestTemplateConfiguration.java b/common/common-core/src/main/java/com/rax/common/core/config/RestTemplateConfiguration.java new file mode 100644 index 0000000..766902e --- /dev/null +++ b/common/common-core/src/main/java/com/rax/common/core/config/RestTemplateConfiguration.java @@ -0,0 +1,19 @@ +package com.rax.common.core.config; + +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.context.annotation.Bean; +import org.springframework.web.client.RestTemplate; + +/** + * @author lengleng + * @date 2019/2/1 RestTemplate + */ +@AutoConfiguration +public class RestTemplateConfiguration { + + @Bean + public RestTemplate restTemplate() { + return new RestTemplate(); + } + +} diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/TaskExecutorConfiguration.java b/common/common-core/src/main/java/com/rax/common/core/config/TaskExecutorConfiguration.java similarity index 94% rename from pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/TaskExecutorConfiguration.java rename to common/common-core/src/main/java/com/rax/common/core/config/TaskExecutorConfiguration.java index 8f49e20..711a8ee 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/TaskExecutorConfiguration.java +++ b/common/common-core/src/main/java/com/rax/common/core/config/TaskExecutorConfiguration.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.common.core.config; +package com.rax.common.core.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.AutoConfiguration; @@ -47,7 +47,7 @@ public class TaskExecutorConfiguration implements AsyncConfigurer { taskExecutor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy()); taskExecutor.setWaitForTasksToCompleteOnShutdown(true); taskExecutor.setAwaitTerminationSeconds(awaitTerminationSeconds.orElse(60)); - taskExecutor.setThreadNamePrefix("PIG-Thread-"); + taskExecutor.setThreadNamePrefix("RAX-Thread-"); taskExecutor.initialize(); return taskExecutor; } diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/WebMvcConfiguration.java b/common/common-core/src/main/java/com/rax/common/core/config/WebMvcConfiguration.java similarity index 69% rename from pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/WebMvcConfiguration.java rename to common/common-core/src/main/java/com/rax/common/core/config/WebMvcConfiguration.java index 9d10e8c..35a9d59 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/WebMvcConfiguration.java +++ b/common/common-core/src/main/java/com/rax/common/core/config/WebMvcConfiguration.java @@ -1,22 +1,7 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.common.core.config; +package com.rax.common.core.config; import cn.hutool.core.date.DatePattern; +import com.rax.common.core.jackson.RaxJavaTimeModule; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.context.MessageSource; @@ -39,7 +24,7 @@ import static org.springframework.boot.autoconfigure.condition.ConditionalOnWebA public class WebMvcConfiguration implements WebMvcConfigurer { /** - * 增加GET请求参数中时间类型转换 {@link com.pig4cloud.pig.common.core.jackson.PigJavaTimeModule} + * 增加GET请求参数中时间类型转换 {@link RaxJavaTimeModule} *

    *
  • HH:mm:ss -> LocalTime
    • *
  • yyyy-MM-dd -> LocalDate
    • diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/CacheConstants.java b/common/common-core/src/main/java/com/rax/common/core/constant/CacheConstants.java similarity index 52% rename from pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/CacheConstants.java rename to common/common-core/src/main/java/com/rax/common/core/constant/CacheConstants.java index cc4e617..d85cc0f 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/CacheConstants.java +++ b/common/common-core/src/main/java/com/rax/common/core/constant/CacheConstants.java @@ -1,20 +1,4 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.common.core.constant; +package com.rax.common.core.constant; /** * @author lengleng diff --git a/common/common-core/src/main/java/com/rax/common/core/constant/CommonConstants.java b/common/common-core/src/main/java/com/rax/common/core/constant/CommonConstants.java new file mode 100644 index 0000000..9b289e1 --- /dev/null +++ b/common/common-core/src/main/java/com/rax/common/core/constant/CommonConstants.java @@ -0,0 +1,69 @@ +package com.rax.common.core.constant; + +/** + * @author lengleng + * @date 2019/2/1 + */ +public interface CommonConstants { + + /** + * 删除 + */ + String STATUS_DEL = "1"; + + /** + * 正常 + */ + String STATUS_NORMAL = "0"; + + /** + * 锁定 + */ + String STATUS_LOCK = "9"; + + /** + * 菜单树根节点 + */ + Long MENU_TREE_ROOT_ID = -1L; + + /** + * 菜单 + */ + String MENU = "0"; + + /** + * 编码 + */ + String UTF8 = "UTF-8"; + + /** + * JSON 资源 + */ + String CONTENT_TYPE = "application/json; charset=utf-8"; + + /** + * 成功标记 + */ + Integer SUCCESS = 0; + + /** + * 失败标记 + */ + Integer FAIL = 1; + + /** + * 当前页 + */ + String CURRENT = "current"; + + /** + * size + */ + String SIZE = "size"; + + /** + * 请求开始时间 + */ + String REQUEST_START_TIME = "REQUEST-START-TIME"; + +} diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/SecurityConstants.java b/common/common-core/src/main/java/com/rax/common/core/constant/SecurityConstants.java similarity index 67% rename from pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/SecurityConstants.java rename to common/common-core/src/main/java/com/rax/common/core/constant/SecurityConstants.java index acda5fa..ab2f42e 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/SecurityConstants.java +++ b/common/common-core/src/main/java/com/rax/common/core/constant/SecurityConstants.java @@ -1,20 +1,4 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.common.core.constant; +package com.rax.common.core.constant; /** * @author lengleng @@ -27,11 +11,6 @@ public interface SecurityConstants { */ String ROLE = "ROLE_"; - /** - * 前缀 - */ - String PROJECT_PREFIX = "pig"; - /** * 项目的license */ diff --git a/common/common-core/src/main/java/com/rax/common/core/constant/ServiceNameConstants.java b/common/common-core/src/main/java/com/rax/common/core/constant/ServiceNameConstants.java new file mode 100644 index 0000000..0ae1b6a --- /dev/null +++ b/common/common-core/src/main/java/com/rax/common/core/constant/ServiceNameConstants.java @@ -0,0 +1,19 @@ +package com.rax.common.core.constant; + +/** + * @author lengleng + * @date 2018年06月22日16:41:01 服务名称 + */ +public interface ServiceNameConstants { + + /** + * 认证服务的SERVICEID + */ + String AUTH_SERVICE = "auth"; + + /** + * UPMS模块 + */ + String UPMS_SERVICE = "upms-biz"; + +} diff --git a/common/common-core/src/main/java/com/rax/common/core/constant/enums/DictTypeEnum.java b/common/common-core/src/main/java/com/rax/common/core/constant/enums/DictTypeEnum.java new file mode 100644 index 0000000..43cfc0a --- /dev/null +++ b/common/common-core/src/main/java/com/rax/common/core/constant/enums/DictTypeEnum.java @@ -0,0 +1,36 @@ +package com.rax.common.core.constant.enums; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +/** + * @author lengleng + * @date 2019-05-16 + *

    + * 字典类型 + */ +@Getter +@RequiredArgsConstructor +public enum DictTypeEnum { + + /** + * 字典类型-系统内置（不可修改） + */ + SYSTEM("1", "系统内置"), + + /** + * 字典类型-业务类型 + */ + BIZ("0", "业务类"); + + /** + * 类型 + */ + private final String type; + + /** + * 描述 + */ + private final String description; + +} diff --git a/common/common-core/src/main/java/com/rax/common/core/constant/enums/LoginTypeEnum.java b/common/common-core/src/main/java/com/rax/common/core/constant/enums/LoginTypeEnum.java new file mode 100644 index 0000000..1e2b1e5 --- /dev/null +++ b/common/common-core/src/main/java/com/rax/common/core/constant/enums/LoginTypeEnum.java @@ -0,0 +1,34 @@ +package com.rax.common.core.constant.enums; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +/** + * @author lengleng + * @date 2018/8/15 社交登录类型 + */ +@Getter +@RequiredArgsConstructor +public enum LoginTypeEnum { + + /** + * 账号密码登录 + */ + PWD("PWD", "账号密码登录"), + + /** + * 验证码登录 + */ + SMS("SMS", "验证码登录"); + + /** + * 类型 + */ + private final String type; + + /** + * 描述 + */ + private final String description; + +} diff --git a/common/common-core/src/main/java/com/rax/common/core/constant/enums/MenuTypeEnum.java b/common/common-core/src/main/java/com/rax/common/core/constant/enums/MenuTypeEnum.java new file mode 100644 index 0000000..4ef0cfe --- /dev/null +++ b/common/common-core/src/main/java/com/rax/common/core/constant/enums/MenuTypeEnum.java @@ -0,0 +1,41 @@ +package com.rax.common.core.constant.enums; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +/** + * @author lengleng + * @date 2020-02-17 + *

    + * 菜单类型 + */ +@Getter +@RequiredArgsConstructor +public enum MenuTypeEnum { + + /** + * 左侧菜单 + */ + LEFT_MENU("0", "left"), + + /** + * 顶部菜单 + */ + TOP_MENU("2", "top"), + + /** + * 按钮 + */ + BUTTON("1", "button"); + + /** + * 类型 + */ + private final String type; + + /** + * 描述 + */ + private final String description; + +} diff --git a/common/common-core/src/main/java/com/rax/common/core/exception/CheckedException.java b/common/common-core/src/main/java/com/rax/common/core/exception/CheckedException.java new file mode 100644 index 0000000..7773244 --- /dev/null +++ b/common/common-core/src/main/java/com/rax/common/core/exception/CheckedException.java @@ -0,0 +1,30 @@ +package com.rax.common.core.exception; + +import lombok.NoArgsConstructor; + +/** + * @author lengleng + * @date 😴2018年06月22日16:21:57 + */ +@NoArgsConstructor +public class CheckedException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + public CheckedException(String message) { + super(message); + } + + public CheckedException(Throwable cause) { + super(cause); + } + + public CheckedException(String message, Throwable cause) { + super(message, cause); + } + + public CheckedException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { + super(message, cause, enableSuppression, writableStackTrace); + } + +} diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/exception/ErrorCodes.java b/common/common-core/src/main/java/com/rax/common/core/exception/ErrorCodes.java similarity index 97% rename from pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/exception/ErrorCodes.java rename to common/common-core/src/main/java/com/rax/common/core/exception/ErrorCodes.java index 404a16f..711a376 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/exception/ErrorCodes.java +++ b/common/common-core/src/main/java/com/rax/common/core/exception/ErrorCodes.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.common.core.exception; +package com.rax.common.core.exception; /** * 错误编码 diff --git a/common/common-core/src/main/java/com/rax/common/core/exception/RaxDeniedException.java b/common/common-core/src/main/java/com/rax/common/core/exception/RaxDeniedException.java new file mode 100644 index 0000000..77f94d5 --- /dev/null +++ b/common/common-core/src/main/java/com/rax/common/core/exception/RaxDeniedException.java @@ -0,0 +1,30 @@ +package com.rax.common.core.exception; + +import lombok.NoArgsConstructor; + +/** + * @author lengleng + * @date 2018年06月22日16:22:03 403 授权拒绝 + */ +@NoArgsConstructor +public class RaxDeniedException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + public RaxDeniedException(String message) { + super(message); + } + + public RaxDeniedException(Throwable cause) { + super(cause); + } + + public RaxDeniedException(String message, Throwable cause) { + super(message, cause); + } + + public RaxDeniedException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { + super(message, cause, enableSuppression, writableStackTrace); + } + +} diff --git a/common/common-core/src/main/java/com/rax/common/core/exception/ValidateCodeException.java b/common/common-core/src/main/java/com/rax/common/core/exception/ValidateCodeException.java new file mode 100644 index 0000000..c4a143f --- /dev/null +++ b/common/common-core/src/main/java/com/rax/common/core/exception/ValidateCodeException.java @@ -0,0 +1,18 @@ +package com.rax.common.core.exception; + +/** + * @author lengleng + * @date 2018年06月22日16:22:15 + */ +public class ValidateCodeException extends RuntimeException { + + private static final long serialVersionUID = -7285211528095468156L; + + public ValidateCodeException() { + } + + public ValidateCodeException(String msg) { + super(msg); + } + +} diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/factory/YamlPropertySourceFactory.java b/common/common-core/src/main/java/com/rax/common/core/factory/YamlPropertySourceFactory.java similarity index 96% rename from pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/factory/YamlPropertySourceFactory.java rename to common/common-core/src/main/java/com/rax/common/core/factory/YamlPropertySourceFactory.java index 7b5bb3a..29fc0a8 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/factory/YamlPropertySourceFactory.java +++ b/common/common-core/src/main/java/com/rax/common/core/factory/YamlPropertySourceFactory.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.common.core.factory; +package com.rax.common.core.factory; import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; import org.springframework.core.env.PropertiesPropertySource; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/jackson/PigJavaTimeModule.java b/common/common-core/src/main/java/com/rax/common/core/jackson/RaxJavaTimeModule.java similarity index 73% rename from pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/jackson/PigJavaTimeModule.java rename to common/common-core/src/main/java/com/rax/common/core/jackson/RaxJavaTimeModule.java index f51ac79..6c703f7 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/jackson/PigJavaTimeModule.java +++ b/common/common-core/src/main/java/com/rax/common/core/jackson/RaxJavaTimeModule.java @@ -1,19 +1,4 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.pig4cloud.pig.common.core.jackson; +package com.rax.common.core.jackson; import cn.hutool.core.date.DatePattern; import com.fasterxml.jackson.databind.module.SimpleModule; @@ -40,9 +25,9 @@ import java.time.format.DateTimeFormatter; * @author lishanbu */ -public class PigJavaTimeModule extends SimpleModule { +public class RaxJavaTimeModule extends SimpleModule { - public PigJavaTimeModule() { + public RaxJavaTimeModule() { super(PackageVersion.VERSION); // ======================= 时间序列化规则 =============================== diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/ClassUtils.java b/common/common-core/src/main/java/com/rax/common/core/util/ClassUtils.java similarity index 98% rename from pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/ClassUtils.java rename to common/common-core/src/main/java/com/rax/common/core/util/ClassUtils.java index 6668c67..36eade5 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/ClassUtils.java +++ b/common/common-core/src/main/java/com/rax/common/core/util/ClassUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.core.util; +package com.rax.common.core.util; import lombok.experimental.UtilityClass; import org.springframework.core.BridgeMethodResolver; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/MsgUtils.java b/common/common-core/src/main/java/com/rax/common/core/util/MsgUtils.java similarity index 96% rename from pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/MsgUtils.java rename to common/common-core/src/main/java/com/rax/common/core/util/MsgUtils.java index ec6001c..5fbe6a0 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/MsgUtils.java +++ b/common/common-core/src/main/java/com/rax/common/core/util/MsgUtils.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.common.core.util; +package com.rax.common.core.util; import lombok.experimental.UtilityClass; import org.springframework.context.MessageSource; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/R.java b/common/common-core/src/main/java/com/rax/common/core/util/R.java similarity index 94% rename from pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/R.java rename to common/common-core/src/main/java/com/rax/common/core/util/R.java index 7b79afa..1255b5e 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/R.java +++ b/common/common-core/src/main/java/com/rax/common/core/util/R.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.core.util; +package com.rax.common.core.util; -import com.pig4cloud.pig.common.core.constant.CommonConstants; +import com.rax.common.core.constant.CommonConstants; import lombok.*; import lombok.experimental.Accessors; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/RedisUtils.java b/common/common-core/src/main/java/com/rax/common/core/util/RedisUtils.java similarity index 99% rename from pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/RedisUtils.java rename to common/common-core/src/main/java/com/rax/common/core/util/RedisUtils.java index c02039a..ff5fe37 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/RedisUtils.java +++ b/common/common-core/src/main/java/com/rax/common/core/util/RedisUtils.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.common.core.util; +package com.rax.common.core.util; import cn.hutool.core.convert.Convert; import lombok.experimental.UtilityClass; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/RetOps.java b/common/common-core/src/main/java/com/rax/common/core/util/RetOps.java similarity index 88% rename from pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/RetOps.java rename to common/common-core/src/main/java/com/rax/common/core/util/RetOps.java index ea59db5..d509ef6 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/RetOps.java +++ b/common/common-core/src/main/java/com/rax/common/core/util/RetOps.java @@ -1,26 +1,7 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.common.core.util; +package com.rax.common.core.util; import cn.hutool.core.util.ObjectUtil; -import com.pig4cloud.pig.common.core.constant.CommonConstants; +import com.rax.common.core.constant.CommonConstants; import java.util.Arrays; import java.util.Objects; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/SpringContextHolder.java b/common/common-core/src/main/java/com/rax/common/core/util/SpringContextHolder.java similarity index 98% rename from pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/SpringContextHolder.java rename to common/common-core/src/main/java/com/rax/common/core/util/SpringContextHolder.java index 7c85c2d..120c294 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/SpringContextHolder.java +++ b/common/common-core/src/main/java/com/rax/common/core/util/SpringContextHolder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.core.util; +package com.rax.common.core.util; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/WebUtils.java b/common/common-core/src/main/java/com/rax/common/core/util/WebUtils.java similarity index 97% rename from pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/WebUtils.java rename to common/common-core/src/main/java/com/rax/common/core/util/WebUtils.java index 841c872..6543a98 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/WebUtils.java +++ b/common/common-core/src/main/java/com/rax/common/core/util/WebUtils.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.core.util; +package com.rax.common.core.util; import cn.hutool.core.codec.Base64; -import com.pig4cloud.pig.common.core.exception.CheckedException; +import com.rax.common.core.exception.CheckedException; import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/common/common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/common/common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..f76972a --- /dev/null +++ b/common/common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,6 @@ +com.rax.common.core.config.TaskExecutorConfiguration +com.rax.common.core.config.JacksonConfiguration +com.rax.common.core.config.RedisTemplateConfiguration +com.rax.common.core.config.RestTemplateConfiguration +com.rax.common.core.util.SpringContextHolder +com.rax.common.core.config.WebMvcConfiguration diff --git a/common/common-core/src/main/resources/banner.txt b/common/common-core/src/main/resources/banner.txt new file mode 100644 index 0000000..6b00178 --- /dev/null +++ b/common/common-core/src/main/resources/banner.txt @@ -0,0 +1,20 @@ +${AnsiColor.BRIGHT_YELLOW} + + + ██▀███ ▄▄▄ ▒██ ██▒ +▓██ ▒ ██▒▒████▄ ▒▒ █ █ ▒░ +▓██ ░▄█ ▒▒██ ▀█▄ ░░ █ ░ +▒██▀▀█▄ ░██▄▄▄▄██ ░ █ █ ▒ +░██▓ ▒██▒ ▓█ ▓██▒▒██▒ ▒██▒ +░ ▒▓ ░▒▓░ ▒▒ ▓▒█░▒▒ ░ ░▓ ░ + ░▒ ░ ▒░ ▒ ▒▒ ░░░ ░▒ ░ + ░░ ░ ░ ▒ ░ ░ + ░ ░ ░ ░ ░ + + + + Rax Microservice Architecture +${AnsiColor.DEFAULT} + + + diff --git a/pig-common/pig-common-core/src/main/resources/i18n/messages_zh_CN.properties b/common/common-core/src/main/resources/i18n/messages_zh_CN.properties similarity index 100% rename from pig-common/pig-common-core/src/main/resources/i18n/messages_zh_CN.properties rename to common/common-core/src/main/resources/i18n/messages_zh_CN.properties diff --git a/pig-common/pig-common-core/src/main/resources/logback-spring.xml b/common/common-core/src/main/resources/logback-spring.xml similarity index 79% rename from pig-common/pig-common-core/src/main/resources/logback-spring.xml rename to common/common-core/src/main/resources/logback-spring.xml index d9daae9..d7ee8c0 100644 --- a/pig-common/pig-common-core/src/main/resources/logback-spring.xml +++ b/common/common-core/src/main/resources/logback-spring.xml @@ -1,20 +1,4 @@ - - diff --git a/common/common-datasource/pom.xml b/common/common-datasource/pom.xml new file mode 100644 index 0000000..517d158 --- /dev/null +++ b/common/common-datasource/pom.xml @@ -0,0 +1,31 @@ + + + + + common + com.rax + 3.7.3 + + 4.0.0 + + com.rax + common-datasource + + jar + + 动态切换数据源 + + + + + com.baomidou + dynamic-datasource-spring-boot3-starter + + + jakarta.servlet + jakarta.servlet-api + + + diff --git a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/DynamicDataSourceAutoConfiguration.java b/common/common-datasource/src/main/java/com/rax/common/datasource/DynamicDataSourceAutoConfiguration.java similarity index 92% rename from pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/DynamicDataSourceAutoConfiguration.java rename to common/common-datasource/src/main/java/com/rax/common/datasource/DynamicDataSourceAutoConfiguration.java index ccbe66f..3f08e44 100644 --- a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/DynamicDataSourceAutoConfiguration.java +++ b/common/common-datasource/src/main/java/com/rax/common/datasource/DynamicDataSourceAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.datasource; +package com.rax.common.datasource; import com.baomidou.dynamic.datasource.creator.DataSourceCreator; import com.baomidou.dynamic.datasource.creator.DefaultDataSourceCreator; @@ -24,10 +24,10 @@ import com.baomidou.dynamic.datasource.processor.DsJakartaSessionProcessor; import com.baomidou.dynamic.datasource.processor.DsProcessor; import com.baomidou.dynamic.datasource.processor.DsSpelExpressionProcessor; import com.baomidou.dynamic.datasource.provider.DynamicDataSourceProvider; -import com.pig4cloud.pig.common.datasource.config.ClearTtlDataSourceFilter; -import com.pig4cloud.pig.common.datasource.config.DataSourceProperties; -import com.pig4cloud.pig.common.datasource.config.JdbcDynamicDataSourceProvider; -import com.pig4cloud.pig.common.datasource.config.LastParamDsProcessor; +import com.rax.common.datasource.config.ClearTtlDataSourceFilter; +import com.rax.common.datasource.config.DataSourceProperties; +import com.rax.common.datasource.config.JdbcDynamicDataSourceProvider; +import com.rax.common.datasource.config.LastParamDsProcessor; import org.jasypt.encryption.StringEncryptor; import org.springframework.beans.factory.BeanFactory; import org.springframework.boot.autoconfigure.AutoConfigureAfter; diff --git a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/annotation/EnableDynamicDataSource.java b/common/common-datasource/src/main/java/com/rax/common/datasource/annotation/EnableDynamicDataSource.java similarity index 86% rename from pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/annotation/EnableDynamicDataSource.java rename to common/common-datasource/src/main/java/com/rax/common/datasource/annotation/EnableDynamicDataSource.java index 6e18b85..a4e7ed3 100644 --- a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/annotation/EnableDynamicDataSource.java +++ b/common/common-datasource/src/main/java/com/rax/common/datasource/annotation/EnableDynamicDataSource.java @@ -14,15 +14,14 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.datasource.annotation; +package com.rax.common.datasource.annotation; -import com.pig4cloud.pig.common.datasource.DynamicDataSourceAutoConfiguration; +import com.rax.common.datasource.DynamicDataSourceAutoConfiguration; import org.springframework.context.annotation.Import; import java.lang.annotation.*; /** - * @author Lucky * @date 2019-05-18 *

    * 开启动态数据源 diff --git a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/config/ClearTtlDataSourceFilter.java b/common/common-datasource/src/main/java/com/rax/common/datasource/config/ClearTtlDataSourceFilter.java similarity index 94% rename from pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/config/ClearTtlDataSourceFilter.java rename to common/common-datasource/src/main/java/com/rax/common/datasource/config/ClearTtlDataSourceFilter.java index c4e1b97..658486e 100644 --- a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/config/ClearTtlDataSourceFilter.java +++ b/common/common-datasource/src/main/java/com/rax/common/datasource/config/ClearTtlDataSourceFilter.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.common.datasource.config; +package com.rax.common.datasource.config; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import jakarta.servlet.FilterChain; diff --git a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/config/DataSourceProperties.java b/common/common-datasource/src/main/java/com/rax/common/datasource/config/DataSourceProperties.java similarity index 95% rename from pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/config/DataSourceProperties.java rename to common/common-datasource/src/main/java/com/rax/common/datasource/config/DataSourceProperties.java index 3da42e4..87178b5 100644 --- a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/config/DataSourceProperties.java +++ b/common/common-datasource/src/main/java/com/rax/common/datasource/config/DataSourceProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.datasource.config; +package com.rax.common.datasource.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/config/JdbcDynamicDataSourceProvider.java b/common/common-datasource/src/main/java/com/rax/common/datasource/config/JdbcDynamicDataSourceProvider.java similarity index 95% rename from pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/config/JdbcDynamicDataSourceProvider.java rename to common/common-datasource/src/main/java/com/rax/common/datasource/config/JdbcDynamicDataSourceProvider.java index ca1433d..38188fb 100644 --- a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/config/JdbcDynamicDataSourceProvider.java +++ b/common/common-datasource/src/main/java/com/rax/common/datasource/config/JdbcDynamicDataSourceProvider.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.datasource.config; +package com.rax.common.datasource.config; import com.baomidou.dynamic.datasource.creator.DataSourceProperty; import com.baomidou.dynamic.datasource.creator.DefaultDataSourceCreator; import com.baomidou.dynamic.datasource.provider.AbstractJdbcDataSourceProvider; -import com.pig4cloud.pig.common.datasource.support.DataSourceConstants; +import com.rax.common.datasource.support.DataSourceConstants; import org.jasypt.encryption.StringEncryptor; import java.sql.ResultSet; diff --git a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/config/LastParamDsProcessor.java b/common/common-datasource/src/main/java/com/rax/common/datasource/config/LastParamDsProcessor.java similarity index 61% rename from pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/config/LastParamDsProcessor.java rename to common/common-datasource/src/main/java/com/rax/common/datasource/config/LastParamDsProcessor.java index 87e13f3..94c748e 100644 --- a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/config/LastParamDsProcessor.java +++ b/common/common-datasource/src/main/java/com/rax/common/datasource/config/LastParamDsProcessor.java @@ -1,27 +1,10 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.common.datasource.config; +package com.rax.common.datasource.config; import com.baomidou.dynamic.datasource.processor.DsProcessor; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import org.aopalliance.intercept.MethodInvocation; /** - * @author lengleng * @date 2020/2/6 *

    * 参数数据源解析 @DS("#last) diff --git a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/enums/DsConfTypeEnum.java b/common/common-datasource/src/main/java/com/rax/common/datasource/enums/DsConfTypeEnum.java similarity index 87% rename from pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/enums/DsConfTypeEnum.java rename to common/common-datasource/src/main/java/com/rax/common/datasource/enums/DsConfTypeEnum.java index 2289806..35f0395 100644 --- a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/enums/DsConfTypeEnum.java +++ b/common/common-datasource/src/main/java/com/rax/common/datasource/enums/DsConfTypeEnum.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.common.datasource.enums; +package com.rax.common.datasource.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/enums/DsJdbcUrlEnum.java b/common/common-datasource/src/main/java/com/rax/common/datasource/enums/DsJdbcUrlEnum.java similarity index 96% rename from pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/enums/DsJdbcUrlEnum.java rename to common/common-datasource/src/main/java/com/rax/common/datasource/enums/DsJdbcUrlEnum.java index ccdad2e..3a1c335 100644 --- a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/enums/DsJdbcUrlEnum.java +++ b/common/common-datasource/src/main/java/com/rax/common/datasource/enums/DsJdbcUrlEnum.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.common.datasource.enums; +package com.rax.common.datasource.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/support/DataSourceConstants.java b/common/common-datasource/src/main/java/com/rax/common/datasource/support/DataSourceConstants.java similarity index 95% rename from pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/support/DataSourceConstants.java rename to common/common-datasource/src/main/java/com/rax/common/datasource/support/DataSourceConstants.java index 8180f97..19002b6 100644 --- a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/support/DataSourceConstants.java +++ b/common/common-datasource/src/main/java/com/rax/common/datasource/support/DataSourceConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.datasource.support; +package com.rax.common.datasource.support; /** * @author lengleng diff --git a/pig-common/pig-common-feign/pom.xml b/common/common-feign/pom.xml similarity index 68% rename from pig-common/pig-common-feign/pom.xml rename to common/common-feign/pom.xml index 6ce9eb1..99fd82e 100644 --- a/pig-common/pig-common-feign/pom.xml +++ b/common/common-feign/pom.xml @@ -1,38 +1,24 @@ - + - com.pig4cloud - pig-common + com.rax + common 3.7.3 4.0.0 jar - pig-common-feign + common-feign feign-sentinel服务降级熔断、限流组件 - com.pig4cloud - pig-common-core + com.rax + common-core com.alibaba.cloud diff --git a/pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/PigFeignAutoConfiguration.java b/common/common-feign/src/main/java/com/rax/common/feign/RaxFeignAutoConfiguration.java similarity index 78% rename from pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/PigFeignAutoConfiguration.java rename to common/common-feign/src/main/java/com/rax/common/feign/RaxFeignAutoConfiguration.java index c9f4d3f..5b1da06 100644 --- a/pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/PigFeignAutoConfiguration.java +++ b/common/common-feign/src/main/java/com/rax/common/feign/RaxFeignAutoConfiguration.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.feign; +package com.rax.common.feign; import com.alibaba.cloud.sentinel.feign.SentinelFeignAutoConfiguration; import com.alibaba.csp.sentinel.adapter.spring.webmvc.callback.BlockExceptionHandler; import com.alibaba.csp.sentinel.adapter.spring.webmvc.callback.RequestOriginParser; import com.fasterxml.jackson.databind.ObjectMapper; -import com.pig4cloud.pig.common.feign.sentinel.ext.PigSentinelFeign; -import com.pig4cloud.pig.common.feign.sentinel.handle.PigUrlBlockHandler; -import com.pig4cloud.pig.common.feign.sentinel.parser.PigHeaderRequestOriginParser; +import com.rax.common.feign.sentinel.ext.RaxSentinelFeign; +import com.rax.common.feign.sentinel.handle.RaxUrlBlockHandler; +import com.rax.common.feign.sentinel.parser.RaxHeaderRequestOriginParser; import feign.Feign; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.cloud.openfeign.PigFeignClientsRegistrar; +import org.springframework.cloud.openfeign.RaxFeignClientsRegistrar; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -40,28 +40,28 @@ import org.springframework.context.annotation.Scope; * @date 2020-02-12 */ @Configuration(proxyBeanMethods = false) -@Import(PigFeignClientsRegistrar.class) +@Import(RaxFeignClientsRegistrar.class) @AutoConfigureBefore(SentinelFeignAutoConfiguration.class) -public class PigFeignAutoConfiguration { +public class RaxFeignAutoConfiguration { @Bean @Scope("prototype") @ConditionalOnMissingBean @ConditionalOnProperty(name = "feign.sentinel.enabled") public Feign.Builder feignSentinelBuilder() { - return PigSentinelFeign.builder(); + return RaxSentinelFeign.builder(); } @Bean @ConditionalOnMissingBean public BlockExceptionHandler blockExceptionHandler(ObjectMapper objectMapper) { - return new PigUrlBlockHandler(objectMapper); + return new RaxUrlBlockHandler(objectMapper); } @Bean @ConditionalOnMissingBean public RequestOriginParser requestOriginParser() { - return new PigHeaderRequestOriginParser(); + return new RaxHeaderRequestOriginParser(); } } diff --git a/pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/annotation/EnablePigFeignClients.java b/common/common-feign/src/main/java/com/rax/common/feign/annotation/EnableRaxFeignClients.java similarity index 91% rename from pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/annotation/EnablePigFeignClients.java rename to common/common-feign/src/main/java/com/rax/common/feign/annotation/EnableRaxFeignClients.java index 37e4c8d..36788d3 100644 --- a/pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/annotation/EnablePigFeignClients.java +++ b/common/common-feign/src/main/java/com/rax/common/feign/annotation/EnableRaxFeignClients.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.feign.annotation; +package com.rax.common.feign.annotation; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.core.annotation.AliasFor; @@ -29,7 +29,7 @@ import java.lang.annotation.*; @Retention(RetentionPolicy.RUNTIME) @Documented @EnableFeignClients -public @interface EnablePigFeignClients { +public @interface EnableRaxFeignClients { /** * Alias for the {@link #basePackages()} attribute. Allows for more concise annotation @@ -49,6 +49,6 @@ public @interface EnablePigFeignClients { * @return the array of 'basePackages'. */ @AliasFor(annotation = EnableFeignClients.class, attribute = "basePackages") - String[] basePackages() default { "com.pig4cloud.pig" }; + String[] basePackages() default { "com.rax" }; } diff --git a/pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/sentinel/SentinelAutoConfiguration.java b/common/common-feign/src/main/java/com/rax/common/feign/sentinel/SentinelAutoConfiguration.java similarity index 84% rename from pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/sentinel/SentinelAutoConfiguration.java rename to common/common-feign/src/main/java/com/rax/common/feign/sentinel/SentinelAutoConfiguration.java index ca8cbcb..09c975b 100644 --- a/pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/sentinel/SentinelAutoConfiguration.java +++ b/common/common-feign/src/main/java/com/rax/common/feign/sentinel/SentinelAutoConfiguration.java @@ -15,15 +15,15 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.common.feign.sentinel; +package com.rax.common.feign.sentinel; import com.alibaba.cloud.sentinel.feign.SentinelFeignAutoConfiguration; import com.alibaba.csp.sentinel.adapter.spring.webmvc.callback.BlockExceptionHandler; import com.alibaba.csp.sentinel.adapter.spring.webmvc.callback.RequestOriginParser; import com.fasterxml.jackson.databind.ObjectMapper; -import com.pig4cloud.pig.common.feign.sentinel.ext.PigSentinelFeign; -import com.pig4cloud.pig.common.feign.sentinel.handle.PigUrlBlockHandler; -import com.pig4cloud.pig.common.feign.sentinel.parser.PigHeaderRequestOriginParser; +import com.rax.common.feign.sentinel.ext.RaxSentinelFeign; +import com.rax.common.feign.sentinel.handle.RaxUrlBlockHandler; +import com.rax.common.feign.sentinel.parser.RaxHeaderRequestOriginParser; import feign.Feign; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -47,19 +47,19 @@ public class SentinelAutoConfiguration { @ConditionalOnMissingBean @ConditionalOnProperty(name = "spring.cloud.openfeign.sentinel.enabled") public Feign.Builder feignSentinelBuilder() { - return PigSentinelFeign.builder(); + return RaxSentinelFeign.builder(); } @Bean @ConditionalOnMissingBean public BlockExceptionHandler blockExceptionHandler(ObjectMapper objectMapper) { - return new PigUrlBlockHandler(objectMapper); + return new RaxUrlBlockHandler(objectMapper); } @Bean @ConditionalOnMissingBean public RequestOriginParser requestOriginParser() { - return new PigHeaderRequestOriginParser(); + return new RaxHeaderRequestOriginParser(); } } diff --git a/pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/sentinel/ext/PigSentinelFeign.java b/common/common-feign/src/main/java/com/rax/common/feign/sentinel/ext/RaxSentinelFeign.java similarity index 90% rename from pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/sentinel/ext/PigSentinelFeign.java rename to common/common-feign/src/main/java/com/rax/common/feign/sentinel/ext/RaxSentinelFeign.java index c7c169b..753c682 100644 --- a/pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/sentinel/ext/PigSentinelFeign.java +++ b/common/common-feign/src/main/java/com/rax/common/feign/sentinel/ext/RaxSentinelFeign.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.feign.sentinel.ext; +package com.rax.common.feign.sentinel.ext; import com.alibaba.cloud.sentinel.feign.SentinelContractHolder; import feign.Contract; @@ -42,14 +42,14 @@ import java.util.Map; * @author lengleng * @date 2020/6/9 */ -public final class PigSentinelFeign { +public final class RaxSentinelFeign { - private PigSentinelFeign() { + private RaxSentinelFeign() { } - public static PigSentinelFeign.Builder builder() { - return new PigSentinelFeign.Builder(); + public static RaxSentinelFeign.Builder builder() { + return new RaxSentinelFeign.Builder(); } public static final class Builder extends Feign.Builder implements ApplicationContextAware { @@ -66,7 +66,7 @@ public final class PigSentinelFeign { } @Override - public PigSentinelFeign.Builder contract(Contract contract) { + public RaxSentinelFeign.Builder contract(Contract contract) { this.contract = contract; return this; } @@ -91,16 +91,16 @@ public final class PigSentinelFeign { FallbackFactory fallbackFactoryInstance; if (void.class != fallback) { fallbackInstance = getFromContext(beanName, "fallback", fallback, target.type()); - return new PigSentinelInvocationHandler(target, dispatch, + return new RaxSentinelInvocationHandler(target, dispatch, new FallbackFactory.Default(fallbackInstance)); } if (void.class != fallbackFactory) { fallbackFactoryInstance = (FallbackFactory) getFromContext(beanName, "fallbackFactory", fallbackFactory, FallbackFactory.class); - return new PigSentinelInvocationHandler(target, dispatch, fallbackFactoryInstance); + return new RaxSentinelInvocationHandler(target, dispatch, fallbackFactoryInstance); } - return new PigSentinelInvocationHandler(target, dispatch); + return new RaxSentinelInvocationHandler(target, dispatch); } private Object getFromContext(String name, String type, Class fallbackType, Class targetType) { diff --git a/pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/sentinel/ext/PigSentinelInvocationHandler.java b/common/common-feign/src/main/java/com/rax/common/feign/sentinel/ext/RaxSentinelInvocationHandler.java similarity index 93% rename from pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/sentinel/ext/PigSentinelInvocationHandler.java rename to common/common-feign/src/main/java/com/rax/common/feign/sentinel/ext/RaxSentinelInvocationHandler.java index 55d9122..af8e38b 100644 --- a/pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/sentinel/ext/PigSentinelInvocationHandler.java +++ b/common/common-feign/src/main/java/com/rax/common/feign/sentinel/ext/RaxSentinelInvocationHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.feign.sentinel.ext; +package com.rax.common.feign.sentinel.ext; import com.alibaba.cloud.sentinel.feign.SentinelContractHolder; import com.alibaba.cloud.sentinel.feign.SentinelInvocationHandler; @@ -24,7 +24,7 @@ import com.alibaba.csp.sentinel.SphU; import com.alibaba.csp.sentinel.Tracer; import com.alibaba.csp.sentinel.context.ContextUtil; import com.alibaba.csp.sentinel.slots.block.BlockException; -import com.pig4cloud.pig.common.core.util.R; +import com.rax.common.core.util.R; import feign.Feign; import feign.InvocationHandlerFactory; import feign.MethodMetadata; @@ -48,7 +48,7 @@ import static feign.Util.checkNotNull; * @date 2020/6/9 */ @Slf4j -public class PigSentinelInvocationHandler implements InvocationHandler { +public class RaxSentinelInvocationHandler implements InvocationHandler { public static final String EQUALS = "equals"; @@ -64,15 +64,15 @@ public class PigSentinelInvocationHandler implements InvocationHandler { private Map fallbackMethodMap; - PigSentinelInvocationHandler(Target target, Map dispatch, - FallbackFactory fallbackFactory) { + RaxSentinelInvocationHandler(Target target, Map dispatch, + FallbackFactory fallbackFactory) { this.target = checkNotNull(target, "target"); this.dispatch = checkNotNull(dispatch, "dispatch"); this.fallbackFactory = fallbackFactory; this.fallbackMethodMap = toFallbackMethod(dispatch); } - PigSentinelInvocationHandler(Target target, Map dispatch) { + RaxSentinelInvocationHandler(Target target, Map dispatch) { this.target = checkNotNull(target, "target"); this.dispatch = checkNotNull(dispatch, "dispatch"); } @@ -163,7 +163,7 @@ public class PigSentinelInvocationHandler implements InvocationHandler { @Override public boolean equals(Object obj) { if (obj instanceof SentinelInvocationHandler) { - PigSentinelInvocationHandler other = (PigSentinelInvocationHandler) obj; + RaxSentinelInvocationHandler other = (RaxSentinelInvocationHandler) obj; return target.equals(other.target); } return false; diff --git a/pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/sentinel/handle/GlobalBizExceptionHandler.java b/common/common-feign/src/main/java/com/rax/common/feign/sentinel/handle/GlobalBizExceptionHandler.java similarity index 97% rename from pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/sentinel/handle/GlobalBizExceptionHandler.java rename to common/common-feign/src/main/java/com/rax/common/feign/sentinel/handle/GlobalBizExceptionHandler.java index da465e0..8e3a522 100644 --- a/pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/sentinel/handle/GlobalBizExceptionHandler.java +++ b/common/common-feign/src/main/java/com/rax/common/feign/sentinel/handle/GlobalBizExceptionHandler.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.feign.sentinel.handle; +package com.rax.common.feign.sentinel.handle; import com.alibaba.csp.sentinel.Tracer; -import com.pig4cloud.pig.common.core.util.R; +import com.rax.common.core.util.R; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.core.annotation.Order; @@ -40,7 +40,6 @@ import java.util.List; * 全局异常处理器结合sentinel 全局异常处理器不能作用在 oauth server https://gitee.com/log4j/pig/issues/I1M2TJ *

    * - * @author lengleng * @date 2020-06-29 */ @Slf4j diff --git a/pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/sentinel/handle/PigUrlBlockHandler.java b/common/common-feign/src/main/java/com/rax/common/feign/sentinel/handle/RaxUrlBlockHandler.java similarity index 58% rename from pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/sentinel/handle/PigUrlBlockHandler.java rename to common/common-feign/src/main/java/com/rax/common/feign/sentinel/handle/RaxUrlBlockHandler.java index c8fabd7..e1c95e7 100644 --- a/pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/sentinel/handle/PigUrlBlockHandler.java +++ b/common/common-feign/src/main/java/com/rax/common/feign/sentinel/handle/RaxUrlBlockHandler.java @@ -1,25 +1,9 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.common.feign.sentinel.handle; +package com.rax.common.feign.sentinel.handle; import com.alibaba.csp.sentinel.adapter.spring.webmvc.callback.BlockExceptionHandler; import com.alibaba.csp.sentinel.slots.block.BlockException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.pig4cloud.pig.common.core.util.R; +import com.rax.common.core.util.R; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; @@ -32,12 +16,11 @@ import org.springframework.http.MediaType; *

    * {@link com.alibaba.csp.sentinel.adapter.spring.webmvc.callback.DefaultBlockExceptionHandler} * - * @author lengleng * @date 2020-06-11 */ @Slf4j @RequiredArgsConstructor -public class PigUrlBlockHandler implements BlockExceptionHandler { +public class RaxUrlBlockHandler implements BlockExceptionHandler { private final ObjectMapper objectMapper; diff --git a/pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/sentinel/parser/PigHeaderRequestOriginParser.java b/common/common-feign/src/main/java/com/rax/common/feign/sentinel/parser/RaxHeaderRequestOriginParser.java similarity index 89% rename from pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/sentinel/parser/PigHeaderRequestOriginParser.java rename to common/common-feign/src/main/java/com/rax/common/feign/sentinel/parser/RaxHeaderRequestOriginParser.java index 4a2ef38..8607cfa 100644 --- a/pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/sentinel/parser/PigHeaderRequestOriginParser.java +++ b/common/common-feign/src/main/java/com/rax/common/feign/sentinel/parser/RaxHeaderRequestOriginParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.feign.sentinel.parser; +package com.rax.common.feign.sentinel.parser; import com.alibaba.csp.sentinel.adapter.spring.webmvc.callback.RequestOriginParser; import jakarta.servlet.http.HttpServletRequest; @@ -22,10 +22,9 @@ import jakarta.servlet.http.HttpServletRequest; /** * sentinel 请求头解析判断 * - * @author lengleng * @date 2020-06-11 */ -public class PigHeaderRequestOriginParser implements RequestOriginParser { +public class RaxHeaderRequestOriginParser implements RequestOriginParser { /** * 请求头获取allow diff --git a/pig-common/pig-common-feign/src/main/java/org/springframework/cloud/openfeign/PigFeignClientsRegistrar.java b/common/common-feign/src/main/java/org/springframework/cloud/openfeign/RaxFeignClientsRegistrar.java similarity index 98% rename from pig-common/pig-common-feign/src/main/java/org/springframework/cloud/openfeign/PigFeignClientsRegistrar.java rename to common/common-feign/src/main/java/org/springframework/cloud/openfeign/RaxFeignClientsRegistrar.java index b72b99f..1fb368e 100644 --- a/pig-common/pig-common-feign/src/main/java/org/springframework/cloud/openfeign/PigFeignClientsRegistrar.java +++ b/common/common-feign/src/main/java/org/springframework/cloud/openfeign/RaxFeignClientsRegistrar.java @@ -17,7 +17,7 @@ package org.springframework.cloud.openfeign; -import com.pig4cloud.pig.common.feign.PigFeignAutoConfiguration; +import com.rax.common.feign.RaxFeignAutoConfiguration; import lombok.Getter; import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.config.BeanDefinitionHolder; @@ -47,7 +47,7 @@ import java.util.Map; *

    * feign 自动配置功能 from mica */ -public class PigFeignClientsRegistrar implements ImportBeanDefinitionRegistrar, BeanClassLoaderAware, EnvironmentAware { +public class RaxFeignClientsRegistrar implements ImportBeanDefinitionRegistrar, BeanClassLoaderAware, EnvironmentAware { private final static String BASE_URL = "http://127.0.0.1:${server.port}${server.servlet.context-path}"; @@ -155,7 +155,7 @@ public class PigFeignClientsRegistrar implements ImportBeanDefinitionRegistrar, * @return the factory class */ private Class getSpringFactoriesLoaderFactoryClass() { - return PigFeignAutoConfiguration.class; + return RaxFeignAutoConfiguration.class; } private void validate(Map attributes) { diff --git a/common/common-feign/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/common/common-feign/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..cb3e59a --- /dev/null +++ b/common/common-feign/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,3 @@ +com.rax.common.feign.RaxFeignAutoConfiguration +com.rax.common.feign.sentinel.SentinelAutoConfiguration +com.rax.common.feign.sentinel.handle.GlobalBizExceptionHandler diff --git a/pig-common/pig-common-log/pom.xml b/common/common-log/pom.xml similarity index 54% rename from pig-common/pig-common-log/pom.xml rename to common/common-log/pom.xml index 6f048e0..b512317 100644 --- a/pig-common/pig-common-log/pom.xml +++ b/common/common-log/pom.xml @@ -1,40 +1,25 @@ - 4.0.0 - com.pig4cloud - pig-common + com.rax + common 3.7.3 - pig-common-log + common-log jar - pig 日志服务 + 日志服务 - com.pig4cloud - pig-common-core + com.rax + common-core cn.hutool @@ -46,8 +31,8 @@ - com.pig4cloud - pig-upms-api + com.rax + upms-api diff --git a/common/common-log/src/main/java/com/rax/common/log/LogAutoConfiguration.java b/common/common-log/src/main/java/com/rax/common/log/LogAutoConfiguration.java new file mode 100644 index 0000000..e0a5669 --- /dev/null +++ b/common/common-log/src/main/java/com/rax/common/log/LogAutoConfiguration.java @@ -0,0 +1,33 @@ +package com.rax.common.log; + +import com.rax.admin.api.feign.RemoteLogService; +import com.rax.common.log.aspect.SysLogAspect; +import com.rax.common.log.config.RaxLogProperties; +import com.rax.common.log.event.SysLogListener; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.EnableAsync; + +/** + * @author lengleng + * @date 2019/2/1 日志自动配置 + */ +@EnableAsync +@Configuration(proxyBeanMethods = false) +@EnableConfigurationProperties(RaxLogProperties.class) +@ConditionalOnProperty(value = "security.log.enabled", matchIfMissing = true) +public class LogAutoConfiguration { + + @Bean + public SysLogListener sysLogListener(RaxLogProperties logProperties, RemoteLogService remoteLogService) { + return new SysLogListener(remoteLogService, logProperties); + } + + @Bean + public SysLogAspect sysLogAspect() { + return new SysLogAspect(); + } + +} diff --git a/common/common-log/src/main/java/com/rax/common/log/annotation/SysLog.java b/common/common-log/src/main/java/com/rax/common/log/annotation/SysLog.java new file mode 100644 index 0000000..32ade1e --- /dev/null +++ b/common/common-log/src/main/java/com/rax/common/log/annotation/SysLog.java @@ -0,0 +1,26 @@ +package com.rax.common.log.annotation; + +import java.lang.annotation.*; + +/** + * @author lengleng + * @date 2019/2/1 操作日志注解 + */ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface SysLog { + + /** + * 描述 + * @return {String} + */ + String value() default ""; + + /** + * spel 表达式 + * @return 日志描述 + */ + String expression() default ""; + +} diff --git a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/aspect/SysLogAspect.java b/common/common-log/src/main/java/com/rax/common/log/aspect/SysLogAspect.java similarity index 64% rename from pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/aspect/SysLogAspect.java rename to common/common-log/src/main/java/com/rax/common/log/aspect/SysLogAspect.java index 59619c7..20af183 100644 --- a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/aspect/SysLogAspect.java +++ b/common/common-log/src/main/java/com/rax/common/log/aspect/SysLogAspect.java @@ -1,27 +1,12 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.common.log.aspect; +package com.rax.common.log.aspect; import cn.hutool.core.util.StrUtil; -import com.pig4cloud.pig.common.core.util.SpringContextHolder; -import com.pig4cloud.pig.common.log.event.SysLogEvent; -import com.pig4cloud.pig.common.log.event.SysLogEventSource; -import com.pig4cloud.pig.common.log.util.LogTypeEnum; -import com.pig4cloud.pig.common.log.util.SysLogUtils; +import com.rax.common.core.util.SpringContextHolder; +import com.rax.common.log.event.SysLogEvent; +import com.rax.common.log.event.SysLogEventSource; +import com.rax.common.log.util.LogTypeEnum; +import com.rax.common.log.util.SysLogUtils; +import com.rax.common.log.annotation.SysLog; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -43,7 +28,7 @@ public class SysLogAspect { @Around("@annotation(sysLog)") @SneakyThrows - public Object around(ProceedingJoinPoint point, com.pig4cloud.pig.common.log.annotation.SysLog sysLog) { + public Object around(ProceedingJoinPoint point, SysLog sysLog) { String strClassName = point.getTarget().getClass().getName(); String strMethodName = point.getSignature().getName(); log.debug("[类名]:{},[方法]:{}", strClassName, strMethodName); diff --git a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/config/PigLogProperties.java b/common/common-log/src/main/java/com/rax/common/log/config/RaxLogProperties.java similarity index 91% rename from pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/config/PigLogProperties.java rename to common/common-log/src/main/java/com/rax/common/log/config/RaxLogProperties.java index 5891ada..da21b23 100644 --- a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/config/PigLogProperties.java +++ b/common/common-log/src/main/java/com/rax/common/log/config/RaxLogProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.log.config; +package com.rax.common.log.config; import lombok.Getter; import lombok.Setter; @@ -30,8 +30,8 @@ import java.util.List; */ @Getter @Setter -@ConfigurationProperties(PigLogProperties.PREFIX) -public class PigLogProperties { +@ConfigurationProperties(RaxLogProperties.PREFIX) +public class RaxLogProperties { public static final String PREFIX = "security.log"; diff --git a/common/common-log/src/main/java/com/rax/common/log/event/SysLogEvent.java b/common/common-log/src/main/java/com/rax/common/log/event/SysLogEvent.java new file mode 100644 index 0000000..3bec1ea --- /dev/null +++ b/common/common-log/src/main/java/com/rax/common/log/event/SysLogEvent.java @@ -0,0 +1,15 @@ +package com.rax.common.log.event; + +import com.rax.admin.api.entity.SysLog; +import org.springframework.context.ApplicationEvent; + +/** + * @author lengleng 系统日志事件 + */ +public class SysLogEvent extends ApplicationEvent { + + public SysLogEvent(SysLog source) { + super(source); + } + +} diff --git a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogEventSource.java b/common/common-log/src/main/java/com/rax/common/log/event/SysLogEventSource.java similarity index 68% rename from pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogEventSource.java rename to common/common-log/src/main/java/com/rax/common/log/event/SysLogEventSource.java index a1bf7da..8f2e46e 100644 --- a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogEventSource.java +++ b/common/common-log/src/main/java/com/rax/common/log/event/SysLogEventSource.java @@ -1,6 +1,6 @@ -package com.pig4cloud.pig.common.log.event; +package com.rax.common.log.event; -import com.pig4cloud.pig.admin.api.entity.SysLog; +import com.rax.admin.api.entity.SysLog; import lombok.Data; /** diff --git a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogListener.java b/common/common-log/src/main/java/com/rax/common/log/event/SysLogListener.java similarity index 66% rename from pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogListener.java rename to common/common-log/src/main/java/com/rax/common/log/event/SysLogListener.java index 581db9c..f94ca82 100644 --- a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogListener.java +++ b/common/common-log/src/main/java/com/rax/common/log/event/SysLogListener.java @@ -1,20 +1,4 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.common.log.event; +package com.rax.common.log.event; import cn.hutool.core.util.StrUtil; import com.fasterxml.jackson.annotation.JsonFilter; @@ -22,11 +6,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ser.FilterProvider; import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter; import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider; -import com.pig4cloud.pig.admin.api.entity.SysLog; -import com.pig4cloud.pig.admin.api.feign.RemoteLogService; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import com.pig4cloud.pig.common.core.jackson.PigJavaTimeModule; -import com.pig4cloud.pig.common.log.config.PigLogProperties; +import com.rax.admin.api.entity.SysLog; +import com.rax.admin.api.feign.RemoteLogService; +import com.rax.common.core.constant.SecurityConstants; +import com.rax.common.core.jackson.RaxJavaTimeModule; +import com.rax.common.log.config.RaxLogProperties; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -50,7 +34,7 @@ public class SysLogListener implements InitializingBean { private final RemoteLogService remoteLogService; - private final PigLogProperties logProperties; + private final RaxLogProperties logProperties; @SneakyThrows @Async @@ -78,7 +62,7 @@ public class SysLogListener implements InitializingBean { FilterProvider filters = new SimpleFilterProvider().addFilter("filter properties by name", SimpleBeanPropertyFilter.serializeAllExcept(ignorableFieldNames)); objectMapper.setFilterProvider(filters); - objectMapper.registerModule(new PigJavaTimeModule()); + objectMapper.registerModule(new RaxJavaTimeModule()); } @JsonFilter("filter properties by name") diff --git a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/init/ApplicationLoggerInitializer.java b/common/common-log/src/main/java/com/rax/common/log/init/ApplicationLoggerInitializer.java similarity index 60% rename from pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/init/ApplicationLoggerInitializer.java rename to common/common-log/src/main/java/com/rax/common/log/init/ApplicationLoggerInitializer.java index 1ba935a..16316fe 100644 --- a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/init/ApplicationLoggerInitializer.java +++ b/common/common-log/src/main/java/com/rax/common/log/init/ApplicationLoggerInitializer.java @@ -1,20 +1,4 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.common.log.init; +package com.rax.common.log.init; import org.springframework.boot.SpringApplication; import org.springframework.boot.env.EnvironmentPostProcessor; diff --git a/common/common-log/src/main/java/com/rax/common/log/util/LogTypeEnum.java b/common/common-log/src/main/java/com/rax/common/log/util/LogTypeEnum.java new file mode 100644 index 0000000..0f0d4c1 --- /dev/null +++ b/common/common-log/src/main/java/com/rax/common/log/util/LogTypeEnum.java @@ -0,0 +1,36 @@ +package com.rax.common.log.util; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +/** + * @author lengleng + * @date 2020/7/30 + *

    + * 日志类型 + */ +@Getter +@RequiredArgsConstructor +public enum LogTypeEnum { + + /** + * 正常日志类型 + */ + NORMAL("0", "正常日志"), + + /** + * 错误日志类型 + */ + ERROR("9", "错误日志"); + + /** + * 类型 + */ + private final String type; + + /** + * 描述 + */ + private final String description; + +} diff --git a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/util/SysLogUtils.java b/common/common-log/src/main/java/com/rax/common/log/util/SysLogUtils.java similarity index 79% rename from pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/util/SysLogUtils.java rename to common/common-log/src/main/java/com/rax/common/log/util/SysLogUtils.java index e431db2..7cfffc8 100644 --- a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/util/SysLogUtils.java +++ b/common/common-log/src/main/java/com/rax/common/log/util/SysLogUtils.java @@ -1,30 +1,14 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.common.log.util; +package com.rax.common.log.util; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.URLUtil; import cn.hutool.extra.servlet.JakartaServletUtil; import cn.hutool.http.HttpUtil; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import com.pig4cloud.pig.common.core.util.SpringContextHolder; -import com.pig4cloud.pig.common.log.config.PigLogProperties; -import com.pig4cloud.pig.common.log.event.SysLogEventSource; +import com.rax.common.core.constant.SecurityConstants; +import com.rax.common.core.util.SpringContextHolder; +import com.rax.common.log.config.RaxLogProperties; +import com.rax.common.log.event.SysLogEventSource; import jakarta.servlet.http.HttpServletRequest; import lombok.experimental.UtilityClass; import org.springframework.core.StandardReflectionParameterNameDiscoverer; @@ -64,7 +48,7 @@ public class SysLogUtils { sysLog.setServiceId(getClientId()); // get 参数脱敏 - PigLogProperties logProperties = SpringContextHolder.getBean(PigLogProperties.class); + RaxLogProperties logProperties = SpringContextHolder.getBean(RaxLogProperties.class); Map paramsMap = MapUtil.removeAny(request.getParameterMap(), ArrayUtil.toArray(logProperties.getExcludeFields(), String.class)); sysLog.setParams(HttpUtil.toParams(paramsMap)); diff --git a/pig-common/pig-common-log/src/main/resources/META-INF/spring-configuration-metadata.json b/common/common-log/src/main/resources/META-INF/spring-configuration-metadata.json similarity index 59% rename from pig-common/pig-common-log/src/main/resources/META-INF/spring-configuration-metadata.json rename to common/common-log/src/main/resources/META-INF/spring-configuration-metadata.json index 951a9be..fcaf4c8 100644 --- a/pig-common/pig-common-log/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/common/common-log/src/main/resources/META-INF/spring-configuration-metadata.json @@ -2,8 +2,8 @@ "groups": [ { "name": "security.log", - "type": "com.pig4cloud.pig.common.log.config.PigLogProperties", - "sourceType": "com.pig4cloud.pig.common.log.config.PigLogProperties" + "type": "com.rax.common.log.config.RaxLogProperties", + "sourceType": "com.rax.common.log.config.RaxLogProperties" } ], "properties": [ @@ -11,19 +11,19 @@ "name": "security.log.enabled", "type": "java.lang.Boolean", "description": "开启日志记录", - "sourceType": "com.pig4cloud.pig.common.log.config.PigLogProperties" + "sourceType": "com.rax.common.log.config.RaxLogProperties" }, { "name": "security.log.exclude-fields", "type": "java.util.List", "description": "放行字段，password,mobile,idcard,phone", - "sourceType": "com.pig4cloud.pig.common.log.config.PigLogProperties" + "sourceType": "com.rax.common.log.config.RaxLogProperties" }, { "name": "security.log.max-length", "type": "java.lang.Integer", "description": "请求报文最大存储长度", - "sourceType": "com.pig4cloud.pig.common.log.config.PigLogProperties" + "sourceType": "com.rax.common.log.config.RaxLogProperties" } ], "hints": [] diff --git a/common/common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/common/common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..649ab6e --- /dev/null +++ b/common/common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.rax.common.log.LogAutoConfiguration diff --git a/pig-common/pig-common-mybatis/pom.xml b/common/common-mybatis/pom.xml similarity index 65% rename from pig-common/pig-common-mybatis/pom.xml rename to common/common-mybatis/pom.xml index d5a705d..e11c0e9 100644 --- a/pig-common/pig-common-mybatis/pom.xml +++ b/common/common-mybatis/pom.xml @@ -1,33 +1,18 @@ - 4.0.0 - com.pig4cloud - pig-common + com.rax + common 3.7.3 - pig-common-mybatis + common-mybatis jar - pig mybatis 封装 + mybatis 封装 @@ -68,8 +53,8 @@ true - com.pig4cloud - pig-common-core + com.rax + common-core diff --git a/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/MybatisAutoConfiguration.java b/common/common-mybatis/src/main/java/com/rax/common/mybatis/MybatisAutoConfiguration.java similarity index 85% rename from pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/MybatisAutoConfiguration.java rename to common/common-mybatis/src/main/java/com/rax/common/mybatis/MybatisAutoConfiguration.java index 8ba5a1a..608bbae 100644 --- a/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/MybatisAutoConfiguration.java +++ b/common/common-mybatis/src/main/java/com/rax/common/mybatis/MybatisAutoConfiguration.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.mybatis; +package com.rax.common.mybatis; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; -import com.pig4cloud.pig.common.mybatis.config.MybatisPlusMetaObjectHandler; -import com.pig4cloud.pig.common.mybatis.plugins.PigPaginationInnerInterceptor; -import com.pig4cloud.pig.common.mybatis.resolver.SqlFilterArgumentResolver; +import com.rax.common.mybatis.plugins.RaxPaginationInnerInterceptor; +import com.rax.common.mybatis.config.MybatisPlusMetaObjectHandler; +import com.rax.common.mybatis.resolver.SqlFilterArgumentResolver; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.method.support.HandlerMethodArgumentResolver; @@ -52,7 +52,7 @@ public class MybatisAutoConfiguration implements WebMvcConfigurer { @Bean public MybatisPlusInterceptor mybatisPlusInterceptor() { MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); - interceptor.addInnerInterceptor(new PigPaginationInnerInterceptor()); + interceptor.addInnerInterceptor(new RaxPaginationInnerInterceptor()); return interceptor; } diff --git a/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/base/BaseEntity.java b/common/common-mybatis/src/main/java/com/rax/common/mybatis/base/BaseEntity.java similarity index 95% rename from pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/base/BaseEntity.java rename to common/common-mybatis/src/main/java/com/rax/common/mybatis/base/BaseEntity.java index 2db3723..8244b15 100644 --- a/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/base/BaseEntity.java +++ b/common/common-mybatis/src/main/java/com/rax/common/mybatis/base/BaseEntity.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.common.mybatis.base; +package com.rax.common.mybatis.base; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/config/MybatisPlusMetaObjectHandler.java b/common/common-mybatis/src/main/java/com/rax/common/mybatis/config/MybatisPlusMetaObjectHandler.java similarity index 96% rename from pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/config/MybatisPlusMetaObjectHandler.java rename to common/common-mybatis/src/main/java/com/rax/common/mybatis/config/MybatisPlusMetaObjectHandler.java index 67b0f7c..cb8544b 100644 --- a/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/config/MybatisPlusMetaObjectHandler.java +++ b/common/common-mybatis/src/main/java/com/rax/common/mybatis/config/MybatisPlusMetaObjectHandler.java @@ -1,8 +1,8 @@ -package com.pig4cloud.pig.common.mybatis.config; +package com.rax.common.mybatis.config; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import com.pig4cloud.pig.common.core.constant.CommonConstants; +import com.rax.common.core.constant.CommonConstants; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; import org.springframework.security.authentication.AnonymousAuthenticationToken; diff --git a/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/handler/JsonLongArrayTypeHandler.java b/common/common-mybatis/src/main/java/com/rax/common/mybatis/handler/JsonLongArrayTypeHandler.java similarity index 96% rename from pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/handler/JsonLongArrayTypeHandler.java rename to common/common-mybatis/src/main/java/com/rax/common/mybatis/handler/JsonLongArrayTypeHandler.java index 005c3ea..a7ed260 100644 --- a/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/handler/JsonLongArrayTypeHandler.java +++ b/common/common-mybatis/src/main/java/com/rax/common/mybatis/handler/JsonLongArrayTypeHandler.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.common.mybatis.handler; +package com.rax.common.mybatis.handler; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ArrayUtil; diff --git a/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/handler/JsonStringArrayTypeHandler.java b/common/common-mybatis/src/main/java/com/rax/common/mybatis/handler/JsonStringArrayTypeHandler.java similarity index 96% rename from pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/handler/JsonStringArrayTypeHandler.java rename to common/common-mybatis/src/main/java/com/rax/common/mybatis/handler/JsonStringArrayTypeHandler.java index 017ca4d..22b8fbf 100644 --- a/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/handler/JsonStringArrayTypeHandler.java +++ b/common/common-mybatis/src/main/java/com/rax/common/mybatis/handler/JsonStringArrayTypeHandler.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.common.mybatis.handler; +package com.rax.common.mybatis.handler; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ArrayUtil; diff --git a/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/plugins/PigPaginationInnerInterceptor.java b/common/common-mybatis/src/main/java/com/rax/common/mybatis/plugins/RaxPaginationInnerInterceptor.java similarity index 87% rename from pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/plugins/PigPaginationInnerInterceptor.java rename to common/common-mybatis/src/main/java/com/rax/common/mybatis/plugins/RaxPaginationInnerInterceptor.java index f98829a..492872f 100644 --- a/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/plugins/PigPaginationInnerInterceptor.java +++ b/common/common-mybatis/src/main/java/com/rax/common/mybatis/plugins/RaxPaginationInnerInterceptor.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.common.mybatis.plugins; +package com.rax.common.mybatis.plugins; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -25,7 +25,7 @@ import java.sql.SQLException; */ @Data @NoArgsConstructor -public class PigPaginationInnerInterceptor extends PaginationInnerInterceptor { +public class RaxPaginationInnerInterceptor extends PaginationInnerInterceptor { /** * 数据库类型 @@ -41,11 +41,11 @@ public class PigPaginationInnerInterceptor extends PaginationInnerInterceptor { */ private IDialect dialect; - public PigPaginationInnerInterceptor(DbType dbType) { + public RaxPaginationInnerInterceptor(DbType dbType) { this.dbType = dbType; } - public PigPaginationInnerInterceptor(IDialect dialect) { + public RaxPaginationInnerInterceptor(IDialect dialect) { this.dialect = dialect; } diff --git a/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/resolver/SqlFilterArgumentResolver.java b/common/common-mybatis/src/main/java/com/rax/common/mybatis/resolver/SqlFilterArgumentResolver.java similarity index 98% rename from pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/resolver/SqlFilterArgumentResolver.java rename to common/common-mybatis/src/main/java/com/rax/common/mybatis/resolver/SqlFilterArgumentResolver.java index 1ba165b..36b6eb7 100644 --- a/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/resolver/SqlFilterArgumentResolver.java +++ b/common/common-mybatis/src/main/java/com/rax/common/mybatis/resolver/SqlFilterArgumentResolver.java @@ -16,7 +16,7 @@ * */ -package com.pig4cloud.pig.common.mybatis.resolver; +package com.rax.common.mybatis.resolver; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.OrderItem; diff --git a/common/common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/common/common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..a38fb0b --- /dev/null +++ b/common/common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.rax.common.mybatis.MybatisAutoConfiguration diff --git a/pig-common/pig-common-oss/pom.xml b/common/common-oss/pom.xml similarity index 80% rename from pig-common/pig-common-oss/pom.xml rename to common/common-oss/pom.xml index 97ed050..f0f9b3d 100644 --- a/pig-common/pig-common-oss/pom.xml +++ b/common/common-oss/pom.xml @@ -4,15 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.pig4cloud - pig-common + com.rax + common 3.7.3 - pig-common-oss + common-oss jar - pig 文件系统依赖 + 文件系统依赖 diff --git a/common/common-oss/src/main/java/com/rax/common/file/FileAutoConfiguration.java b/common/common-oss/src/main/java/com/rax/common/file/FileAutoConfiguration.java new file mode 100644 index 0000000..d237cb4 --- /dev/null +++ b/common/common-oss/src/main/java/com/rax/common/file/FileAutoConfiguration.java @@ -0,0 +1,19 @@ +package com.rax.common.file; + +import com.rax.common.file.core.FileProperties; +import com.rax.common.file.oss.OssAutoConfiguration; +import com.rax.common.file.local.LocalFileAutoConfiguration; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Import; + +/** + * aws 自动配置类 + * + * @author lengleng + * @author 858695266 + */ +@Import({ LocalFileAutoConfiguration.class, OssAutoConfiguration.class }) +@EnableConfigurationProperties({ FileProperties.class }) +public class FileAutoConfiguration { + +} diff --git a/common/common-oss/src/main/java/com/rax/common/file/core/FileProperties.java b/common/common-oss/src/main/java/com/rax/common/file/core/FileProperties.java new file mode 100644 index 0000000..c88d208 --- /dev/null +++ b/common/common-oss/src/main/java/com/rax/common/file/core/FileProperties.java @@ -0,0 +1,37 @@ +package com.rax.common.file.core; + +import com.rax.common.file.local.LocalFileProperties; +import com.rax.common.file.oss.OssProperties; +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.NestedConfigurationProperty; + +/** + * 文件 配置信息 + * + * @author lengleng + *

    + * bucket 设置公共读权限 + */ +@Data +@ConfigurationProperties(prefix = "file") +public class FileProperties { + + /** + * 默认的存储桶名称 + */ + private String bucketName = "local"; + + /** + * 本地文件配置信息 + */ + @NestedConfigurationProperty + private LocalFileProperties local; + + /** + * oss 文件配置信息 + */ + @NestedConfigurationProperty + private OssProperties oss; + +} diff --git a/pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/core/FileTemplate.java b/common/common-oss/src/main/java/com/rax/common/file/core/FileTemplate.java similarity index 97% rename from pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/core/FileTemplate.java rename to common/common-oss/src/main/java/com/rax/common/file/core/FileTemplate.java index c9e9578..5cd065a 100644 --- a/pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/core/FileTemplate.java +++ b/common/common-oss/src/main/java/com/rax/common/file/core/FileTemplate.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.common.file.core; +package com.rax.common.file.core; import com.amazonaws.services.s3.model.Bucket; import com.amazonaws.services.s3.model.S3Object; diff --git a/common/common-oss/src/main/java/com/rax/common/file/local/LocalFileAutoConfiguration.java b/common/common-oss/src/main/java/com/rax/common/file/local/LocalFileAutoConfiguration.java new file mode 100644 index 0000000..caa30f8 --- /dev/null +++ b/common/common-oss/src/main/java/com/rax/common/file/local/LocalFileAutoConfiguration.java @@ -0,0 +1,28 @@ +package com.rax.common.file.local; + +import com.rax.common.file.core.FileProperties; +import com.rax.common.file.core.FileTemplate; +import lombok.AllArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Bean; + +/** + * aws 自动配置类 + * + * @author lengleng + * @author 858695266 + */ +@AllArgsConstructor +public class LocalFileAutoConfiguration { + + private final FileProperties properties; + + @Bean + @ConditionalOnMissingBean(LocalFileTemplate.class) + @ConditionalOnProperty(name = "file.local.enable", havingValue = "true", matchIfMissing = true) + public FileTemplate localFileTemplate() { + return new LocalFileTemplate(properties); + } + +} diff --git a/common/common-oss/src/main/java/com/rax/common/file/local/LocalFileProperties.java b/common/common-oss/src/main/java/com/rax/common/file/local/LocalFileProperties.java new file mode 100644 index 0000000..4f6ac3d --- /dev/null +++ b/common/common-oss/src/main/java/com/rax/common/file/local/LocalFileProperties.java @@ -0,0 +1,27 @@ +package com.rax.common.file.local; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * 本地文件 配置信息 + * + * @author lengleng + *

    + * bucket 设置公共读权限 + */ +@Data +@ConfigurationProperties(prefix = "local") +public class LocalFileProperties { + + /** + * 是否开启 + */ + private boolean enable; + + /** + * 默认路径 + */ + private String basePath; + +} diff --git a/pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/local/LocalFileTemplate.java b/common/common-oss/src/main/java/com/rax/common/file/local/LocalFileTemplate.java similarity index 96% rename from pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/local/LocalFileTemplate.java rename to common/common-oss/src/main/java/com/rax/common/file/local/LocalFileTemplate.java index 295186d..fd1e250 100644 --- a/pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/local/LocalFileTemplate.java +++ b/common/common-oss/src/main/java/com/rax/common/file/local/LocalFileTemplate.java @@ -1,11 +1,11 @@ -package com.pig4cloud.pig.common.file.local; +package com.rax.common.file.local; import cn.hutool.core.io.FileUtil; import com.amazonaws.services.s3.model.Bucket; import com.amazonaws.services.s3.model.S3Object; import com.amazonaws.services.s3.model.S3ObjectSummary; -import com.pig4cloud.pig.common.file.core.FileProperties; -import com.pig4cloud.pig.common.file.core.FileTemplate; +import com.rax.common.file.core.FileProperties; +import com.rax.common.file.core.FileTemplate; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; diff --git a/common/common-oss/src/main/java/com/rax/common/file/oss/OssAutoConfiguration.java b/common/common-oss/src/main/java/com/rax/common/file/oss/OssAutoConfiguration.java new file mode 100644 index 0000000..c2e0c2e --- /dev/null +++ b/common/common-oss/src/main/java/com/rax/common/file/oss/OssAutoConfiguration.java @@ -0,0 +1,39 @@ +package com.rax.common.file.oss; + +import com.rax.common.file.core.FileProperties; +import com.rax.common.file.oss.http.OssEndpoint; +import com.rax.common.file.core.FileTemplate; +import com.rax.common.file.oss.service.OssTemplate; +import lombok.AllArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Primary; + +/** + * aws 自动配置类 + * + * @author lengleng + * @author 858695266 + */ +@AllArgsConstructor +public class OssAutoConfiguration { + + private final FileProperties properties; + + @Bean + @Primary + @ConditionalOnMissingBean(OssTemplate.class) + @ConditionalOnProperty(name = "file.oss.enable", havingValue = "true") + public FileTemplate ossTemplate() { + return new OssTemplate(properties); + } + + @Bean + @ConditionalOnMissingBean + @ConditionalOnProperty(name = "file.oss.info", havingValue = "true") + public OssEndpoint ossEndpoint(OssTemplate template) { + return new OssEndpoint(template); + } + +} diff --git a/pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/oss/OssProperties.java b/common/common-oss/src/main/java/com/rax/common/file/oss/OssProperties.java similarity index 61% rename from pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/oss/OssProperties.java rename to common/common-oss/src/main/java/com/rax/common/file/oss/OssProperties.java index a1cad01..6fe8580 100644 --- a/pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/oss/OssProperties.java +++ b/common/common-oss/src/main/java/com/rax/common/file/oss/OssProperties.java @@ -1,21 +1,4 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.common.file.oss; +package com.rax.common.file.oss; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/oss/http/OssEndpoint.java b/common/common-oss/src/main/java/com/rax/common/file/oss/http/OssEndpoint.java similarity index 79% rename from pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/oss/http/OssEndpoint.java rename to common/common-oss/src/main/java/com/rax/common/file/oss/http/OssEndpoint.java index 4ab42ca..36bdfe4 100644 --- a/pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/oss/http/OssEndpoint.java +++ b/common/common-oss/src/main/java/com/rax/common/file/oss/http/OssEndpoint.java @@ -1,26 +1,9 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.common.file.oss.http; +package com.rax.common.file.oss.http; import com.amazonaws.services.s3.model.Bucket; import com.amazonaws.services.s3.model.S3Object; import com.amazonaws.services.s3.model.S3ObjectSummary; -import com.pig4cloud.pig.common.file.oss.service.OssTemplate; +import com.rax.common.file.oss.service.OssTemplate; import lombok.AllArgsConstructor; import lombok.Cleanup; import lombok.SneakyThrows; diff --git a/pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/oss/service/OssTemplate.java b/common/common-oss/src/main/java/com/rax/common/file/oss/service/OssTemplate.java similarity index 87% rename from pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/oss/service/OssTemplate.java rename to common/common-oss/src/main/java/com/rax/common/file/oss/service/OssTemplate.java index fd6bd11..329967a 100644 --- a/pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/oss/service/OssTemplate.java +++ b/common/common-oss/src/main/java/com/rax/common/file/oss/service/OssTemplate.java @@ -1,21 +1,4 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.common.file.oss.service; +package com.rax.common.file.oss.service; import com.amazonaws.ClientConfiguration; import com.amazonaws.auth.AWSCredentials; @@ -27,8 +10,8 @@ import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.AmazonS3Client; import com.amazonaws.services.s3.model.*; import com.amazonaws.util.IOUtils; -import com.pig4cloud.pig.common.file.core.FileProperties; -import com.pig4cloud.pig.common.file.core.FileTemplate; +import com.rax.common.file.core.FileProperties; +import com.rax.common.file.core.FileTemplate; import lombok.Cleanup; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; diff --git a/pig-common/pig-common-oss/src/main/resources/META-INF/spring-configuration-metadata.json b/common/common-oss/src/main/resources/META-INF/spring-configuration-metadata.json similarity index 61% rename from pig-common/pig-common-oss/src/main/resources/META-INF/spring-configuration-metadata.json rename to common/common-oss/src/main/resources/META-INF/spring-configuration-metadata.json index 80328eb..8dc9683 100644 --- a/pig-common/pig-common-oss/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/common/common-oss/src/main/resources/META-INF/spring-configuration-metadata.json @@ -2,28 +2,28 @@ "groups": [ { "name": "file", - "type": "com.pig4cloud.pig.common.file.core.FileProperties", - "sourceType": "com.pig4cloud.pig.common.file.core.FileProperties" + "type": "com.rax.common.file.core.FileProperties", + "sourceType": "com.rax.common.file.core.FileProperties" }, { "name": "file.local", - "type": "com.pig4cloud.pig.common.file.local.LocalFileProperties", - "sourceType": "com.pig4cloud.pig.common.file.core.FileProperties" + "type": "com.rax.common.file.local.LocalFileProperties", + "sourceType": "com.rax.common.file.core.FileProperties" }, { "name": "file.oss", - "type": "com.pig4cloud.pig.common.file.oss.OssProperties", - "sourceType": "com.pig4cloud.pig.common.file.core.FileProperties" + "type": "com.rax.common.file.oss.OssProperties", + "sourceType": "com.rax.common.file.core.FileProperties" }, { "name": "local", - "type": "com.pig4cloud.pig.common.file.local.LocalFileProperties", - "sourceType": "com.pig4cloud.pig.common.file.local.LocalFileProperties" + "type": "com.rax.common.file.local.LocalFileProperties", + "sourceType": "com.rax.common.file.local.LocalFileProperties" }, { "name": "oss", - "type": "com.pig4cloud.pig.common.file.oss.OssProperties", - "sourceType": "com.pig4cloud.pig.common.file.oss.OssProperties" + "type": "com.rax.common.file.oss.OssProperties", + "sourceType": "com.rax.common.file.oss.OssProperties" } ], "properties": [ @@ -31,134 +31,134 @@ "name": "file.bucket-name", "type": "java.lang.String", "description": "默认的存储桶名称", - "sourceType": "com.pig4cloud.pig.common.file.core.FileProperties", + "sourceType": "com.rax.common.file.core.FileProperties", "defaultValue": "local" }, { "name": "file.local.base-path", "type": "java.lang.String", "description": "默认路径", - "sourceType": "com.pig4cloud.pig.common.file.local.LocalFileProperties" + "sourceType": "com.rax.common.file.local.LocalFileProperties" }, { "name": "file.local.enable", "type": "java.lang.Boolean", "description": "是否开启", - "sourceType": "com.pig4cloud.pig.common.file.local.LocalFileProperties", + "sourceType": "com.rax.common.file.local.LocalFileProperties", "defaultValue": false }, { "name": "file.oss.access-key", "type": "java.lang.String", "description": "Access key就像用户ID，可以唯一标识你的账户", - "sourceType": "com.pig4cloud.pig.common.file.oss.OssProperties" + "sourceType": "com.rax.common.file.oss.OssProperties" }, { "name": "file.oss.app-id", "type": "java.lang.String", "description": "应用ID", - "sourceType": "com.pig4cloud.pig.common.file.oss.OssProperties" + "sourceType": "com.rax.common.file.oss.OssProperties" }, { "name": "file.oss.custom-domain", "type": "java.lang.String", "description": "自定义域名", - "sourceType": "com.pig4cloud.pig.common.file.oss.OssProperties" + "sourceType": "com.rax.common.file.oss.OssProperties" }, { "name": "file.oss.endpoint", "type": "java.lang.String", "description": "对象存储服务的URL", - "sourceType": "com.pig4cloud.pig.common.file.oss.OssProperties" + "sourceType": "com.rax.common.file.oss.OssProperties" }, { "name": "file.oss.max-connections", "type": "java.lang.Integer", "description": "最大线程数，默认： 100", - "sourceType": "com.pig4cloud.pig.common.file.oss.OssProperties", + "sourceType": "com.rax.common.file.oss.OssProperties", "defaultValue": 100 }, { "name": "file.oss.path-style-access", "type": "java.lang.Boolean", "description": "true path-style nginx 反向代理和S3默认支持 pathStyle {http:\/\/endpoint\/bucketname} false supports virtual-hosted-style 阿里云等需要配置为 virtual-hosted-style 模式{http:\/\/bucketname.endpoint}", - "sourceType": "com.pig4cloud.pig.common.file.oss.OssProperties", + "sourceType": "com.rax.common.file.oss.OssProperties", "defaultValue": true }, { "name": "file.oss.region", "type": "java.lang.String", "description": "区域", - "sourceType": "com.pig4cloud.pig.common.file.oss.OssProperties" + "sourceType": "com.rax.common.file.oss.OssProperties" }, { "name": "file.oss.secret-key", "type": "java.lang.String", "description": "Secret key是你账户的密码", - "sourceType": "com.pig4cloud.pig.common.file.oss.OssProperties" + "sourceType": "com.rax.common.file.oss.OssProperties" }, { "name": "local.base-path", "type": "java.lang.String", "description": "默认路径", - "sourceType": "com.pig4cloud.pig.common.file.local.LocalFileProperties" + "sourceType": "com.rax.common.file.local.LocalFileProperties" }, { "name": "local.enable", "type": "java.lang.Boolean", "description": "是否开启", - "sourceType": "com.pig4cloud.pig.common.file.local.LocalFileProperties", + "sourceType": "com.rax.common.file.local.LocalFileProperties", "defaultValue": false }, { "name": "oss.access-key", "type": "java.lang.String", "description": "Access key就像用户ID，可以唯一标识你的账户", - "sourceType": "com.pig4cloud.pig.common.file.oss.OssProperties" + "sourceType": "com.rax.common.file.oss.OssProperties" }, { "name": "oss.app-id", "type": "java.lang.String", "description": "应用ID", - "sourceType": "com.pig4cloud.pig.common.file.oss.OssProperties" + "sourceType": "com.rax.common.file.oss.OssProperties" }, { "name": "oss.custom-domain", "type": "java.lang.String", "description": "自定义域名", - "sourceType": "com.pig4cloud.pig.common.file.oss.OssProperties" + "sourceType": "com.rax.common.file.oss.OssProperties" }, { "name": "oss.endpoint", "type": "java.lang.String", "description": "对象存储服务的URL", - "sourceType": "com.pig4cloud.pig.common.file.oss.OssProperties" + "sourceType": "com.rax.common.file.oss.OssProperties" }, { "name": "oss.max-connections", "type": "java.lang.Integer", "description": "最大线程数，默认： 100", - "sourceType": "com.pig4cloud.pig.common.file.oss.OssProperties", + "sourceType": "com.rax.common.file.oss.OssProperties", "defaultValue": 100 }, { "name": "oss.path-style-access", "type": "java.lang.Boolean", "description": "true path-style nginx 反向代理和S3默认支持 pathStyle {http:\/\/endpoint\/bucketname} false supports virtual-hosted-style 阿里云等需要配置为 virtual-hosted-style 模式{http:\/\/bucketname.endpoint}", - "sourceType": "com.pig4cloud.pig.common.file.oss.OssProperties", + "sourceType": "com.rax.common.file.oss.OssProperties", "defaultValue": true }, { "name": "oss.region", "type": "java.lang.String", "description": "区域", - "sourceType": "com.pig4cloud.pig.common.file.oss.OssProperties" + "sourceType": "com.rax.common.file.oss.OssProperties" }, { "name": "oss.secret-key", "type": "java.lang.String", "description": "Secret key是你账户的密码", - "sourceType": "com.pig4cloud.pig.common.file.oss.OssProperties" + "sourceType": "com.rax.common.file.oss.OssProperties" } ], "hints": [] diff --git a/common/common-oss/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/common/common-oss/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..0ae677c --- /dev/null +++ b/common/common-oss/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.rax.common.file.FileAutoConfiguration diff --git a/pig-common/pig-common-seata/pom.xml b/common/common-seata/pom.xml similarity index 82% rename from pig-common/pig-common-seata/pom.xml rename to common/common-seata/pom.xml index 1364f91..f2c1244 100644 --- a/pig-common/pig-common-seata/pom.xml +++ b/common/common-seata/pom.xml @@ -21,21 +21,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.pig4cloud - pig-common + com.rax + common 3.7.3 - pig-common-seata + common-seata jar - pig 分布式事务处理模块 + 分布式事务处理模块 - com.pig4cloud - pig-common-core + com.rax + common-core diff --git a/pig-common/pig-common-seata/src/main/java/com/pig4cloud/pig/common/seata/config/SeataAutoConfiguration.java b/common/common-seata/src/main/java/com/rax/common/seata/config/SeataAutoConfiguration.java similarity index 80% rename from pig-common/pig-common-seata/src/main/java/com/pig4cloud/pig/common/seata/config/SeataAutoConfiguration.java rename to common/common-seata/src/main/java/com/rax/common/seata/config/SeataAutoConfiguration.java index 94fe012..72bc56d 100644 --- a/pig-common/pig-common-seata/src/main/java/com/pig4cloud/pig/common/seata/config/SeataAutoConfiguration.java +++ b/common/common-seata/src/main/java/com/rax/common/seata/config/SeataAutoConfiguration.java @@ -1,6 +1,6 @@ -package com.pig4cloud.pig.common.seata.config; +package com.rax.common.seata.config; -import com.pig4cloud.pig.common.core.factory.YamlPropertySourceFactory; +import com.rax.common.core.factory.YamlPropertySourceFactory; import io.seata.spring.annotation.datasource.EnableAutoDataSourceProxy; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; diff --git a/common/common-seata/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/common/common-seata/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..cc7f357 --- /dev/null +++ b/common/common-seata/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ + com.rax.common.seata.config.SeataAutoConfiguration diff --git a/pig-common/pig-common-seata/src/main/resources/seata-config.yml b/common/common-seata/src/main/resources/seata-config.yml similarity index 93% rename from pig-common/pig-common-seata/src/main/resources/seata-config.yml rename to common/common-seata/src/main/resources/seata-config.yml index 58a04a8..6d711b2 100644 --- a/pig-common/pig-common-seata/src/main/resources/seata-config.yml +++ b/common/common-seata/src/main/resources/seata-config.yml @@ -1,6 +1,6 @@ seata: enabled: true - tx-service-group: pig_tx_group # 事务群组（可以每个应用独立取名，也可以使用相同的名字） + tx-service-group: rax_tx_group # 事务群组（可以每个应用独立取名，也可以使用相同的名字） client: rm-report-success-enable: true rm-table-meta-check-enable: false # 自动刷新缓存中的表结构（默认false） @@ -24,11 +24,11 @@ seata: datasource-autoproxy: true service: vgroup-mapping: - pig_tx_group: default # TC 集群（必须与seata-server保持一致） + rax_tx_group: default # TC 集群（必须与seata-server保持一致） enable-degrade: false # 降级开关 disable-global-transaction: false # 禁用全局事务（默认false） grouplist: - default: pig-seata:8091 + default: rax-seata:8091 transport: shutdown: wait: 3 diff --git a/pig-common/pig-common-security/pom.xml b/common/common-security/pom.xml similarity index 61% rename from pig-common/pig-common-security/pom.xml rename to common/common-security/pom.xml index fc69bd2..a287a25 100644 --- a/pig-common/pig-common-security/pom.xml +++ b/common/common-security/pom.xml @@ -1,40 +1,25 @@ - 4.0.0 - com.pig4cloud - pig-common + com.rax + common 3.7.3 - pig-common-security + common-security jar - pig 安全工具类 + 安全工具类 - com.pig4cloud - pig-common-core + com.rax + common-core cn.hutool @@ -42,8 +27,8 @@ - com.pig4cloud - pig-upms-api + com.rax + upms-api diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/annotation/EnablePigResourceServer.java b/common/common-security/src/main/java/com/rax/common/security/annotation/EnableRaxResourceServer.java similarity index 67% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/annotation/EnablePigResourceServer.java rename to common/common-security/src/main/java/com/rax/common/security/annotation/EnableRaxResourceServer.java index 2abbcce..a0ba4ae 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/annotation/EnablePigResourceServer.java +++ b/common/common-security/src/main/java/com/rax/common/security/annotation/EnableRaxResourceServer.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.security.annotation; +package com.rax.common.security.annotation; -import com.pig4cloud.pig.common.security.component.PigResourceServerAutoConfiguration; -import com.pig4cloud.pig.common.security.component.PigResourceServerConfiguration; -import com.pig4cloud.pig.common.security.feign.PigFeignClientConfiguration; +import com.rax.common.security.component.RaxResourceServerAutoConfiguration; +import com.rax.common.security.component.RaxResourceServerConfiguration; +import com.rax.common.security.feign.RaxFeignClientConfiguration; import org.springframework.context.annotation.Import; import java.lang.annotation.*; @@ -33,8 +33,8 @@ import java.lang.annotation.*; @Inherited @Target({ ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) -@Import({ PigResourceServerAutoConfiguration.class, PigResourceServerConfiguration.class, - PigFeignClientConfiguration.class }) -public @interface EnablePigResourceServer { +@Import({ RaxResourceServerAutoConfiguration.class, RaxResourceServerConfiguration.class, + RaxFeignClientConfiguration.class }) +public @interface EnableRaxResourceServer { } diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/annotation/Inner.java b/common/common-security/src/main/java/com/rax/common/security/annotation/Inner.java similarity index 95% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/annotation/Inner.java rename to common/common-security/src/main/java/com/rax/common/security/annotation/Inner.java index 7cacd66..32407e3 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/annotation/Inner.java +++ b/common/common-security/src/main/java/com/rax/common/security/annotation/Inner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.security.annotation; +package com.rax.common.security.annotation; import java.lang.annotation.*; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PermissionService.java b/common/common-security/src/main/java/com/rax/common/security/component/PermissionService.java similarity index 97% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PermissionService.java rename to common/common-security/src/main/java/com/rax/common/security/component/PermissionService.java index 5bef7ab..56621f9 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PermissionService.java +++ b/common/common-security/src/main/java/com/rax/common/security/component/PermissionService.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.security.component; +package com.rax.common.security.component; import cn.hutool.core.util.ArrayUtil; import org.springframework.security.core.Authentication; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PermitAllUrlProperties.java b/common/common-security/src/main/java/com/rax/common/security/component/PermitAllUrlProperties.java similarity index 96% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PermitAllUrlProperties.java rename to common/common-security/src/main/java/com/rax/common/security/component/PermitAllUrlProperties.java index f6f068c..057f728 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PermitAllUrlProperties.java +++ b/common/common-security/src/main/java/com/rax/common/security/component/PermitAllUrlProperties.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.security.component; +package com.rax.common.security.component; import cn.hutool.core.util.ReUtil; import cn.hutool.extra.spring.SpringUtil; -import com.pig4cloud.pig.common.security.annotation.Inner; +import com.rax.common.security.annotation.Inner; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigBearerTokenExtractor.java b/common/common-security/src/main/java/com/rax/common/security/component/RaxBearerTokenExtractor.java similarity index 95% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigBearerTokenExtractor.java rename to common/common-security/src/main/java/com/rax/common/security/component/RaxBearerTokenExtractor.java index 9ac0bbf..10cefba 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigBearerTokenExtractor.java +++ b/common/common-security/src/main/java/com/rax/common/security/component/RaxBearerTokenExtractor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.security.component; +package com.rax.common.security.component; import jakarta.servlet.http.HttpServletRequest; import org.springframework.http.HttpHeaders; @@ -34,7 +34,7 @@ import java.util.regex.Pattern; * @author caiqy * @date 2020.05.15 */ -public class PigBearerTokenExtractor implements BearerTokenResolver { +public class RaxBearerTokenExtractor implements BearerTokenResolver { private static final Pattern authorizationPattern = Pattern.compile("^Bearer (?[a-zA-Z0-9-:._~+/]+=*)$", Pattern.CASE_INSENSITIVE); @@ -49,7 +49,7 @@ public class PigBearerTokenExtractor implements BearerTokenResolver { private final PermitAllUrlProperties urlProperties; - public PigBearerTokenExtractor(PermitAllUrlProperties urlProperties) { + public RaxBearerTokenExtractor(PermitAllUrlProperties urlProperties) { this.urlProperties = urlProperties; } diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigClientCredentialsOAuth2AuthenticatedPrincipal.java b/common/common-security/src/main/java/com/rax/common/security/component/RaxClientCredentialsOAuth2AuthenticatedPrincipal.java similarity index 87% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigClientCredentialsOAuth2AuthenticatedPrincipal.java rename to common/common-security/src/main/java/com/rax/common/security/component/RaxClientCredentialsOAuth2AuthenticatedPrincipal.java index 9765be3..f55059b 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigClientCredentialsOAuth2AuthenticatedPrincipal.java +++ b/common/common-security/src/main/java/com/rax/common/security/component/RaxClientCredentialsOAuth2AuthenticatedPrincipal.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.common.security.component; +package com.rax.common.security.component; import lombok.RequiredArgsConstructor; import org.springframework.security.core.GrantedAuthority; @@ -14,7 +14,7 @@ import java.util.Map; * credential 支持客户端模式的用户存储 */ @RequiredArgsConstructor -public class PigClientCredentialsOAuth2AuthenticatedPrincipal implements OAuth2AuthenticatedPrincipal { +public class RaxClientCredentialsOAuth2AuthenticatedPrincipal implements OAuth2AuthenticatedPrincipal { private final Map attributes; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigCustomOAuth2AccessTokenResponseHttpMessageConverter.java b/common/common-security/src/main/java/com/rax/common/security/component/RaxCustomOAuth2AccessTokenResponseHttpMessageConverter.java similarity index 92% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigCustomOAuth2AccessTokenResponseHttpMessageConverter.java rename to common/common-security/src/main/java/com/rax/common/security/component/RaxCustomOAuth2AccessTokenResponseHttpMessageConverter.java index 378240f..5a00e55 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigCustomOAuth2AccessTokenResponseHttpMessageConverter.java +++ b/common/common-security/src/main/java/com/rax/common/security/component/RaxCustomOAuth2AccessTokenResponseHttpMessageConverter.java @@ -1,7 +1,7 @@ -package com.pig4cloud.pig.common.security.component; +package com.rax.common.security.component; import com.fasterxml.jackson.databind.ObjectMapper; -import com.pig4cloud.pig.common.core.util.SpringContextHolder; +import com.rax.common.core.util.SpringContextHolder; import org.springframework.core.ParameterizedTypeReference; import org.springframework.core.convert.converter.Converter; import org.springframework.http.HttpOutputMessage; @@ -21,7 +21,7 @@ import java.util.Map; * @author lengleng * @date 2023/6/28 */ -public class PigCustomOAuth2AccessTokenResponseHttpMessageConverter +public class RaxCustomOAuth2AccessTokenResponseHttpMessageConverter extends OAuth2AccessTokenResponseHttpMessageConverter { private static final ParameterizedTypeReference> STRING_OBJECT_MAP = new ParameterizedTypeReference>() { diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigCustomOpaqueTokenIntrospector.java b/common/common-security/src/main/java/com/rax/common/security/component/RaxCustomOpaqueTokenIntrospector.java similarity index 82% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigCustomOpaqueTokenIntrospector.java rename to common/common-security/src/main/java/com/rax/common/security/component/RaxCustomOpaqueTokenIntrospector.java index fa7b0d9..0b6816a 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigCustomOpaqueTokenIntrospector.java +++ b/common/common-security/src/main/java/com/rax/common/security/component/RaxCustomOpaqueTokenIntrospector.java @@ -1,9 +1,9 @@ -package com.pig4cloud.pig.common.security.component; +package com.rax.common.security.component; import cn.hutool.extra.spring.SpringUtil; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import com.pig4cloud.pig.common.security.service.PigUser; -import com.pig4cloud.pig.common.security.service.PigUserDetailsService; +import com.rax.common.core.constant.SecurityConstants; +import com.rax.common.security.service.RaxUser; +import com.rax.common.security.service.RaxUserDetailsService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.core.Ordered; @@ -32,7 +32,7 @@ import java.util.Optional; */ @Slf4j @RequiredArgsConstructor -public class PigCustomOpaqueTokenIntrospector implements OpaqueTokenIntrospector { +public class RaxCustomOpaqueTokenIntrospector implements OpaqueTokenIntrospector { private final OAuth2AuthorizationService authorizationService; @@ -50,10 +50,10 @@ public class PigCustomOpaqueTokenIntrospector implements OpaqueTokenIntrospector AuthorityUtils.NO_AUTHORITIES); } - Map userDetailsServiceMap = SpringUtil - .getBeansOfType(PigUserDetailsService.class); + Map userDetailsServiceMap = SpringUtil + .getBeansOfType(RaxUserDetailsService.class); - Optional optional = userDetailsServiceMap.values() + Optional optional = userDetailsServiceMap.values() .stream() .filter(service -> service.support(Objects.requireNonNull(oldAuthorization).getRegisteredClientId(), oldAuthorization.getAuthorizationGrantType().getValue())) @@ -64,7 +64,7 @@ public class PigCustomOpaqueTokenIntrospector implements OpaqueTokenIntrospector Object principal = Objects.requireNonNull(oldAuthorization).getAttributes().get(Principal.class.getName()); UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken = (UsernamePasswordAuthenticationToken) principal; Object tokenPrincipal = usernamePasswordAuthenticationToken.getPrincipal(); - userDetails = optional.get().loadUserByUser((PigUser) tokenPrincipal); + userDetails = optional.get().loadUserByUser((RaxUser) tokenPrincipal); } catch (UsernameNotFoundException notFoundException) { log.warn("用户不不存在 {}", notFoundException.getLocalizedMessage()); @@ -75,11 +75,11 @@ public class PigCustomOpaqueTokenIntrospector implements OpaqueTokenIntrospector } // 注入客户端信息，方便上下文中获取 - PigUser pigUser = (PigUser) userDetails; - Objects.requireNonNull(pigUser) + RaxUser raxUser = (RaxUser) userDetails; + Objects.requireNonNull(raxUser) .getAttributes() .put(SecurityConstants.CLIENT_ID, oldAuthorization.getRegisteredClientId()); - return pigUser; + return raxUser; } } diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigResourceServerAutoConfiguration.java b/common/common-security/src/main/java/com/rax/common/security/component/RaxResourceServerAutoConfiguration.java similarity index 88% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigResourceServerAutoConfiguration.java rename to common/common-security/src/main/java/com/rax/common/security/component/RaxResourceServerAutoConfiguration.java index 3aac75a..90c5736 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigResourceServerAutoConfiguration.java +++ b/common/common-security/src/main/java/com/rax/common/security/component/RaxResourceServerAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.security.component; +package com.rax.common.security.component; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.RequiredArgsConstructor; @@ -30,7 +30,7 @@ import org.springframework.security.oauth2.server.resource.introspection.OpaqueT */ @RequiredArgsConstructor @EnableConfigurationProperties(PermitAllUrlProperties.class) -public class PigResourceServerAutoConfiguration { +public class RaxResourceServerAutoConfiguration { /** * 鉴权具体的实现逻辑 @@ -47,8 +47,8 @@ public class PigResourceServerAutoConfiguration { * @return BearerTokenExtractor */ @Bean - public PigBearerTokenExtractor pigBearerTokenExtractor(PermitAllUrlProperties urlProperties) { - return new PigBearerTokenExtractor(urlProperties); + public RaxBearerTokenExtractor raxBearerTokenExtractor(PermitAllUrlProperties urlProperties) { + return new RaxBearerTokenExtractor(urlProperties); } /** @@ -70,7 +70,7 @@ public class PigResourceServerAutoConfiguration { */ @Bean public OpaqueTokenIntrospector opaqueTokenIntrospector(OAuth2AuthorizationService authorizationService) { - return new PigCustomOpaqueTokenIntrospector(authorizationService); + return new RaxCustomOpaqueTokenIntrospector(authorizationService); } } diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigResourceServerConfiguration.java b/common/common-security/src/main/java/com/rax/common/security/component/RaxResourceServerConfiguration.java similarity index 92% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigResourceServerConfiguration.java rename to common/common-security/src/main/java/com/rax/common/security/component/RaxResourceServerConfiguration.java index 16d8ebf..b8622d7 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigResourceServerConfiguration.java +++ b/common/common-security/src/main/java/com/rax/common/security/component/RaxResourceServerConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.security.component; +package com.rax.common.security.component; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -40,13 +40,13 @@ import org.springframework.security.web.util.matcher.AntPathRequestMatcher; @EnableWebSecurity @EnableMethodSecurity @RequiredArgsConstructor -public class PigResourceServerConfiguration { +public class RaxResourceServerConfiguration { protected final ResourceAuthExceptionEntryPoint resourceAuthExceptionEntryPoint; private final PermitAllUrlProperties permitAllUrl; - private final PigBearerTokenExtractor pigBearerTokenExtractor; + private final RaxBearerTokenExtractor raxBearerTokenExtractor; private final OpaqueTokenIntrospector customOpaqueTokenIntrospector; @@ -66,7 +66,7 @@ public class PigResourceServerConfiguration { .oauth2ResourceServer( oauth2 -> oauth2.opaqueToken(token -> token.introspector(customOpaqueTokenIntrospector)) .authenticationEntryPoint(resourceAuthExceptionEntryPoint) - .bearerTokenResolver(pigBearerTokenExtractor)) + .bearerTokenResolver(raxBearerTokenExtractor)) .headers(headers -> headers.frameOptions(HeadersConfigurer.FrameOptionsConfig::disable)) .csrf(AbstractHttpConfigurer::disable); diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigSecurityInnerAspect.java b/common/common-security/src/main/java/com/rax/common/security/component/RaxSecurityInnerAspect.java similarity index 89% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigSecurityInnerAspect.java rename to common/common-security/src/main/java/com/rax/common/security/component/RaxSecurityInnerAspect.java index eef9228..0e2429a 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigSecurityInnerAspect.java +++ b/common/common-security/src/main/java/com/rax/common/security/component/RaxSecurityInnerAspect.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.security.component; +package com.rax.common.security.component; import cn.hutool.core.util.StrUtil; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import com.pig4cloud.pig.common.security.annotation.Inner; +import com.rax.common.core.constant.SecurityConstants; +import com.rax.common.security.annotation.Inner; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; @@ -39,7 +39,7 @@ import org.springframework.security.access.AccessDeniedException; @Slf4j @Aspect @RequiredArgsConstructor -public class PigSecurityInnerAspect implements Ordered { +public class RaxSecurityInnerAspect implements Ordered { private final HttpServletRequest request; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigSecurityMessageSourceConfiguration.java b/common/common-security/src/main/java/com/rax/common/security/component/RaxSecurityMessageSourceConfiguration.java similarity index 93% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigSecurityMessageSourceConfiguration.java rename to common/common-security/src/main/java/com/rax/common/security/component/RaxSecurityMessageSourceConfiguration.java index 9245110..d5683eb 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigSecurityMessageSourceConfiguration.java +++ b/common/common-security/src/main/java/com/rax/common/security/component/RaxSecurityMessageSourceConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.security.component; +package com.rax.common.security.component; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.context.MessageSource; @@ -33,7 +33,7 @@ import static org.springframework.boot.autoconfigure.condition.ConditionalOnWebA * 注入自定义错误处理,覆盖 org/springframework/security/messages 内置异常 */ @ConditionalOnWebApplication(type = SERVLET) -public class PigSecurityMessageSourceConfiguration implements WebMvcConfigurer { +public class RaxSecurityMessageSourceConfiguration implements WebMvcConfigurer { @Bean public MessageSource securityMessageSource() { diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/ResourceAuthExceptionEntryPoint.java b/common/common-security/src/main/java/com/rax/common/security/component/ResourceAuthExceptionEntryPoint.java similarity index 94% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/ResourceAuthExceptionEntryPoint.java rename to common/common-security/src/main/java/com/rax/common/security/component/ResourceAuthExceptionEntryPoint.java index dab5d70..61553cd 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/ResourceAuthExceptionEntryPoint.java +++ b/common/common-security/src/main/java/com/rax/common/security/component/ResourceAuthExceptionEntryPoint.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.security.component; +package com.rax.common.security.component; import com.fasterxml.jackson.databind.ObjectMapper; -import com.pig4cloud.pig.common.core.constant.CommonConstants; -import com.pig4cloud.pig.common.core.util.R; +import com.rax.common.core.constant.CommonConstants; +import com.rax.common.core.util.R; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/feign/PigFeignClientConfiguration.java b/common/common-security/src/main/java/com/rax/common/security/feign/RaxFeignClientConfiguration.java similarity index 87% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/feign/PigFeignClientConfiguration.java rename to common/common-security/src/main/java/com/rax/common/security/feign/RaxFeignClientConfiguration.java index a66b52d..878c5f7 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/feign/PigFeignClientConfiguration.java +++ b/common/common-security/src/main/java/com/rax/common/security/feign/RaxFeignClientConfiguration.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.security.feign; +package com.rax.common.security.feign; import feign.RequestInterceptor; import org.springframework.context.annotation.Bean; import org.springframework.security.oauth2.server.resource.web.BearerTokenResolver; -public class PigFeignClientConfiguration { +public class RaxFeignClientConfiguration { /** * 注入 oauth2 feign token 增强 @@ -29,7 +29,7 @@ public class PigFeignClientConfiguration { */ @Bean public RequestInterceptor oauthRequestInterceptor(BearerTokenResolver tokenResolver) { - return new PigOAuthRequestInterceptor(tokenResolver); + return new RaxOAuthRequestInterceptor(tokenResolver); } } diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/feign/PigOAuthRequestInterceptor.java b/common/common-security/src/main/java/com/rax/common/security/feign/RaxOAuthRequestInterceptor.java similarity index 87% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/feign/PigOAuthRequestInterceptor.java rename to common/common-security/src/main/java/com/rax/common/security/feign/RaxOAuthRequestInterceptor.java index 8d7f05d..6f18a50 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/feign/PigOAuthRequestInterceptor.java +++ b/common/common-security/src/main/java/com/rax/common/security/feign/RaxOAuthRequestInterceptor.java @@ -1,9 +1,9 @@ -package com.pig4cloud.pig.common.security.feign; +package com.rax.common.security.feign; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import com.pig4cloud.pig.common.core.util.WebUtils; +import com.rax.common.core.constant.SecurityConstants; +import com.rax.common.core.util.WebUtils; import feign.RequestInterceptor; import feign.RequestTemplate; import jakarta.servlet.http.HttpServletRequest; @@ -25,7 +25,7 @@ import java.util.Collection; */ @Slf4j @RequiredArgsConstructor -public class PigOAuthRequestInterceptor implements RequestInterceptor { +public class RaxOAuthRequestInterceptor implements RequestInterceptor { private final BearerTokenResolver tokenResolver; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigAppUserDetailsServiceImpl.java b/common/common-security/src/main/java/com/rax/common/security/service/RaxAppUserDetailsServiceImpl.java similarity index 75% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigAppUserDetailsServiceImpl.java rename to common/common-security/src/main/java/com/rax/common/security/service/RaxAppUserDetailsServiceImpl.java index 93a718a..c4e7f09 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigAppUserDetailsServiceImpl.java +++ b/common/common-security/src/main/java/com/rax/common/security/service/RaxAppUserDetailsServiceImpl.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.security.service; +package com.rax.common.security.service; -import com.pig4cloud.pig.admin.api.dto.UserDTO; -import com.pig4cloud.pig.admin.api.dto.UserInfo; -import com.pig4cloud.pig.admin.api.feign.RemoteUserService; -import com.pig4cloud.pig.common.core.constant.CacheConstants; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import com.pig4cloud.pig.common.core.util.R; +import com.rax.admin.api.dto.UserDTO; +import com.rax.admin.api.dto.UserInfo; +import com.rax.admin.api.feign.RemoteUserService; +import com.rax.common.core.constant.CacheConstants; +import com.rax.common.core.constant.SecurityConstants; +import com.rax.common.core.util.R; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -36,7 +36,7 @@ import org.springframework.security.core.userdetails.UserDetails; */ @Slf4j @RequiredArgsConstructor -public class PigAppUserDetailsServiceImpl implements PigUserDetailsService { +public class RaxAppUserDetailsServiceImpl implements RaxUserDetailsService { private final RemoteUserService remoteUserService; @@ -52,7 +52,7 @@ public class PigAppUserDetailsServiceImpl implements PigUserDetailsService { public UserDetails loadUserByUsername(String phone) { Cache cache = cacheManager.getCache(CacheConstants.USER_DETAILS); if (cache != null && cache.get(phone) != null) { - return (PigUser) cache.get(phone).get(); + return (RaxUser) cache.get(phone).get(); } UserDTO userDTO = new UserDTO(); @@ -68,12 +68,12 @@ public class PigAppUserDetailsServiceImpl implements PigUserDetailsService { /** * check-token 使用 - * @param pigUser user + * @param raxUser user * @return */ @Override - public UserDetails loadUserByUser(PigUser pigUser) { - return this.loadUserByUsername(pigUser.getPhone()); + public UserDetails loadUserByUser(RaxUser raxUser) { + return this.loadUserByUsername(raxUser.getPhone()); } /** diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigRedisOAuth2AuthorizationConsentService.java b/common/common-security/src/main/java/com/rax/common/security/service/RaxRedisOAuth2AuthorizationConsentService.java similarity index 93% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigRedisOAuth2AuthorizationConsentService.java rename to common/common-security/src/main/java/com/rax/common/security/service/RaxRedisOAuth2AuthorizationConsentService.java index df83102..eaac20b 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigRedisOAuth2AuthorizationConsentService.java +++ b/common/common-security/src/main/java/com/rax/common/security/service/RaxRedisOAuth2AuthorizationConsentService.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.common.security.service; +package com.rax.common.security.service; import lombok.RequiredArgsConstructor; import org.springframework.data.redis.core.RedisTemplate; @@ -9,7 +9,7 @@ import org.springframework.util.Assert; import java.util.concurrent.TimeUnit; @RequiredArgsConstructor -public class PigRedisOAuth2AuthorizationConsentService implements OAuth2AuthorizationConsentService { +public class RaxRedisOAuth2AuthorizationConsentService implements OAuth2AuthorizationConsentService { private final RedisTemplate redisTemplate; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigRedisOAuth2AuthorizationService.java b/common/common-security/src/main/java/com/rax/common/security/service/RaxRedisOAuth2AuthorizationService.java similarity index 97% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigRedisOAuth2AuthorizationService.java rename to common/common-security/src/main/java/com/rax/common/security/service/RaxRedisOAuth2AuthorizationService.java index 96e5d3f..8c2d043 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigRedisOAuth2AuthorizationService.java +++ b/common/common-security/src/main/java/com/rax/common/security/service/RaxRedisOAuth2AuthorizationService.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.common.security.service; +package com.rax.common.security.service; import lombok.RequiredArgsConstructor; import org.springframework.data.redis.core.RedisTemplate; @@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit; * @date 2022/5/27 */ @RequiredArgsConstructor -public class PigRedisOAuth2AuthorizationService implements OAuth2AuthorizationService { +public class RaxRedisOAuth2AuthorizationService implements OAuth2AuthorizationService { private final static Long TIMEOUT = 10L; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigRemoteRegisteredClientRepository.java b/common/common-security/src/main/java/com/rax/common/security/service/RaxRemoteRegisteredClientRepository.java similarity index 91% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigRemoteRegisteredClientRepository.java rename to common/common-security/src/main/java/com/rax/common/security/service/RaxRemoteRegisteredClientRepository.java index ea0d520..c117aa7 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigRemoteRegisteredClientRepository.java +++ b/common/common-security/src/main/java/com/rax/common/security/service/RaxRemoteRegisteredClientRepository.java @@ -1,12 +1,12 @@ -package com.pig4cloud.pig.common.security.service; +package com.rax.common.security.service; import cn.hutool.core.util.BooleanUtil; import cn.hutool.core.util.StrUtil; -import com.pig4cloud.pig.admin.api.entity.SysOauthClientDetails; -import com.pig4cloud.pig.admin.api.feign.RemoteClientDetailsService; -import com.pig4cloud.pig.common.core.constant.CacheConstants; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import com.pig4cloud.pig.common.core.util.RetOps; +import com.rax.admin.api.entity.SysOauthClientDetails; +import com.rax.admin.api.feign.RemoteClientDetailsService; +import com.rax.common.core.constant.CacheConstants; +import com.rax.common.core.constant.SecurityConstants; +import com.rax.common.core.util.RetOps; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import org.springframework.cache.annotation.Cacheable; @@ -31,7 +31,7 @@ import java.util.Optional; * @date 2022/5/29 */ @RequiredArgsConstructor -public class PigRemoteRegisteredClientRepository implements RegisteredClientRepository { +public class RaxRemoteRegisteredClientRepository implements RegisteredClientRepository { /** * 刷新令牌有效期默认 30 天 diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigUser.java b/common/common-security/src/main/java/com/rax/common/security/service/RaxUser.java similarity index 87% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigUser.java rename to common/common-security/src/main/java/com/rax/common/security/service/RaxUser.java index 67adc58..8e48a99 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigUser.java +++ b/common/common-security/src/main/java/com/rax/common/security/service/RaxUser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.security.service; +package com.rax.common.security.service; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -32,7 +32,7 @@ import java.util.Map; * @author lengleng * @date 2019/2/1 扩展用户信息 */ -public class PigUser extends User implements OAuth2AuthenticatedPrincipal { +public class RaxUser extends User implements OAuth2AuthenticatedPrincipal { private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; @@ -61,9 +61,9 @@ public class PigUser extends User implements OAuth2AuthenticatedPrincipal { @Getter private final String phone; - public PigUser(Long id, Long deptId, String username, String password, String phone, boolean enabled, - boolean accountNonExpired, boolean credentialsNonExpired, boolean accountNonLocked, - Collection authorities) { + public RaxUser(Long id, Long deptId, String username, String password, String phone, boolean enabled, + boolean accountNonExpired, boolean credentialsNonExpired, boolean accountNonLocked, + Collection authorities) { super(username, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities); this.id = id; this.deptId = deptId; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigUserDetailsService.java b/common/common-security/src/main/java/com/rax/common/security/service/RaxUserDetailsService.java similarity index 74% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigUserDetailsService.java rename to common/common-security/src/main/java/com/rax/common/security/service/RaxUserDetailsService.java index 4b33f30..06b6212 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigUserDetailsService.java +++ b/common/common-security/src/main/java/com/rax/common/security/service/RaxUserDetailsService.java @@ -1,13 +1,13 @@ -package com.pig4cloud.pig.common.security.service; +package com.rax.common.security.service; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; -import com.pig4cloud.pig.admin.api.dto.UserInfo; -import com.pig4cloud.pig.admin.api.entity.SysUser; -import com.pig4cloud.pig.common.core.constant.CommonConstants; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.core.util.RetOps; +import com.rax.admin.api.dto.UserInfo; +import com.rax.admin.api.entity.SysUser; +import com.rax.common.core.constant.CommonConstants; +import com.rax.common.core.constant.SecurityConstants; +import com.rax.common.core.util.R; +import com.rax.common.core.util.RetOps; import org.springframework.core.Ordered; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.AuthorityUtils; @@ -24,7 +24,7 @@ import java.util.Set; * @author lengleng * @date 2021/12/21 */ -public interface PigUserDetailsService extends UserDetailsService, Ordered { +public interface RaxUserDetailsService extends UserDetailsService, Ordered { /** * 是否支持此客户端校验 @@ -66,18 +66,18 @@ public interface PigUserDetailsService extends UserDetailsService, Ordered { SysUser user = info.getSysUser(); // 构造security用户 - return new PigUser(user.getUserId(), user.getDeptId(), user.getUsername(), + return new RaxUser(user.getUserId(), user.getDeptId(), user.getUsername(), SecurityConstants.BCRYPT + user.getPassword(), user.getPhone(), true, true, true, StrUtil.equals(user.getLockFlag(), CommonConstants.STATUS_NORMAL), authorities); } /** * 通过用户实体查询 - * @param pigUser user + * @param raxUser user * @return */ - default UserDetails loadUserByUser(PigUser pigUser) { - return this.loadUserByUsername(pigUser.getUsername()); + default UserDetails loadUserByUser(RaxUser raxUser) { + return this.loadUserByUsername(raxUser.getUsername()); } } diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigUserDetailsServiceImpl.java b/common/common-security/src/main/java/com/rax/common/security/service/RaxUserDetailsServiceImpl.java similarity index 78% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigUserDetailsServiceImpl.java rename to common/common-security/src/main/java/com/rax/common/security/service/RaxUserDetailsServiceImpl.java index a997a92..456166d 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigUserDetailsServiceImpl.java +++ b/common/common-security/src/main/java/com/rax/common/security/service/RaxUserDetailsServiceImpl.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.security.service; +package com.rax.common.security.service; -import com.pig4cloud.pig.admin.api.dto.UserDTO; -import com.pig4cloud.pig.admin.api.dto.UserInfo; -import com.pig4cloud.pig.admin.api.feign.RemoteUserService; -import com.pig4cloud.pig.common.core.constant.CacheConstants; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import com.pig4cloud.pig.common.core.util.R; +import com.rax.admin.api.dto.UserDTO; +import com.rax.admin.api.dto.UserInfo; +import com.rax.admin.api.feign.RemoteUserService; +import com.rax.common.core.constant.CacheConstants; +import com.rax.common.core.constant.SecurityConstants; +import com.rax.common.core.util.R; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -38,7 +38,7 @@ import org.springframework.security.core.userdetails.UserDetails; @Slf4j @Primary @RequiredArgsConstructor -public class PigUserDetailsServiceImpl implements PigUserDetailsService { +public class RaxUserDetailsServiceImpl implements RaxUserDetailsService { private final RemoteUserService remoteUserService; @@ -54,7 +54,7 @@ public class PigUserDetailsServiceImpl implements PigUserDetailsService { public UserDetails loadUserByUsername(String username) { Cache cache = cacheManager.getCache(CacheConstants.USER_DETAILS); if (cache != null && cache.get(username) != null) { - return (PigUser) cache.get(username).get(); + return (RaxUser) cache.get(username).get(); } UserDTO userDTO = new UserDTO(); diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/util/OAuth2EndpointUtils.java b/common/common-security/src/main/java/com/rax/common/security/util/OAuth2EndpointUtils.java similarity index 98% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/util/OAuth2EndpointUtils.java rename to common/common-security/src/main/java/com/rax/common/security/util/OAuth2EndpointUtils.java index efc6087..4fd45f7 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/util/OAuth2EndpointUtils.java +++ b/common/common-security/src/main/java/com/rax/common/security/util/OAuth2EndpointUtils.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.common.security.util; +package com.rax.common.security.util; import cn.hutool.core.map.MapUtil; import jakarta.servlet.http.HttpServletRequest; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/util/OAuth2ErrorCodesExpand.java b/common/common-security/src/main/java/com/rax/common/security/util/OAuth2ErrorCodesExpand.java similarity index 94% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/util/OAuth2ErrorCodesExpand.java rename to common/common-security/src/main/java/com/rax/common/security/util/OAuth2ErrorCodesExpand.java index 0206513..25d2c4d 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/util/OAuth2ErrorCodesExpand.java +++ b/common/common-security/src/main/java/com/rax/common/security/util/OAuth2ErrorCodesExpand.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.common.security.util; +package com.rax.common.security.util; /** * @author jumuning diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/util/OAuthClientException.java b/common/common-security/src/main/java/com/rax/common/security/util/OAuthClientException.java similarity index 94% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/util/OAuthClientException.java rename to common/common-security/src/main/java/com/rax/common/security/util/OAuthClientException.java index ab7c8dd..dfe7fd2 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/util/OAuthClientException.java +++ b/common/common-security/src/main/java/com/rax/common/security/util/OAuthClientException.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.common.security.util; +package com.rax.common.security.util; import org.springframework.security.oauth2.core.OAuth2AuthenticationException; import org.springframework.security.oauth2.core.OAuth2Error; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/util/ScopeException.java b/common/common-security/src/main/java/com/rax/common/security/util/ScopeException.java similarity index 93% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/util/ScopeException.java rename to common/common-security/src/main/java/com/rax/common/security/util/ScopeException.java index 93de457..74a2e53 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/util/ScopeException.java +++ b/common/common-security/src/main/java/com/rax/common/security/util/ScopeException.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.common.security.util; +package com.rax.common.security.util; import org.springframework.security.oauth2.core.OAuth2AuthenticationException; import org.springframework.security.oauth2.core.OAuth2Error; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/util/SecurityUtils.java b/common/common-security/src/main/java/com/rax/common/security/util/SecurityUtils.java similarity index 86% rename from pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/util/SecurityUtils.java rename to common/common-security/src/main/java/com/rax/common/security/util/SecurityUtils.java index a26c9e6..6fa63ec 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/util/SecurityUtils.java +++ b/common/common-security/src/main/java/com/rax/common/security/util/SecurityUtils.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.security.util; +package com.rax.common.security.util; import cn.hutool.core.util.StrUtil; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import com.pig4cloud.pig.common.security.service.PigUser; +import com.rax.common.security.service.RaxUser; +import com.rax.common.core.constant.SecurityConstants; import lombok.experimental.UtilityClass; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; @@ -46,10 +46,10 @@ public class SecurityUtils { /** * 获取用户 */ - public PigUser getUser(Authentication authentication) { + public RaxUser getUser(Authentication authentication) { Object principal = authentication.getPrincipal(); - if (principal instanceof PigUser) { - return (PigUser) principal; + if (principal instanceof RaxUser) { + return (RaxUser) principal; } return null; } @@ -57,7 +57,7 @@ public class SecurityUtils { /** * 获取用户 */ - public PigUser getUser() { + public RaxUser getUser() { Authentication authentication = getAuthentication(); if (authentication == null) { return null; diff --git a/common/common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/common/common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..4d01346 --- /dev/null +++ b/common/common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,7 @@ +com.rax.common.security.service.RaxUserDetailsServiceImpl +com.rax.common.security.service.RaxAppUserDetailsServiceImpl +com.rax.common.security.service.RaxRedisOAuth2AuthorizationService +com.rax.common.security.service.RaxRedisOAuth2AuthorizationConsentService +com.rax.common.security.component.RaxSecurityInnerAspect +com.rax.common.security.component.RaxSecurityMessageSourceConfiguration +com.rax.common.security.service.RaxRemoteRegisteredClientRepository diff --git a/pig-common/pig-common-security/src/main/resources/i18n/errors/messages_zh_CN.properties b/common/common-security/src/main/resources/i18n/errors/messages_zh_CN.properties similarity index 100% rename from pig-common/pig-common-security/src/main/resources/i18n/errors/messages_zh_CN.properties rename to common/common-security/src/main/resources/i18n/errors/messages_zh_CN.properties diff --git a/pig-common/pig-common-swagger/pom.xml b/common/common-swagger/pom.xml similarity index 60% rename from pig-common/pig-common-swagger/pom.xml rename to common/common-swagger/pom.xml index 5d9ca9e..9acd2a3 100644 --- a/pig-common/pig-common-swagger/pom.xml +++ b/common/common-swagger/pom.xml @@ -1,36 +1,18 @@ - 4.0.0 - com.pig4cloud - pig-common + com.rax + common 3.7.3 - pig-common-swagger + common-swagger jar - pig 接口文档 + 接口文档 @@ -67,8 +49,8 @@ provided - com.pig4cloud - pig-common-core + com.rax + common-core diff --git a/pig-common/pig-common-swagger/src/main/java/com/pig4cloud/pig/common/swagger/annotation/EnablePigDoc.java b/common/common-swagger/src/main/java/com/rax/common/swagger/annotation/EnableRaxDoc.java similarity index 80% rename from pig-common/pig-common-swagger/src/main/java/com/pig4cloud/pig/common/swagger/annotation/EnablePigDoc.java rename to common/common-swagger/src/main/java/com/rax/common/swagger/annotation/EnableRaxDoc.java index ead4425..0088e97 100644 --- a/pig-common/pig-common-swagger/src/main/java/com/pig4cloud/pig/common/swagger/annotation/EnablePigDoc.java +++ b/common/common-swagger/src/main/java/com/rax/common/swagger/annotation/EnableRaxDoc.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.swagger.annotation; +package com.rax.common.swagger.annotation; -import com.pig4cloud.pig.common.core.factory.YamlPropertySourceFactory; -import com.pig4cloud.pig.common.swagger.config.OpenAPIDefinitionImportSelector; -import com.pig4cloud.pig.common.swagger.support.SwaggerProperties; +import com.rax.common.swagger.config.OpenAPIDefinitionImportSelector; +import com.rax.common.core.factory.YamlPropertySourceFactory; +import com.rax.common.swagger.support.SwaggerProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.PropertySource; @@ -26,7 +26,7 @@ import org.springframework.context.annotation.PropertySource; import java.lang.annotation.*; /** - * 开启 pig spring doc + * 开启 spring doc * * @author lengleng * @date 2022-03-26 @@ -38,7 +38,7 @@ import java.lang.annotation.*; @EnableConfigurationProperties(SwaggerProperties.class) @Import(OpenAPIDefinitionImportSelector.class) @PropertySource(value = "classpath:openapi-config.yaml", factory = YamlPropertySourceFactory.class) -public @interface EnablePigDoc { +public @interface EnableRaxDoc { /** * 网关路由前缀 diff --git a/pig-common/pig-common-swagger/src/main/java/com/pig4cloud/pig/common/swagger/config/OpenAPIDefinition.java b/common/common-swagger/src/main/java/com/rax/common/swagger/config/OpenAPIDefinition.java similarity index 96% rename from pig-common/pig-common-swagger/src/main/java/com/pig4cloud/pig/common/swagger/config/OpenAPIDefinition.java rename to common/common-swagger/src/main/java/com/rax/common/swagger/config/OpenAPIDefinition.java index 7e1dcd1..cd66522 100644 --- a/pig-common/pig-common-swagger/src/main/java/com/pig4cloud/pig/common/swagger/config/OpenAPIDefinition.java +++ b/common/common-swagger/src/main/java/com/rax/common/swagger/config/OpenAPIDefinition.java @@ -14,9 +14,9 @@ * this software without specific prior written permission. * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.common.swagger.config; +package com.rax.common.swagger.config; -import com.pig4cloud.pig.common.swagger.support.SwaggerProperties; +import com.rax.common.swagger.support.SwaggerProperties; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.security.OAuthFlow; diff --git a/pig-common/pig-common-swagger/src/main/java/com/pig4cloud/pig/common/swagger/config/OpenAPIDefinitionImportSelector.java b/common/common-swagger/src/main/java/com/rax/common/swagger/config/OpenAPIDefinitionImportSelector.java similarity index 90% rename from pig-common/pig-common-swagger/src/main/java/com/pig4cloud/pig/common/swagger/config/OpenAPIDefinitionImportSelector.java rename to common/common-swagger/src/main/java/com/rax/common/swagger/config/OpenAPIDefinitionImportSelector.java index ef5b175..c8e9e9f 100644 --- a/pig-common/pig-common-swagger/src/main/java/com/pig4cloud/pig/common/swagger/config/OpenAPIDefinitionImportSelector.java +++ b/common/common-swagger/src/main/java/com/rax/common/swagger/config/OpenAPIDefinitionImportSelector.java @@ -1,6 +1,6 @@ -package com.pig4cloud.pig.common.swagger.config; +package com.rax.common.swagger.config; -import com.pig4cloud.pig.common.swagger.annotation.EnablePigDoc; +import com.rax.common.swagger.annotation.EnableRaxDoc; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.context.annotation.ImportBeanDefinitionRegistrar; @@ -20,7 +20,7 @@ public class OpenAPIDefinitionImportSelector implements ImportBeanDefinitionRegi @Override public void registerBeanDefinitions(AnnotationMetadata metadata, BeanDefinitionRegistry registry) { - Map annotationAttributes = metadata.getAnnotationAttributes(EnablePigDoc.class.getName(), true); + Map annotationAttributes = metadata.getAnnotationAttributes(EnableRaxDoc.class.getName(), true); Object value = annotationAttributes.get("value"); if (Objects.isNull(value)) { return; diff --git a/pig-common/pig-common-swagger/src/main/java/com/pig4cloud/pig/common/swagger/config/OpenAPIMetadataConfiguration.java b/common/common-swagger/src/main/java/com/rax/common/swagger/config/OpenAPIMetadataConfiguration.java similarity index 94% rename from pig-common/pig-common-swagger/src/main/java/com/pig4cloud/pig/common/swagger/config/OpenAPIMetadataConfiguration.java rename to common/common-swagger/src/main/java/com/rax/common/swagger/config/OpenAPIMetadataConfiguration.java index 1fa8fa0..d576985 100644 --- a/pig-common/pig-common-swagger/src/main/java/com/pig4cloud/pig/common/swagger/config/OpenAPIMetadataConfiguration.java +++ b/common/common-swagger/src/main/java/com/rax/common/swagger/config/OpenAPIMetadataConfiguration.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.common.swagger.config; +package com.rax.common.swagger.config; import lombok.Setter; import org.springframework.beans.BeansException; diff --git a/pig-common/pig-common-swagger/src/main/java/com/pig4cloud/pig/common/swagger/support/SwaggerProperties.java b/common/common-swagger/src/main/java/com/rax/common/swagger/support/SwaggerProperties.java similarity index 97% rename from pig-common/pig-common-swagger/src/main/java/com/pig4cloud/pig/common/swagger/support/SwaggerProperties.java rename to common/common-swagger/src/main/java/com/rax/common/swagger/support/SwaggerProperties.java index b884e1c..b0f505b 100644 --- a/pig-common/pig-common-swagger/src/main/java/com/pig4cloud/pig/common/swagger/support/SwaggerProperties.java +++ b/common/common-swagger/src/main/java/com/rax/common/swagger/support/SwaggerProperties.java @@ -14,7 +14,7 @@ * this software without specific prior written permission. * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.common.swagger.support; +package com.rax.common.swagger.support; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/pig-common/pig-common-swagger/src/main/resources/openapi-config.yaml b/common/common-swagger/src/main/resources/openapi-config.yaml similarity index 55% rename from pig-common/pig-common-swagger/src/main/resources/openapi-config.yaml rename to common/common-swagger/src/main/resources/openapi-config.yaml index 759211a..d128c35 100644 --- a/pig-common/pig-common-swagger/src/main/resources/openapi-config.yaml +++ b/common/common-swagger/src/main/resources/openapi-config.yaml @@ -1,7 +1,7 @@ # swagger 配置 swagger: enabled: true - title: Pig Swagger API - gateway: http://${GATEWAY-HOST:pig-gateway}:${GATEWAY-PORT:9999} + title: Rax Swagger API + gateway: http://${GATEWAY-HOST:rax-gateway}:${GATEWAY-PORT:9999} token-url: ${swagger.gateway}/admin/oauth2/token scope: server diff --git a/pig-common/pig-common-xss/pom.xml b/common/common-xss/pom.xml similarity index 82% rename from pig-common/pig-common-xss/pom.xml rename to common/common-xss/pom.xml index 56accc7..fd47924 100644 --- a/pig-common/pig-common-xss/pom.xml +++ b/common/common-xss/pom.xml @@ -4,23 +4,23 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.pig4cloud - pig-common + com.rax + common 3.7.3 - pig-common-xss + common-xss jar - pigx xss 安全过滤插件 基于 JSOUP + xss 安全过滤插件 基于 JSOUP 1.15.3 - com.pig4cloud - pig-common-core + com.rax + common-core diff --git a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/PigXssAutoConfiguration.java b/common/common-xss/src/main/java/com/rax/common/xss/RaxXssAutoConfiguration.java similarity index 69% rename from pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/PigXssAutoConfiguration.java rename to common/common-xss/src/main/java/com/rax/common/xss/RaxXssAutoConfiguration.java index 34b9800..1b34047 100644 --- a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/PigXssAutoConfiguration.java +++ b/common/common-xss/src/main/java/com/rax/common/xss/RaxXssAutoConfiguration.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.xss; +package com.rax.common.xss; -import com.pig4cloud.pig.common.xss.core.DefaultXssCleaner; -import com.pig4cloud.pig.common.xss.core.FormXssClean; -import com.pig4cloud.pig.common.xss.core.JacksonXssClean; -import com.pig4cloud.pig.common.xss.core.XssCleaner; +import com.rax.common.xss.config.RaxXssProperties; +import com.rax.common.xss.core.*; +import com.rax.common.xss.core.DefaultXssCleaner; +import com.rax.common.xss.core.FormXssClean; +import com.rax.common.xss.core.JacksonXssClean; +import com.rax.common.xss.core.XssCleaner; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -41,29 +43,29 @@ import java.util.List; */ @AutoConfiguration @RequiredArgsConstructor -@EnableConfigurationProperties(com.pig4cloud.pig.common.xss.config.PigXssProperties.class) -@ConditionalOnProperty(prefix = com.pig4cloud.pig.common.xss.config.PigXssProperties.PREFIX, name = "enabled", +@EnableConfigurationProperties(RaxXssProperties.class) +@ConditionalOnProperty(prefix = RaxXssProperties.PREFIX, name = "enabled", havingValue = "true", matchIfMissing = true) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) -public class PigXssAutoConfiguration implements WebMvcConfigurer { +public class RaxXssAutoConfiguration implements WebMvcConfigurer { - private final com.pig4cloud.pig.common.xss.config.PigXssProperties xssProperties; + private final RaxXssProperties xssProperties; @Bean @ConditionalOnMissingBean - public XssCleaner xssCleaner(com.pig4cloud.pig.common.xss.config.PigXssProperties properties) { + public XssCleaner xssCleaner(RaxXssProperties properties) { return new DefaultXssCleaner(properties); } @Bean - public FormXssClean formXssClean(com.pig4cloud.pig.common.xss.config.PigXssProperties properties, - XssCleaner xssCleaner) { + public FormXssClean formXssClean(RaxXssProperties properties, + XssCleaner xssCleaner) { return new FormXssClean(properties, xssCleaner); } @Bean public Jackson2ObjectMapperBuilderCustomizer xssJacksonCustomizer( - com.pig4cloud.pig.common.xss.config.PigXssProperties properties, XssCleaner xssCleaner) { + RaxXssProperties properties, XssCleaner xssCleaner) { return builder -> builder.deserializerByType(String.class, new JacksonXssClean(properties, xssCleaner)); } @@ -73,7 +75,7 @@ public class PigXssAutoConfiguration implements WebMvcConfigurer { if (patterns.isEmpty()) { patterns.add("/**"); } - com.pig4cloud.pig.common.xss.core.XssCleanInterceptor interceptor = new com.pig4cloud.pig.common.xss.core.XssCleanInterceptor( + XssCleanInterceptor interceptor = new XssCleanInterceptor( xssProperties); registry.addInterceptor(interceptor) .addPathPatterns(patterns) diff --git a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/config/PigXssProperties.java b/common/common-xss/src/main/java/com/rax/common/xss/config/RaxXssProperties.java similarity index 93% rename from pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/config/PigXssProperties.java rename to common/common-xss/src/main/java/com/rax/common/xss/config/RaxXssProperties.java index 881beae..7de7f20 100644 --- a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/config/PigXssProperties.java +++ b/common/common-xss/src/main/java/com/rax/common/xss/config/RaxXssProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.xss.config; +package com.rax.common.xss.config; import lombok.Getter; import lombok.Setter; @@ -32,8 +32,8 @@ import java.util.List; @Getter @Setter @RefreshScope -@ConfigurationProperties(PigXssProperties.PREFIX) -public class PigXssProperties { +@ConfigurationProperties(RaxXssProperties.PREFIX) +public class RaxXssProperties { public static final String PREFIX = "security.xss"; diff --git a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/utils/package-info.java b/common/common-xss/src/main/java/com/rax/common/xss/config/package-info.java similarity index 93% rename from pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/utils/package-info.java rename to common/common-xss/src/main/java/com/rax/common/xss/config/package-info.java index 56d8d8b..27c7608 100644 --- a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/utils/package-info.java +++ b/common/common-xss/src/main/java/com/rax/common/xss/config/package-info.java @@ -14,4 +14,4 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.xss.utils; +package com.rax.common.xss.config; diff --git a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/DefaultXssCleaner.java b/common/common-xss/src/main/java/com/rax/common/xss/core/DefaultXssCleaner.java similarity index 80% rename from pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/DefaultXssCleaner.java rename to common/common-xss/src/main/java/com/rax/common/xss/core/DefaultXssCleaner.java index 7be9a6d..5d7ab83 100644 --- a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/DefaultXssCleaner.java +++ b/common/common-xss/src/main/java/com/rax/common/xss/core/DefaultXssCleaner.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.xss.core; +package com.rax.common.xss.core; import cn.hutool.core.util.CharsetUtil; -import com.pig4cloud.pig.common.xss.config.PigXssProperties; -import com.pig4cloud.pig.common.xss.utils.XssUtil; +import com.rax.common.xss.config.RaxXssProperties; +import com.rax.common.xss.utils.XssUtil; import org.jsoup.Jsoup; import org.jsoup.internal.StringUtil; import org.jsoup.nodes.Document; @@ -32,13 +32,13 @@ import org.springframework.web.util.HtmlUtils; */ public class DefaultXssCleaner implements XssCleaner { - private final PigXssProperties properties; + private final RaxXssProperties properties; - public DefaultXssCleaner(PigXssProperties properties) { + public DefaultXssCleaner(RaxXssProperties properties) { this.properties = properties; } - private static Document.OutputSettings getOutputSettings(PigXssProperties properties) { + private static Document.OutputSettings getOutputSettings(RaxXssProperties properties) { return new Document.OutputSettings() // 2. 转义，没找到关闭的方法，目前这个规则最少 .escapeMode(Entities.EscapeMode.xhtml) @@ -52,12 +52,12 @@ public class DefaultXssCleaner implements XssCleaner { if (StringUtil.isBlank(bodyHtml)) { return bodyHtml; } - PigXssProperties.Mode mode = properties.getMode(); - if (PigXssProperties.Mode.escape == mode) { + RaxXssProperties.Mode mode = properties.getMode(); + if (RaxXssProperties.Mode.escape == mode) { // html 转义 return HtmlUtils.htmlEscape(bodyHtml, CharsetUtil.UTF_8); } - else if (PigXssProperties.Mode.validate == mode) { + else if (RaxXssProperties.Mode.validate == mode) { // 校验 if (Jsoup.isValid(bodyHtml, XssUtil.WHITE_LIST)) { return bodyHtml; diff --git a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/FormXssClean.java b/common/common-xss/src/main/java/com/rax/common/xss/core/FormXssClean.java similarity index 87% rename from pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/FormXssClean.java rename to common/common-xss/src/main/java/com/rax/common/xss/core/FormXssClean.java index 1e897d3..a9566dc 100644 --- a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/FormXssClean.java +++ b/common/common-xss/src/main/java/com/rax/common/xss/core/FormXssClean.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.xss.core; +package com.rax.common.xss.core; import cn.hutool.core.util.StrUtil; -import com.pig4cloud.pig.common.xss.config.PigXssProperties; -import com.pig4cloud.pig.common.xss.utils.XssUtil; +import com.rax.common.xss.config.RaxXssProperties; +import com.rax.common.xss.utils.XssUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -29,11 +29,11 @@ import org.springframework.web.bind.annotation.InitBinder; import java.beans.PropertyEditorSupport; @ControllerAdvice -@ConditionalOnProperty(prefix = PigXssProperties.PREFIX, name = "enabled", havingValue = "true", matchIfMissing = true) +@ConditionalOnProperty(prefix = RaxXssProperties.PREFIX, name = "enabled", havingValue = "true", matchIfMissing = true) @RequiredArgsConstructor public class FormXssClean { - private final PigXssProperties properties; + private final RaxXssProperties properties; private final XssCleaner xssCleaner; @@ -49,7 +49,7 @@ public class FormXssClean { private final XssCleaner xssCleaner; - private final PigXssProperties properties; + private final RaxXssProperties properties; @Override public String getAsText() { diff --git a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/FromXssException.java b/common/common-xss/src/main/java/com/rax/common/xss/core/FromXssException.java similarity index 95% rename from pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/FromXssException.java rename to common/common-xss/src/main/java/com/rax/common/xss/core/FromXssException.java index cd1e939..a7a80fb 100644 --- a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/FromXssException.java +++ b/common/common-xss/src/main/java/com/rax/common/xss/core/FromXssException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.xss.core; +package com.rax.common.xss.core; import lombok.Getter; diff --git a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/JacksonXssClean.java b/common/common-xss/src/main/java/com/rax/common/xss/core/JacksonXssClean.java similarity index 90% rename from pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/JacksonXssClean.java rename to common/common-xss/src/main/java/com/rax/common/xss/core/JacksonXssClean.java index 431b43f..bee1494 100644 --- a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/JacksonXssClean.java +++ b/common/common-xss/src/main/java/com/rax/common/xss/core/JacksonXssClean.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.xss.core; +package com.rax.common.xss.core; import cn.hutool.core.util.ArrayUtil; -import com.pig4cloud.pig.common.xss.config.PigXssProperties; -import com.pig4cloud.pig.common.xss.utils.XssUtil; +import com.rax.common.xss.config.RaxXssProperties; +import com.rax.common.xss.utils.XssUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -34,7 +34,7 @@ import java.util.Objects; @RequiredArgsConstructor public class JacksonXssClean extends XssCleanDeserializerBase { - private final PigXssProperties properties; + private final RaxXssProperties properties; private final XssCleaner xssCleaner; diff --git a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/JacksonXssException.java b/common/common-xss/src/main/java/com/rax/common/xss/core/JacksonXssException.java similarity index 95% rename from pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/JacksonXssException.java rename to common/common-xss/src/main/java/com/rax/common/xss/core/JacksonXssException.java index 14d49ee..866a8d4 100644 --- a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/JacksonXssException.java +++ b/common/common-xss/src/main/java/com/rax/common/xss/core/JacksonXssException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.xss.core; +package com.rax.common.xss.core; import lombok.Getter; diff --git a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/XssCleanDeserializer.java b/common/common-xss/src/main/java/com/rax/common/xss/core/XssCleanDeserializer.java similarity index 82% rename from pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/XssCleanDeserializer.java rename to common/common-xss/src/main/java/com/rax/common/xss/core/XssCleanDeserializer.java index 3a01f7a..f3de78b 100644 --- a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/XssCleanDeserializer.java +++ b/common/common-xss/src/main/java/com/rax/common/xss/core/XssCleanDeserializer.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.xss.core; +package com.rax.common.xss.core; -import com.pig4cloud.pig.common.core.util.SpringContextHolder; -import com.pig4cloud.pig.common.xss.config.PigXssProperties; -import com.pig4cloud.pig.common.xss.utils.XssUtil; +import com.rax.common.xss.config.RaxXssProperties; +import com.rax.common.xss.utils.XssUtil; +import com.rax.common.core.util.SpringContextHolder; import lombok.extern.slf4j.Slf4j; import java.io.IOException; @@ -34,7 +34,7 @@ public class XssCleanDeserializer extends XssCleanDeserializerBase { @Override public String clean(String name, String text) throws IOException { // 读取 xss 配置 - PigXssProperties properties = SpringContextHolder.getBean(PigXssProperties.class); + RaxXssProperties properties = SpringContextHolder.getBean(RaxXssProperties.class); // 读取 XssCleaner bean XssCleaner xssCleaner = SpringContextHolder.getBean(XssCleaner.class); if (xssCleaner != null) { diff --git a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/XssCleanDeserializerBase.java b/common/common-xss/src/main/java/com/rax/common/xss/core/XssCleanDeserializerBase.java similarity index 97% rename from pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/XssCleanDeserializerBase.java rename to common/common-xss/src/main/java/com/rax/common/xss/core/XssCleanDeserializerBase.java index 9129d00..fcf3227 100644 --- a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/XssCleanDeserializerBase.java +++ b/common/common-xss/src/main/java/com/rax/common/xss/core/XssCleanDeserializerBase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.xss.core; +package com.rax.common.xss.core; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; diff --git a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/XssCleanIgnore.java b/common/common-xss/src/main/java/com/rax/common/xss/core/XssCleanIgnore.java similarity index 95% rename from pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/XssCleanIgnore.java rename to common/common-xss/src/main/java/com/rax/common/xss/core/XssCleanIgnore.java index 1605122..2888fd9 100644 --- a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/XssCleanIgnore.java +++ b/common/common-xss/src/main/java/com/rax/common/xss/core/XssCleanIgnore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.xss.core; +package com.rax.common.xss.core; import java.lang.annotation.*; diff --git a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/XssCleanInterceptor.java b/common/common-xss/src/main/java/com/rax/common/xss/core/XssCleanInterceptor.java similarity index 93% rename from pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/XssCleanInterceptor.java rename to common/common-xss/src/main/java/com/rax/common/xss/core/XssCleanInterceptor.java index 9b8b093..b3fc167 100644 --- a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/XssCleanInterceptor.java +++ b/common/common-xss/src/main/java/com/rax/common/xss/core/XssCleanInterceptor.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.xss.core; +package com.rax.common.xss.core; import cn.hutool.core.util.ArrayUtil; -import com.pig4cloud.pig.common.xss.config.PigXssProperties; +import com.rax.common.xss.config.RaxXssProperties; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; @@ -33,7 +33,7 @@ import org.springframework.web.servlet.AsyncHandlerInterceptor; @RequiredArgsConstructor public class XssCleanInterceptor implements AsyncHandlerInterceptor { - private final PigXssProperties xssProperties; + private final RaxXssProperties xssProperties; @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) diff --git a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/XssCleaner.java b/common/common-xss/src/main/java/com/rax/common/xss/core/XssCleaner.java similarity index 92% rename from pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/XssCleaner.java rename to common/common-xss/src/main/java/com/rax/common/xss/core/XssCleaner.java index 22b7bd2..79e3bd4 100644 --- a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/XssCleaner.java +++ b/common/common-xss/src/main/java/com/rax/common/xss/core/XssCleaner.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.xss.core; +package com.rax.common.xss.core; -import com.pig4cloud.pig.common.xss.utils.XssUtil; +import com.rax.common.xss.utils.XssUtil; import org.jsoup.Jsoup; /** diff --git a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/XssException.java b/common/common-xss/src/main/java/com/rax/common/xss/core/XssException.java similarity index 95% rename from pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/XssException.java rename to common/common-xss/src/main/java/com/rax/common/xss/core/XssException.java index 9a76c41..1172da8 100644 --- a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/XssException.java +++ b/common/common-xss/src/main/java/com/rax/common/xss/core/XssException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.xss.core; +package com.rax.common.xss.core; /** * xss 异常，校验模式抛出 diff --git a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/XssHolder.java b/common/common-xss/src/main/java/com/rax/common/xss/core/XssHolder.java similarity index 97% rename from pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/XssHolder.java rename to common/common-xss/src/main/java/com/rax/common/xss/core/XssHolder.java index 017b674..1756268 100644 --- a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/XssHolder.java +++ b/common/common-xss/src/main/java/com/rax/common/xss/core/XssHolder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.xss.core; +package com.rax.common.xss.core; /** * 利用 ThreadLocal 缓存线程间的数据 diff --git a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/XssType.java b/common/common-xss/src/main/java/com/rax/common/xss/core/XssType.java similarity index 96% rename from pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/XssType.java rename to common/common-xss/src/main/java/com/rax/common/xss/core/XssType.java index ec16e97..3acf329 100644 --- a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/core/XssType.java +++ b/common/common-xss/src/main/java/com/rax/common/xss/core/XssType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.xss.core; +package com.rax.common.xss.core; /** * xss 数据处理类型 diff --git a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/package-info.java b/common/common-xss/src/main/java/com/rax/common/xss/package-info.java similarity index 69% rename from pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/package-info.java rename to common/common-xss/src/main/java/com/rax/common/xss/package-info.java index 1747e71..9996b29 100644 --- a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/package-info.java +++ b/common/common-xss/src/main/java/com/rax/common/xss/package-info.java @@ -1,4 +1,4 @@ /** * 此包代码来源至: https://gitee.com/596392912/mica/tree/master/mica-xss */ -package com.pig4cloud.pig.common.xss; +package com.rax.common.xss; diff --git a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/utils/XssUtil.java b/common/common-xss/src/main/java/com/rax/common/xss/utils/XssUtil.java similarity index 98% rename from pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/utils/XssUtil.java rename to common/common-xss/src/main/java/com/rax/common/xss/utils/XssUtil.java index 34f1a23..1c151ca 100644 --- a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/utils/XssUtil.java +++ b/common/common-xss/src/main/java/com/rax/common/xss/utils/XssUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.xss.utils; +package com.rax.common.xss.utils; import org.jsoup.Jsoup; import org.jsoup.nodes.Attribute; diff --git a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/config/package-info.java b/common/common-xss/src/main/java/com/rax/common/xss/utils/package-info.java similarity index 93% rename from pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/config/package-info.java rename to common/common-xss/src/main/java/com/rax/common/xss/utils/package-info.java index 89539db..7389da9 100644 --- a/pig-common/pig-common-xss/src/main/java/com/pig4cloud/pig/common/xss/config/package-info.java +++ b/common/common-xss/src/main/java/com/rax/common/xss/utils/package-info.java @@ -14,4 +14,4 @@ * limitations under the License. */ -package com.pig4cloud.pig.common.xss.config; +package com.rax.common.xss.utils; diff --git a/pig-common/pig-common-xss/src/main/resources/META-INF/spring-configuration-metadata.json b/common/common-xss/src/main/resources/META-INF/spring-configuration-metadata.json similarity index 62% rename from pig-common/pig-common-xss/src/main/resources/META-INF/spring-configuration-metadata.json rename to common/common-xss/src/main/resources/META-INF/spring-configuration-metadata.json index 638e1e1..34bb004 100644 --- a/pig-common/pig-common-xss/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/common/common-xss/src/main/resources/META-INF/spring-configuration-metadata.json @@ -2,8 +2,8 @@ "groups": [ { "name": "security.xss", - "type": "com.pig4cloud.pig.common.xss.config.PigXssProperties", - "sourceType": "com.pig4cloud.pig.common.xss.config.PigXssProperties" + "type": "com.rax.common.xss.config.RaxXssProperties", + "sourceType": "com.rax.common.xss.config.RaxXssProperties" } ], "properties": [ @@ -11,46 +11,46 @@ "name": "security.xss.enable-escape", "type": "java.lang.Boolean", "description": "[clear 专用] 使用转义，默认关闭", - "sourceType": "com.pig4cloud.pig.common.xss.config.PigXssProperties", + "sourceType": "com.rax.common.xss.config.RaxXssProperties", "defaultValue": false }, { "name": "security.xss.enabled", "type": "java.lang.Boolean", "description": "开启xss", - "sourceType": "com.pig4cloud.pig.common.xss.config.PigXssProperties", + "sourceType": "com.rax.common.xss.config.RaxXssProperties", "defaultValue": true }, { "name": "security.xss.mode", - "type": "com.pig4cloud.pig.common.xss.config.PigXssProperties$Mode", + "type": "com.rax.common.xss.config.RaxXssProperties$Mode", "description": "模式：clear 清理（默认），escape 转义", - "sourceType": "com.pig4cloud.pig.common.xss.config.PigXssProperties" + "sourceType": "com.rax.common.xss.config.RaxXssProperties" }, { "name": "security.xss.path-exclude-patterns", "type": "java.util.List", "description": "放行的路由，默认为空", - "sourceType": "com.pig4cloud.pig.common.xss.config.PigXssProperties" + "sourceType": "com.rax.common.xss.config.RaxXssProperties" }, { "name": "security.xss.path-patterns", "type": "java.util.List", "description": "拦截的路由，默认为空", - "sourceType": "com.pig4cloud.pig.common.xss.config.PigXssProperties" + "sourceType": "com.rax.common.xss.config.RaxXssProperties" }, { "name": "security.xss.pretty-print", "type": "java.lang.Boolean", "description": "[clear 专用] prettyPrint，默认关闭： 保留换行", - "sourceType": "com.pig4cloud.pig.common.xss.config.PigXssProperties", + "sourceType": "com.rax.common.xss.config.RaxXssProperties", "defaultValue": false }, { "name": "security.xss.trim-text", "type": "java.lang.Boolean", "description": "全局：对文件进行首尾 trim", - "sourceType": "com.pig4cloud.pig.common.xss.config.PigXssProperties", + "sourceType": "com.rax.common.xss.config.RaxXssProperties", "defaultValue": true } ], diff --git a/common/common-xss/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/common/common-xss/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..45e72b3 --- /dev/null +++ b/common/common-xss/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.rax.common.xss.RaxXssAutoConfiguration diff --git a/common/excel-spring-boot-starter/.editorconfig b/common/excel-spring-boot-starter/.editorconfig new file mode 100644 index 0000000..b5bdb5e --- /dev/null +++ b/common/excel-spring-boot-starter/.editorconfig @@ -0,0 +1,24 @@ +root = true + +# 对所有文件生效 +[*] +charset = utf-8 +indent_style = space +indent_size = 2 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +# 对java, xml文件生效 +[*.{java, xml}] +indent_style = tab +indent_size = 4 + +# 对yml, json文件生效 +[*.{yml, json}] +indent_style = space +indent_size = 2 + +# 对后缀名为 .md 的文件生效 +[*.md] +trim_trailing_whitespace = false \ No newline at end of file diff --git a/common/excel-spring-boot-starter/.gitignore b/common/excel-spring-boot-starter/.gitignore new file mode 100644 index 0000000..cb5e362 --- /dev/null +++ b/common/excel-spring-boot-starter/.gitignore @@ -0,0 +1,41 @@ +*# +*.iml +*.ipr +*.iws +*.jar +*.sw? +*~ +.#* +.*.md.html +.DS_Store +.classpath +.factorypath +.gradle +.idea +.metadata +.project +.recommenders +.settings +.springBeans +/code +MANIFEST.MF +_site/ +activemq-data +bin +build +!/**/src/**/bin +!/**/src/**/build +build.log +dependency-reduced-pom.xml +dump.rdb +interpolated*.xml +lib/ +manifest.yml +out +overridedb.* +target +transaction-logs +.flattened-pom.xml +secrets.yml +.gradletasknamecache +.sts4-cache \ No newline at end of file diff --git a/common/excel-spring-boot-starter/.springjavaformatconfig b/common/excel-spring-boot-starter/.springjavaformatconfig new file mode 100644 index 0000000..6d408bb --- /dev/null +++ b/common/excel-spring-boot-starter/.springjavaformatconfig @@ -0,0 +1 @@ +java-baseline=8 diff --git a/common/excel-spring-boot-starter/pom.xml b/common/excel-spring-boot-starter/pom.xml new file mode 100644 index 0000000..a7812b5 --- /dev/null +++ b/common/excel-spring-boot-starter/pom.xml @@ -0,0 +1,70 @@ + + + 4.0.0 + + com.rax + common + 3.7.3 + + + excel-spring-boot-starter + jar + + + 17 + 3.3.3 + 3.0.0 + 0.0.39 + 1.21 + + + + + com.alibaba + easyexcel + ${easyexcel.version} + + + org.apache.commons + commons-compress + + + + + org.apache.commons + commons-compress + ${commons-compress} + + + + org.projectlombok + lombok + provided + + + + net.dreamlu + mica-auto + ${mica.version} + provided + + + org.aspectj + aspectjweaver + + + jakarta.servlet + jakarta.servlet-api + + + jakarta.validation + jakarta.validation-api + + + org.springframework + spring-webmvc + + + + diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/ExcelHandlerConfiguration.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/ExcelHandlerConfiguration.java new file mode 100644 index 0000000..9be6044 --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/ExcelHandlerConfiguration.java @@ -0,0 +1,83 @@ +package com.rax.excel; + +import com.alibaba.excel.converters.Converter; +import com.rax.excel.aop.ResponseExcelReturnValueHandler; +import com.rax.excel.config.ExcelConfigProperties; +import com.rax.excel.enhance.DefaultWriterBuilderEnhancer; +import com.rax.excel.enhance.WriterBuilderEnhancer; +import com.rax.excel.handler.ManySheetWriteHandler; +import com.rax.excel.handler.SheetWriteHandler; +import com.rax.excel.handler.SingleSheetWriteHandler; +import com.rax.excel.head.I18nHeaderCellWriteHandler; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.ObjectProvider; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.context.MessageSource; +import org.springframework.context.annotation.Bean; + +import java.util.List; + +/** + * @author Hccake 2020/10/28 + * @version 1.0 + */ +@RequiredArgsConstructor +public class ExcelHandlerConfiguration { + + private final ExcelConfigProperties configProperties; + + private final ObjectProvider>> converterProvider; + + /** + * ExcelBuild增强 + * @return DefaultWriterBuilderEnhancer 默认什么也不做的增强器 + */ + @Bean + @ConditionalOnMissingBean + public WriterBuilderEnhancer writerBuilderEnhancer() { + return new DefaultWriterBuilderEnhancer(); + } + + /** + * 单sheet 写入处理器 + */ + @Bean + @ConditionalOnMissingBean + public SingleSheetWriteHandler singleSheetWriteHandler() { + return new SingleSheetWriteHandler(configProperties, converterProvider, writerBuilderEnhancer()); + } + + /** + * 多sheet 写入处理器 + */ + @Bean + @ConditionalOnMissingBean + public ManySheetWriteHandler manySheetWriteHandler() { + return new ManySheetWriteHandler(configProperties, converterProvider, writerBuilderEnhancer()); + } + + /** + * 返回Excel文件的 response 处理器 + * @param sheetWriteHandlerList 页签写入处理器集合 + * @return ResponseExcelReturnValueHandler + */ + @Bean + @ConditionalOnMissingBean + public ResponseExcelReturnValueHandler responseExcelReturnValueHandler( + List sheetWriteHandlerList) { + return new ResponseExcelReturnValueHandler(sheetWriteHandlerList); + } + + /** + * excel 头的国际化处理器 + * @param messageSource 国际化源 + */ + @Bean + @ConditionalOnBean(MessageSource.class) + @ConditionalOnMissingBean + public I18nHeaderCellWriteHandler i18nHeaderCellWriteHandler(MessageSource messageSource) { + return new I18nHeaderCellWriteHandler(messageSource); + } + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/ResponseExcelAutoConfiguration.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/ResponseExcelAutoConfiguration.java new file mode 100644 index 0000000..a57629a --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/ResponseExcelAutoConfiguration.java @@ -0,0 +1,87 @@ +package com.rax.excel; + +import com.rax.excel.aop.DynamicNameAspect; +import com.rax.excel.aop.RequestExcelArgumentResolver; +import com.rax.excel.aop.ResponseExcelReturnValueHandler; +import com.rax.excel.config.ExcelConfigProperties; +import com.rax.excel.processor.NameProcessor; +import com.rax.excel.processor.NameSpelExpressionProcessor; +import jakarta.annotation.PostConstruct; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Import; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.method.support.HandlerMethodReturnValueHandler; +import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author lengleng + * @date 2020/3/29 + *

    + * 配置初始化 + */ +@AutoConfiguration +@RequiredArgsConstructor +@Import(ExcelHandlerConfiguration.class) +@EnableConfigurationProperties(ExcelConfigProperties.class) +public class ResponseExcelAutoConfiguration { + + private final RequestMappingHandlerAdapter requestMappingHandlerAdapter; + + private final ResponseExcelReturnValueHandler responseExcelReturnValueHandler; + + /** + * SPEL 解析处理器 + * @return NameProcessor excel名称解析器 + */ + @Bean + @ConditionalOnMissingBean + public NameProcessor nameProcessor() { + return new NameSpelExpressionProcessor(); + } + + /** + * Excel名称解析处理切面 + * @param nameProcessor SPEL 解析处理器 + * @return DynamicNameAspect + */ + @Bean + @ConditionalOnMissingBean + public DynamicNameAspect dynamicNameAspect(NameProcessor nameProcessor) { + return new DynamicNameAspect(nameProcessor); + } + + /** + * 追加 Excel返回值处理器 到 springmvc 中 + */ + @PostConstruct + public void setReturnValueHandlers() { + List returnValueHandlers = requestMappingHandlerAdapter + .getReturnValueHandlers(); + + List newHandlers = new ArrayList<>(); + newHandlers.add(responseExcelReturnValueHandler); + assert returnValueHandlers != null; + newHandlers.addAll(returnValueHandlers); + requestMappingHandlerAdapter.setReturnValueHandlers(newHandlers); + } + + /** + * 追加 Excel 请求处理器 到 springmvc 中 + */ + @PostConstruct + public void setRequestExcelArgumentResolver() { + List argumentResolvers = requestMappingHandlerAdapter.getArgumentResolvers(); + List resolverList = new ArrayList<>(); + resolverList.add(new RequestExcelArgumentResolver()); + resolverList.addAll(argumentResolvers); + requestMappingHandlerAdapter.setArgumentResolvers(resolverList); + } + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/annotation/ExcelLine.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/annotation/ExcelLine.java new file mode 100644 index 0000000..2fa9bd7 --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/annotation/ExcelLine.java @@ -0,0 +1,10 @@ +package com.rax.excel.annotation; + +import java.lang.annotation.*; + +@Documented +@Target({ ElementType.FIELD }) +@Retention(RetentionPolicy.RUNTIME) +public @interface ExcelLine { + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/annotation/RequestExcel.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/annotation/RequestExcel.java new file mode 100644 index 0000000..ab91267 --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/annotation/RequestExcel.java @@ -0,0 +1,43 @@ +package com.rax.excel.annotation; + +import com.rax.excel.handler.DefaultAnalysisEventListener; +import com.rax.excel.handler.ListAnalysisEventListener; + +import java.lang.annotation.*; + +/** + * 导入excel + * + * @author lengleng + * @author L.cm + * @date 2021/4/16 + */ +@Documented +@Target({ ElementType.PARAMETER }) +@Retention(RetentionPolicy.RUNTIME) +public @interface RequestExcel { + + /** + * 前端上传字段名称 file + */ + String fileName() default "file"; + + /** + * 读取的监听器类 + * @return readListener + */ + Class> readListener() default DefaultAnalysisEventListener.class; + + /** + * 是否跳过空行 + * @return 默认跳过 + */ + boolean ignoreEmptyRow() default false; + + /** + * 读取的标题行数 + * @return + */ + int headRowNumber() default 1; + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/annotation/ResponseExcel.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/annotation/ResponseExcel.java new file mode 100644 index 0000000..f2090c8 --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/annotation/ResponseExcel.java @@ -0,0 +1,98 @@ +package com.rax.excel.annotation; + +import com.alibaba.excel.converters.Converter; +import com.alibaba.excel.support.ExcelTypeEnum; +import com.alibaba.excel.write.handler.WriteHandler; +import com.rax.excel.head.HeadGenerator; + +import java.lang.annotation.*; + +/** + * `@ResponseExcel 注解` + * + * @author lengleng + */ +@Documented +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface ResponseExcel { + + /** + * 文件名称 + * @return string + */ + String name() default ""; + + /** + * 文件类型 （xlsx xls） + * @return string + */ + ExcelTypeEnum suffix() default ExcelTypeEnum.XLSX; + + /** + * 文件密码 + * @return password + */ + String password() default ""; + + /** + * sheet 名称，支持多个 + * @return String[] + */ + Sheet[] sheets() default @Sheet(sheetName = "sheet1"); + + /** + * 内存操作 + * @return + */ + boolean inMemory() default false; + + /** + * excel 模板 + * @return String + */ + String template() default ""; + + /** + * + 包含字段 + * @return String[] + */ + String[] include() default {}; + + /** + * 排除字段 + * @return String[] + */ + String[] exclude() default {}; + + /** + * 拦截器，自定义样式等处理器 + * @return WriteHandler[] + */ + Class[] writeHandler() default {}; + + /** + * 转换器 + * @return Converter[] + */ + Class[] converter() default {}; + + /** + * 自定义Excel头生成器 + * @return HeadGenerator + */ + Class headGenerator() default HeadGenerator.class; + + /** + * excel 头信息国际化 + * @return boolean + */ + boolean i18nHeader() default false; + + /** + * 填充模式 + * @return + */ + boolean fill() default false; + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/annotation/Sheet.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/annotation/Sheet.java new file mode 100644 index 0000000..c7b6a38 --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/annotation/Sheet.java @@ -0,0 +1,41 @@ +package com.rax.excel.annotation; + +import com.rax.excel.head.HeadGenerator; + +import java.lang.annotation.*; + +/** + * @author Yakir + * @Topic Sheet + * @Description + * @date 2021/4/29 15:03 + * @Version 1.0 + */ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface Sheet { + + int sheetNo() default -1; + + /** + * sheet name + */ + String sheetName(); + + /** + * 包含字段 + */ + String[] includes() default {}; + + /** + * 排除字段 + */ + String[] excludes() default {}; + + /** + * 头生成器 + */ + Class headGenerateClass() default HeadGenerator.class; + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/aop/DynamicNameAspect.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/aop/DynamicNameAspect.java new file mode 100644 index 0000000..c9c39be --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/aop/DynamicNameAspect.java @@ -0,0 +1,46 @@ +package com.rax.excel.aop; + +import com.rax.excel.annotation.ResponseExcel; +import com.rax.excel.processor.NameProcessor; +import lombok.RequiredArgsConstructor; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.aspectj.lang.reflect.MethodSignature; +import org.springframework.util.StringUtils; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; + +import java.time.LocalDateTime; +import java.util.Objects; + +/** + * @author lengleng + * @date 2020/3/29 + */ +@Aspect +@RequiredArgsConstructor +public class DynamicNameAspect { + + public static final String EXCEL_NAME_KEY = "__EXCEL_NAME_KEY__"; + + private final NameProcessor processor; + + @Before("@annotation(excel)") + public void around(JoinPoint point, ResponseExcel excel) { + MethodSignature ms = (MethodSignature) point.getSignature(); + + String name = excel.name(); + // 当配置的 excel 名称为空时，取当前时间 + if (!StringUtils.hasText(name)) { + name = LocalDateTime.now().toString(); + } + else { + name = processor.doDetermineName(point.getArgs(), ms.getMethod(), excel.name()); + } + + RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); + Objects.requireNonNull(requestAttributes).setAttribute(EXCEL_NAME_KEY, name, RequestAttributes.SCOPE_REQUEST); + } + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/aop/RequestExcelArgumentResolver.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/aop/RequestExcelArgumentResolver.java new file mode 100644 index 0000000..9390d83 --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/aop/RequestExcelArgumentResolver.java @@ -0,0 +1,90 @@ +package com.rax.excel.aop; + +import com.alibaba.excel.EasyExcel; +import com.rax.excel.annotation.RequestExcel; +import com.rax.excel.converters.LocalDateStringConverter; +import com.rax.excel.converters.LocalDateTimeStringConverter; +import com.rax.excel.handler.ListAnalysisEventListener; +import jakarta.servlet.http.HttpServletRequest; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.core.MethodParameter; +import org.springframework.core.ResolvableType; +import org.springframework.ui.ModelMap; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.WebDataBinder; +import org.springframework.web.bind.support.WebDataBinderFactory; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.method.support.ModelAndViewContainer; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartRequest; + +import java.io.InputStream; +import java.util.List; + +/** + * 上传excel 解析注解 + * + * @author lengleng + * @author L.cm + * @date 2021/4/16 + */ +@Slf4j +public class RequestExcelArgumentResolver implements HandlerMethodArgumentResolver { + + @Override + public boolean supportsParameter(MethodParameter parameter) { + return parameter.hasParameterAnnotation(RequestExcel.class); + } + + @Override + @SneakyThrows(Exception.class) + public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer modelAndViewContainer, + NativeWebRequest webRequest, WebDataBinderFactory webDataBinderFactory) { + Class parameterType = parameter.getParameterType(); + if (!parameterType.isAssignableFrom(List.class)) { + throw new IllegalArgumentException( + "Excel upload request resolver error, @RequestExcel parameter is not List " + parameterType); + } + + // 处理自定义 readListener + RequestExcel requestExcel = parameter.getParameterAnnotation(RequestExcel.class); + assert requestExcel != null; + Class> readListenerClass = requestExcel.readListener(); + ListAnalysisEventListener readListener = BeanUtils.instantiateClass(readListenerClass); + // 获取请求文件流 + HttpServletRequest request = webRequest.getNativeRequest(HttpServletRequest.class); + assert request != null; + InputStream inputStream; + if (request instanceof MultipartRequest) { + MultipartFile file = ((MultipartRequest) request).getFile(requestExcel.fileName()); + assert file != null; + inputStream = file.getInputStream(); + } + else { + inputStream = request.getInputStream(); + } + + // 获取目标类型 + Class excelModelClass = ResolvableType.forMethodParameter(parameter).getGeneric(0).resolve(); + + // 这里需要指定读用哪个 class 去读，然后读取第一个 sheet 文件流会自动关闭 + EasyExcel.read(inputStream, excelModelClass, readListener) + .registerConverter(LocalDateStringConverter.INSTANCE) + .registerConverter(LocalDateTimeStringConverter.INSTANCE) + .ignoreEmptyRow(requestExcel.ignoreEmptyRow()) + .sheet() + .headRowNumber(requestExcel.headRowNumber()) + .doRead(); + + // 校验失败的数据处理 交给 BindResult + WebDataBinder dataBinder = webDataBinderFactory.createBinder(webRequest, readListener.getErrors(), "excel"); + ModelMap model = modelAndViewContainer.getModel(); + model.put(BindingResult.MODEL_KEY_PREFIX + "excel", dataBinder.getBindingResult()); + + return readListener.getList(); + } + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/aop/ResponseExcelReturnValueHandler.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/aop/ResponseExcelReturnValueHandler.java new file mode 100644 index 0000000..b3208d1 --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/aop/ResponseExcelReturnValueHandler.java @@ -0,0 +1,60 @@ +package com.rax.excel.aop; + +import com.rax.excel.annotation.ResponseExcel; +import com.rax.excel.handler.SheetWriteHandler; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.core.MethodParameter; +import org.springframework.util.Assert; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.method.support.HandlerMethodReturnValueHandler; +import org.springframework.web.method.support.ModelAndViewContainer; + +import jakarta.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 处理@ResponseExcel 返回值 + * + * @author lengleng + */ +@Slf4j +@RequiredArgsConstructor +public class ResponseExcelReturnValueHandler implements HandlerMethodReturnValueHandler { + + private final List sheetWriteHandlerList; + + /** + * 只处理@ResponseExcel 声明的方法 + * @param parameter 方法签名 + * @return 是否处理 + */ + @Override + public boolean supportsReturnType(MethodParameter parameter) { + return parameter.getMethodAnnotation(ResponseExcel.class) != null; + } + + /** + * 处理逻辑 + * @param o 返回参数 + * @param parameter 方法签名 + * @param mavContainer 上下文容器 + * @param nativeWebRequest 上下文 + */ + @Override + public void handleReturnValue(Object o, MethodParameter parameter, ModelAndViewContainer mavContainer, + NativeWebRequest nativeWebRequest) { + /* check */ + HttpServletResponse response = nativeWebRequest.getNativeResponse(HttpServletResponse.class); + Assert.state(response != null, "No HttpServletResponse"); + ResponseExcel responseExcel = parameter.getMethodAnnotation(ResponseExcel.class); + Assert.state(responseExcel != null, "No @ResponseExcel"); + mavContainer.setRequestHandled(true); + + sheetWriteHandlerList.stream() + .filter(handler -> handler.support(o)) + .findFirst() + .ifPresent(handler -> handler.export(o, response, responseExcel)); + } + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/config/ExcelConfigProperties.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/config/ExcelConfigProperties.java new file mode 100644 index 0000000..f890f4b --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/config/ExcelConfigProperties.java @@ -0,0 +1,21 @@ +package com.rax.excel.config; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * @author lengleng + * @date 2020/3/29 + */ +@Data +@ConfigurationProperties(prefix = ExcelConfigProperties.PREFIX) +public class ExcelConfigProperties { + + static final String PREFIX = "excel"; + + /** + * 模板路径 + */ + private String templatePath = "excel"; + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/converters/LocalDateStringConverter.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/converters/LocalDateStringConverter.java new file mode 100644 index 0000000..9880db5 --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/converters/LocalDateStringConverter.java @@ -0,0 +1,62 @@ +package com.rax.excel.converters; + +import com.alibaba.excel.converters.Converter; +import com.alibaba.excel.enums.CellDataTypeEnum; +import com.alibaba.excel.metadata.GlobalConfiguration; +import com.alibaba.excel.metadata.data.ReadCellData; +import com.alibaba.excel.metadata.data.WriteCellData; +import com.alibaba.excel.metadata.property.ExcelContentProperty; + +import java.text.ParseException; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + +/** + * LocalDate and string converter + * + * @author L.cm + */ +public enum LocalDateStringConverter implements Converter { + + /** + * 实例 + */ + INSTANCE; + + @Override + public Class supportJavaTypeKey() { + return LocalDate.class; + } + + @Override + public CellDataTypeEnum supportExcelTypeKey() { + return CellDataTypeEnum.STRING; + } + + @Override + public LocalDate convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty, + GlobalConfiguration globalConfiguration) throws ParseException { + if (contentProperty == null || contentProperty.getDateTimeFormatProperty() == null) { + return LocalDate.parse(cellData.getStringValue()); + } + else { + DateTimeFormatter formatter = DateTimeFormatter + .ofPattern(contentProperty.getDateTimeFormatProperty().getFormat()); + return LocalDate.parse(cellData.getStringValue(), formatter); + } + } + + @Override + public WriteCellData convertToExcelData(LocalDate value, ExcelContentProperty contentProperty, + GlobalConfiguration globalConfiguration) { + DateTimeFormatter formatter; + if (contentProperty == null || contentProperty.getDateTimeFormatProperty() == null) { + formatter = DateTimeFormatter.ISO_LOCAL_DATE; + } + else { + formatter = DateTimeFormatter.ofPattern(contentProperty.getDateTimeFormatProperty().getFormat()); + } + return new WriteCellData<>(value.format(formatter)); + } + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/converters/LocalDateTimeStringConverter.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/converters/LocalDateTimeStringConverter.java new file mode 100644 index 0000000..94c498d --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/converters/LocalDateTimeStringConverter.java @@ -0,0 +1,94 @@ +package com.rax.excel.converters; + +import com.alibaba.excel.converters.Converter; +import com.alibaba.excel.enums.CellDataTypeEnum; +import com.alibaba.excel.metadata.GlobalConfiguration; +import com.alibaba.excel.metadata.data.ReadCellData; +import com.alibaba.excel.metadata.data.WriteCellData; +import com.alibaba.excel.metadata.property.ExcelContentProperty; +import com.alibaba.excel.util.DateUtils; + +import java.text.ParseException; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; + +/** + * LocalDateTime and string converter + * + * @author L.cm + */ +public enum LocalDateTimeStringConverter implements Converter { + + /** + * 实例 + */ + INSTANCE; + + private static final String MINUS = "-"; + + @Override + public Class supportJavaTypeKey() { + return LocalDateTime.class; + } + + @Override + public CellDataTypeEnum supportExcelTypeKey() { + return CellDataTypeEnum.STRING; + } + + @Override + public LocalDateTime convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty, + GlobalConfiguration globalConfiguration) throws ParseException { + String stringValue = cellData.getStringValue(); + String pattern; + if (contentProperty == null || contentProperty.getDateTimeFormatProperty() == null) { + pattern = switchDateFormat(stringValue); + } + else { + pattern = contentProperty.getDateTimeFormatProperty().getFormat(); + } + DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern); + return LocalDateTime.parse(cellData.getStringValue(), formatter); + } + + @Override + public WriteCellData convertToExcelData(LocalDateTime value, ExcelContentProperty contentProperty, + GlobalConfiguration globalConfiguration) { + String pattern; + if (contentProperty == null || contentProperty.getDateTimeFormatProperty() == null) { + pattern = DateUtils.DATE_FORMAT_19; + } + else { + pattern = contentProperty.getDateTimeFormatProperty().getFormat(); + } + DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern); + return new WriteCellData<>(value.format(formatter)); + } + + /** + * switch date format + * @param dateString dateString + * @return pattern + */ + private static String switchDateFormat(String dateString) { + int length = dateString.length(); + switch (length) { + case 19: + if (dateString.contains(MINUS)) { + return DateUtils.DATE_FORMAT_19; + } + else { + return DateUtils.DATE_FORMAT_19_FORWARD_SLASH; + } + case 17: + return DateUtils.DATE_FORMAT_17; + case 14: + return DateUtils.DATE_FORMAT_14; + case 10: + return DateUtils.DATE_FORMAT_10; + default: + throw new IllegalArgumentException("can not find date format for：" + dateString); + } + } + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/enhance/DefaultWriterBuilderEnhancer.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/enhance/DefaultWriterBuilderEnhancer.java new file mode 100644 index 0000000..7c1e958 --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/enhance/DefaultWriterBuilderEnhancer.java @@ -0,0 +1,48 @@ +package com.rax.excel.enhance; + +import com.alibaba.excel.write.builder.ExcelWriterBuilder; +import com.alibaba.excel.write.builder.ExcelWriterSheetBuilder; +import com.rax.excel.annotation.ResponseExcel; +import com.rax.excel.head.HeadGenerator; + +import jakarta.servlet.http.HttpServletResponse; + +/** + * @author Hccake 2020/12/18 + * @version 1.0 + */ +public class DefaultWriterBuilderEnhancer implements WriterBuilderEnhancer { + + /** + * ExcelWriterBuilder 增强 + * @param writerBuilder ExcelWriterBuilder + * @param response HttpServletResponse + * @param responseExcel ResponseExcel + * @param templatePath 模板地址 + * @return ExcelWriterBuilder + */ + @Override + public ExcelWriterBuilder enhanceExcel(ExcelWriterBuilder writerBuilder, HttpServletResponse response, + ResponseExcel responseExcel, String templatePath) { + // doNothing + return writerBuilder; + } + + /** + * ExcelWriterSheetBuilder 增强 + * @param writerSheetBuilder ExcelWriterSheetBuilder + * @param sheetNo sheet角标 + * @param sheetName sheet名，有模板时为空 + * @param dataClass 当前写入的数据所属类 + * @param template 模板文件 + * @param headEnhancerClass 当前指定的自定义头处理器 + * @return ExcelWriterSheetBuilder + */ + @Override + public ExcelWriterSheetBuilder enhanceSheet(ExcelWriterSheetBuilder writerSheetBuilder, Integer sheetNo, + String sheetName, Class dataClass, String template, Class headEnhancerClass) { + // doNothing + return writerSheetBuilder; + } + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/enhance/WriterBuilderEnhancer.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/enhance/WriterBuilderEnhancer.java new file mode 100644 index 0000000..5bea120 --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/enhance/WriterBuilderEnhancer.java @@ -0,0 +1,41 @@ +package com.rax.excel.enhance; + +import com.alibaba.excel.write.builder.ExcelWriterBuilder; +import com.alibaba.excel.write.builder.ExcelWriterSheetBuilder; +import com.rax.excel.annotation.ResponseExcel; +import com.rax.excel.head.HeadGenerator; +import jakarta.servlet.http.HttpServletResponse; + +/** + * ExcelWriterBuilder 增强 + * + * @author Hccake 2020/12/18 + * @version 1.0 + */ +public interface WriterBuilderEnhancer { + + /** + * ExcelWriterBuilder 增强 + * @param writerBuilder ExcelWriterBuilder + * @param response HttpServletResponse + * @param responseExcel ResponseExcel + * @param templatePath 模板地址 + * @return ExcelWriterBuilder + */ + ExcelWriterBuilder enhanceExcel(ExcelWriterBuilder writerBuilder, HttpServletResponse response, + ResponseExcel responseExcel, String templatePath); + + /** + * ExcelWriterSheetBuilder 增强 + * @param writerSheetBuilder ExcelWriterSheetBuilder + * @param sheetNo sheet角标 + * @param sheetName sheet名，有模板时为空 + * @param dataClass 当前写入的数据所属类 + * @param template 模板文件 + * @param headEnhancerClass 当前指定的自定义头处理器 + * @return ExcelWriterSheetBuilder + */ + ExcelWriterSheetBuilder enhanceSheet(ExcelWriterSheetBuilder writerSheetBuilder, Integer sheetNo, String sheetName, + Class dataClass, String template, Class headEnhancerClass); + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/handler/AbstractSheetWriteHandler.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/handler/AbstractSheetWriteHandler.java new file mode 100644 index 0000000..7d94194 --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/handler/AbstractSheetWriteHandler.java @@ -0,0 +1,237 @@ +package com.rax.excel.handler; + +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.converters.Converter; +import com.alibaba.excel.write.builder.ExcelWriterBuilder; +import com.alibaba.excel.write.builder.ExcelWriterSheetBuilder; +import com.alibaba.excel.write.handler.WriteHandler; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.rax.excel.annotation.ResponseExcel; +import com.rax.excel.annotation.Sheet; +import com.rax.excel.aop.DynamicNameAspect; +import com.rax.excel.config.ExcelConfigProperties; +import com.rax.excel.converters.LocalDateStringConverter; +import com.rax.excel.converters.LocalDateTimeStringConverter; +import com.rax.excel.enhance.WriterBuilderEnhancer; +import com.rax.excel.head.HeadGenerator; +import com.rax.excel.head.HeadMeta; +import com.rax.excel.head.I18nHeaderCellWriteHandler; +import com.rax.excel.kit.ExcelException; +import jakarta.servlet.http.HttpServletResponse; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import lombok.Setter; +import lombok.SneakyThrows; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.ObjectProvider; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.core.io.ClassPathResource; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.http.MediaTypeFactory; +import org.springframework.util.Assert; +import org.springframework.util.StringUtils; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.lang.reflect.Modifier; +import java.net.URLEncoder; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.UUID; + +/** + * @author lengleng + * @author L.cm + * @date 2020/3/31 + */ +@RequiredArgsConstructor +public abstract class AbstractSheetWriteHandler implements SheetWriteHandler, ApplicationContextAware { + + private final ExcelConfigProperties configProperties; + + private final ObjectProvider>> converterProvider; + + private final WriterBuilderEnhancer excelWriterBuilderEnhance; + + private ApplicationContext applicationContext; + + @Getter + @Setter + @Autowired(required = false) + private I18nHeaderCellWriteHandler i18nHeaderCellWriteHandler; + + @Override + public void check(ResponseExcel responseExcel) { + if (responseExcel.sheets().length == 0) { + throw new ExcelException("@ResponseExcel sheet 配置不合法"); + } + } + + @Override + @SneakyThrows(UnsupportedEncodingException.class) + public void export(Object o, HttpServletResponse response, ResponseExcel responseExcel) { + check(responseExcel); + RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); + String name = (String) Objects.requireNonNull(requestAttributes) + .getAttribute(DynamicNameAspect.EXCEL_NAME_KEY, RequestAttributes.SCOPE_REQUEST); + if (name == null) { + name = UUID.randomUUID().toString(); + } + String fileName = String.format("%s%s", URLEncoder.encode(name, "UTF-8"), responseExcel.suffix().getValue()); + // 根据实际的文件类型找到对应的 contentType + String contentType = MediaTypeFactory.getMediaType(fileName) + .map(MediaType::toString) + .orElse("application/vnd.ms-excel"); + response.setContentType(contentType); + response.setHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, HttpHeaders.CONTENT_DISPOSITION); + response.setCharacterEncoding("utf-8"); + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename*=utf-8''" + fileName); + write(o, response, responseExcel); + } + + /** + * 通用的获取ExcelWriter方法 + * @param response HttpServletResponse + * @param responseExcel ResponseExcel注解 + * @return ExcelWriter + */ + @SneakyThrows(IOException.class) + public ExcelWriter getExcelWriter(HttpServletResponse response, ResponseExcel responseExcel) { + ExcelWriterBuilder writerBuilder = EasyExcel.write(response.getOutputStream()) + .registerConverter(LocalDateStringConverter.INSTANCE) + .registerConverter(LocalDateTimeStringConverter.INSTANCE) + .autoCloseStream(true) + .excelType(responseExcel.suffix()) + .inMemory(responseExcel.inMemory()); + + if (StringUtils.hasText(responseExcel.password())) { + writerBuilder.password(responseExcel.password()); + } + + if (responseExcel.include().length != 0) { + writerBuilder.includeColumnFieldNames(Arrays.asList(responseExcel.include())); + } + + if (responseExcel.exclude().length != 0) { + writerBuilder.excludeColumnFieldNames(Arrays.asList(responseExcel.exclude())); + } + + for (Class clazz : responseExcel.writeHandler()) { + writerBuilder.registerWriteHandler(BeanUtils.instantiateClass(clazz)); + } + + // 开启国际化头信息处理 + if (responseExcel.i18nHeader() && i18nHeaderCellWriteHandler != null) { + writerBuilder.registerWriteHandler(i18nHeaderCellWriteHandler); + } + + // 自定义注入的转换器 + registerCustomConverter(writerBuilder); + + for (Class clazz : responseExcel.converter()) { + writerBuilder.registerConverter(BeanUtils.instantiateClass(clazz)); + } + + String templatePath = configProperties.getTemplatePath(); + if (StringUtils.hasText(responseExcel.template())) { + ClassPathResource classPathResource = new ClassPathResource( + templatePath + File.separator + responseExcel.template()); + InputStream inputStream = classPathResource.getInputStream(); + writerBuilder.withTemplate(inputStream); + } + + writerBuilder = excelWriterBuilderEnhance.enhanceExcel(writerBuilder, response, responseExcel, templatePath); + + return writerBuilder.build(); + } + + /** + * 自定义注入转换器 如果有需要，子类自己重写 + * @param builder ExcelWriterBuilder + */ + public void registerCustomConverter(ExcelWriterBuilder builder) { + converterProvider.ifAvailable(converters -> converters.forEach(builder::registerConverter)); + } + + /** + * 获取 WriteSheet 对象 + * @param sheet sheet annotation info + * @param dataClass 数据类型 + * @param template 模板 + * @param bookHeadEnhancerClass 自定义头处理器 + * @return WriteSheet + */ + public WriteSheet sheet(Sheet sheet, Class dataClass, String template, + Class bookHeadEnhancerClass) { + + // Sheet 编号和名称 + Integer sheetNo = sheet.sheetNo() >= 0 ? sheet.sheetNo() : null; + String sheetName = sheet.sheetName(); + + // 是否模板写入 + ExcelWriterSheetBuilder writerSheetBuilder = StringUtils.hasText(template) ? EasyExcel.writerSheet(sheetNo) + : EasyExcel.writerSheet(sheetNo, sheetName); + + // 头信息增强 1. 优先使用 sheet 指定的头信息增强 2. 其次使用 @ResponseExcel 中定义的全局头信息增强 + Class headGenerateClass = null; + if (isNotInterface(sheet.headGenerateClass())) { + headGenerateClass = sheet.headGenerateClass(); + } + else if (isNotInterface(bookHeadEnhancerClass)) { + headGenerateClass = bookHeadEnhancerClass; + } + // 定义头信息增强则使用其生成头信息，否则使用 dataClass 来自动获取 + if (headGenerateClass != null) { + fillCustomHeadInfo(dataClass, bookHeadEnhancerClass, writerSheetBuilder); + } + else if (dataClass != null) { + writerSheetBuilder.head(dataClass); + if (sheet.excludes().length > 0) { + writerSheetBuilder.excludeColumnFieldNames(Arrays.asList(sheet.excludes())); + } + if (sheet.includes().length > 0) { + writerSheetBuilder.includeColumnFieldNames(Arrays.asList(sheet.includes())); + } + } + + // sheetBuilder 增强 + writerSheetBuilder = excelWriterBuilderEnhance.enhanceSheet(writerSheetBuilder, sheetNo, sheetName, dataClass, + template, headGenerateClass); + + return writerSheetBuilder.build(); + } + + private void fillCustomHeadInfo(Class dataClass, Class headEnhancerClass, + ExcelWriterSheetBuilder writerSheetBuilder) { + HeadGenerator headGenerator = this.applicationContext.getBean(headEnhancerClass); + Assert.notNull(headGenerator, "The header generated bean does not exist."); + HeadMeta head = headGenerator.head(dataClass); + writerSheetBuilder.head(head.getHead()); + writerSheetBuilder.excludeColumnFieldNames(head.getIgnoreHeadFields()); + } + + /** + * 是否为Null Head Generator + * @param headGeneratorClass 头生成器类型 + * @return true 已指定 false 未指定(默认值) + */ + private boolean isNotInterface(Class headGeneratorClass) { + return !Modifier.isInterface(headGeneratorClass.getModifiers()); + } + + @Override + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { + this.applicationContext = applicationContext; + } + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/handler/DefaultAnalysisEventListener.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/handler/DefaultAnalysisEventListener.java new file mode 100644 index 0000000..db605e9 --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/handler/DefaultAnalysisEventListener.java @@ -0,0 +1,75 @@ +package com.rax.excel.handler; + +import com.alibaba.excel.context.AnalysisContext; +import com.rax.excel.annotation.ExcelLine; +import com.rax.excel.kit.Validators; +import com.rax.excel.vo.ErrorMessage; +import jakarta.validation.ConstraintViolation; +import lombok.extern.slf4j.Slf4j; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * 默认的 AnalysisEventListener + * + * @author lengleng + * @author L.cm + * @date 2021/4/16 + */ +@Slf4j +public class DefaultAnalysisEventListener extends ListAnalysisEventListener { + + private final List list = new ArrayList<>(); + + private final List errorMessageList = new ArrayList<>(); + + private Long lineNum = 1L; + + @Override + public void invoke(Object o, AnalysisContext analysisContext) { + lineNum++; + + Set> violations = Validators.validate(o); + if (!violations.isEmpty()) { + Set messageSet = violations.stream() + .map(ConstraintViolation::getMessage) + .collect(Collectors.toSet()); + errorMessageList.add(new ErrorMessage(lineNum, messageSet)); + } + else { + Field[] fields = o.getClass().getDeclaredFields(); + for (Field field : fields) { + if (field.isAnnotationPresent(ExcelLine.class) && field.getType() == Long.class) { + try { + field.setAccessible(true); + field.set(o, lineNum); + } + catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + } + list.add(o); + } + } + + @Override + public void doAfterAllAnalysed(AnalysisContext analysisContext) { + log.debug("Excel read analysed"); + } + + @Override + public List getList() { + return list; + } + + @Override + public List getErrors() { + return errorMessageList; + } + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/handler/ListAnalysisEventListener.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/handler/ListAnalysisEventListener.java new file mode 100644 index 0000000..c9cefb4 --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/handler/ListAnalysisEventListener.java @@ -0,0 +1,27 @@ +package com.rax.excel.handler; + +import com.alibaba.excel.event.AnalysisEventListener; +import com.rax.excel.vo.ErrorMessage; + +import java.util.List; + +/** + * list analysis EventListener + * + * @author L.cm + */ +public abstract class ListAnalysisEventListener extends AnalysisEventListener { + + /** + * 获取 excel 解析的对象列表 + * @return 集合 + */ + public abstract List getList(); + + /** + * 获取异常校验结果 + * @return 集合 + */ + public abstract List getErrors(); + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/handler/ManySheetWriteHandler.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/handler/ManySheetWriteHandler.java new file mode 100644 index 0000000..2a85025 --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/handler/ManySheetWriteHandler.java @@ -0,0 +1,78 @@ +package com.rax.excel.handler; + +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.converters.Converter; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.rax.excel.annotation.ResponseExcel; +import com.rax.excel.annotation.Sheet; +import com.rax.excel.config.ExcelConfigProperties; +import com.rax.excel.enhance.WriterBuilderEnhancer; +import com.rax.excel.kit.ExcelException; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.ObjectProvider; +import org.springframework.util.CollectionUtils; + +import java.util.List; + +/** + * @author lengleng + * @author L.cm + * @date 2020/3/29 + */ +public class ManySheetWriteHandler extends AbstractSheetWriteHandler { + + public ManySheetWriteHandler(ExcelConfigProperties configProperties, + ObjectProvider>> converterProvider, WriterBuilderEnhancer excelWriterBuilderEnhance) { + super(configProperties, converterProvider, excelWriterBuilderEnhance); + } + + /** + * 当且仅当List不为空且List中的元素也是List 才返回true + * @param obj 返回对象 + * @return boolean + */ + @Override + public boolean support(Object obj) { + if (obj instanceof List) { + List objList = (List) obj; + return !objList.isEmpty() && objList.get(0) instanceof List; + } + else { + throw new ExcelException("@ResponseExcel 返回值必须为List类型"); + } + } + + @Override + public void write(Object obj, HttpServletResponse response, ResponseExcel responseExcel) { + List objList = (List) obj; + ExcelWriter excelWriter = getExcelWriter(response, responseExcel); + + Sheet[] sheets = responseExcel.sheets(); + WriteSheet sheet; + for (int i = 0; i < sheets.length; i++) { + List eleList = (List) objList.get(i); + + if (CollectionUtils.isEmpty(eleList)) { + sheet = EasyExcel.writerSheet(responseExcel.sheets()[i].sheetName()).build(); + } + else { + // 有模板则不指定sheet名 + Class dataClass = eleList.get(0).getClass(); + sheet = this.sheet(responseExcel.sheets()[i], dataClass, responseExcel.template(), + responseExcel.headGenerator()); + } + + // 填充 sheet + if (responseExcel.fill()) { + excelWriter.fill(eleList, sheet); + } + else { + // 写入sheet + excelWriter.write(eleList, sheet); + } + } + excelWriter.finish(); + } + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/handler/SheetWriteHandler.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/handler/SheetWriteHandler.java new file mode 100644 index 0000000..09d8632 --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/handler/SheetWriteHandler.java @@ -0,0 +1,44 @@ +package com.rax.excel.handler; + +import com.rax.excel.annotation.ResponseExcel; + +import jakarta.servlet.http.HttpServletResponse; + +/** + * @author lengleng + * @date 2020/3/29 + *

    + * sheet 写出处理器 + */ +public interface SheetWriteHandler { + + /** + * 是否支持 + * @param obj + * @return + */ + boolean support(Object obj); + + /** + * 校验 + * @param responseExcel 注解 + */ + void check(ResponseExcel responseExcel); + + /** + * 返回的对象 + * @param o obj + * @param response 输出对象 + * @param responseExcel 注解 + */ + void export(Object o, HttpServletResponse response, ResponseExcel responseExcel); + + /** + * 写成对象 + * @param o obj + * @param response 输出对象 + * @param responseExcel 注解 + */ + void write(Object o, HttpServletResponse response, ResponseExcel responseExcel); + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/handler/SingleSheetWriteHandler.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/handler/SingleSheetWriteHandler.java new file mode 100644 index 0000000..ecbdccf --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/handler/SingleSheetWriteHandler.java @@ -0,0 +1,74 @@ +package com.rax.excel.handler; + +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.converters.Converter; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.rax.excel.annotation.ResponseExcel; +import com.rax.excel.config.ExcelConfigProperties; +import com.rax.excel.enhance.WriterBuilderEnhancer; +import com.rax.excel.kit.ExcelException; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.ObjectProvider; +import org.springframework.util.CollectionUtils; + +import java.util.List; + +/** + * @author lengleng + * @author L.cm + * @date 2020/3/29 + *

    + * 处理单sheet 页面 + */ +public class SingleSheetWriteHandler extends AbstractSheetWriteHandler { + + public SingleSheetWriteHandler(ExcelConfigProperties configProperties, + ObjectProvider>> converterProvider, WriterBuilderEnhancer excelWriterBuilderEnhance) { + super(configProperties, converterProvider, excelWriterBuilderEnhance); + } + + /** + * obj 是List 且list不为空同时list中的元素不是是List 才返回true + * @param obj 返回对象 + * @return boolean + */ + @Override + public boolean support(Object obj) { + if (obj instanceof List) { + List objList = (List) obj; + return !objList.isEmpty() && !(objList.get(0) instanceof List); + } + else { + throw new ExcelException("@ResponseExcel 返回值必须为List类型"); + } + } + + @Override + public void write(Object obj, HttpServletResponse response, ResponseExcel responseExcel) { + List eleList = (List) obj; + ExcelWriter excelWriter = getExcelWriter(response, responseExcel); + + WriteSheet sheet; + if (CollectionUtils.isEmpty(eleList)) { + sheet = EasyExcel.writerSheet(responseExcel.sheets()[0].sheetName()).build(); + } + else { + // 有模板则不指定sheet名 + Class dataClass = eleList.get(0).getClass(); + sheet = this.sheet(responseExcel.sheets()[0], dataClass, responseExcel.template(), + responseExcel.headGenerator()); + } + + // 填充 sheet + if (responseExcel.fill()) { + excelWriter.fill(eleList, sheet); + } + else { + // 写入sheet + excelWriter.write(eleList, sheet); + } + excelWriter.finish(); + } + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/head/HeadGenerator.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/head/HeadGenerator.java new file mode 100644 index 0000000..cd68707 --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/head/HeadGenerator.java @@ -0,0 +1,22 @@ +package com.rax.excel.head; + +/** + * Excel头生成器，用于自定义生成头部信息 + * + * @author Hccake 2020/10/27 + * @version 1.0 + */ +public interface HeadGenerator { + + /** + *

    + * 自定义头部信息 + *

    + * 实现类根据数据的class信息，定制Excel头
    + * 具体方法使用参考：https://www.yuque.com/easyexcel/doc/write#b4b9de00 + * @param clazz 当前sheet的数据类型 + * @return List> Head头信息 + */ + HeadMeta head(Class clazz); + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/head/HeadMeta.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/head/HeadMeta.java new file mode 100644 index 0000000..7d221eb --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/head/HeadMeta.java @@ -0,0 +1,29 @@ +package com.rax.excel.head; + +import lombok.Data; + +import java.util.List; +import java.util.Set; + +/** + * @author Yakir + * @date 2021/4/26 10:58 + */ +@Data +public class HeadMeta { + + /** + *

    + * 自定义头部信息 + *

    + * 实现类根据数据的class信息，定制Excel头
    + * 具体方法使用参考：https://www.yuque.com/easyexcel/doc/write#b4b9de00 + */ + private List> head; + + /** + * 忽略头对应字段名称 + */ + private Set ignoreHeadFields; + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/head/I18nHeaderCellWriteHandler.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/head/I18nHeaderCellWriteHandler.java new file mode 100644 index 0000000..cb598ea --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/head/I18nHeaderCellWriteHandler.java @@ -0,0 +1,61 @@ +package com.rax.excel.head; + +import com.alibaba.excel.metadata.Head; +import com.alibaba.excel.write.handler.CellWriteHandler; +import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; +import com.alibaba.excel.write.metadata.holder.WriteTableHolder; +import lombok.RequiredArgsConstructor; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.poi.ss.usermodel.Row; +import org.springframework.context.MessageSource; +import org.springframework.context.i18n.LocaleContextHolder; +import org.springframework.util.PropertyPlaceholderHelper; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * 对表头进行国际化处理 + * + * @author hccake + */ +@RequiredArgsConstructor +public class I18nHeaderCellWriteHandler implements CellWriteHandler { + + /** + * 国际化消息源 + */ + private final MessageSource messageSource; + + /** + * 国际化翻译 + */ + private final PropertyPlaceholderHelper.PlaceholderResolver placeholderResolver; + + public I18nHeaderCellWriteHandler(MessageSource messageSource) { + this.messageSource = messageSource; + this.placeholderResolver = placeholderName -> this.messageSource.getMessage(placeholderName, null, + LocaleContextHolder.getLocale()); + } + + /** + * 占位符处理 + */ + private final PropertyPlaceholderHelper propertyPlaceholderHelper = new PropertyPlaceholderHelper("{", "}"); + + @Override + public void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row, + Head head, Integer columnIndex, Integer relativeRowIndex, Boolean isHead) { + if (isHead != null && isHead) { + List originHeadNameList = head.getHeadNameList(); + if (CollectionUtils.isNotEmpty(originHeadNameList)) { + // 国际化处理 + List i18nHeadNames = originHeadNameList.stream() + .map(headName -> propertyPlaceholderHelper.replacePlaceholders(headName, placeholderResolver)) + .collect(Collectors.toList()); + head.setHeadNameList(i18nHeadNames); + } + } + } + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/kit/ExcelException.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/kit/ExcelException.java new file mode 100644 index 0000000..2d1a090 --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/kit/ExcelException.java @@ -0,0 +1,15 @@ +package com.rax.excel.kit; + +/** + * @author lengleng + * @date 2020/3/31 + */ +public class ExcelException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + public ExcelException(String message) { + super(message); + } + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/kit/Validators.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/kit/Validators.java new file mode 100644 index 0000000..9ee4592 --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/kit/Validators.java @@ -0,0 +1,41 @@ +package com.rax.excel.kit; + +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; + +import java.util.Set; + +/** + * 校验工具 + * + * @author L.cm + */ +public final class Validators { + + private Validators() { + } + + private static final Validator VALIDATOR; + + static { + ValidatorFactory factory = Validation.buildDefaultValidatorFactory(); + VALIDATOR = factory.getValidator(); + } + + /** + * Validates all constraints on {@code object}. + * @param object object to validate + * @param the type of the object to validate + * @return constraint violations or an empty set if none + * @throws IllegalArgumentException if object is {@code null} or if {@code null} is + * passed to the varargs groups + * @throws ValidationException if a non recoverable error happens during the + * validation process + */ + public static Set> validate(T object) { + return VALIDATOR.validate(object); + } + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/processor/NameProcessor.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/processor/NameProcessor.java new file mode 100644 index 0000000..2cf477b --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/processor/NameProcessor.java @@ -0,0 +1,20 @@ +package com.rax.excel.processor; + +import java.lang.reflect.Method; + +/** + * @author lengleng + * @date 2020/3/29 + */ +public interface NameProcessor { + + /** + * 解析名称 + * @param args 拦截器对象 + * @param method + * @param key 表达式 + * @return + */ + String doDetermineName(Object[] args, Method method, String key); + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/processor/NameSpelExpressionProcessor.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/processor/NameSpelExpressionProcessor.java new file mode 100644 index 0000000..ed06cc8 --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/processor/NameSpelExpressionProcessor.java @@ -0,0 +1,40 @@ +package com.rax.excel.processor; + +import org.springframework.context.expression.MethodBasedEvaluationContext; +import org.springframework.core.DefaultParameterNameDiscoverer; +import org.springframework.core.ParameterNameDiscoverer; +import org.springframework.expression.EvaluationContext; +import org.springframework.expression.ExpressionParser; +import org.springframework.expression.spel.standard.SpelExpressionParser; + +import java.lang.reflect.Method; + +/** + * @author lengleng + * @date 2020/3/29 + */ +public class NameSpelExpressionProcessor implements NameProcessor { + + /** + * 参数发现器 + */ + private static final ParameterNameDiscoverer NAME_DISCOVERER = new DefaultParameterNameDiscoverer(); + + /** + * Express语法解析器 + */ + private static final ExpressionParser PARSER = new SpelExpressionParser(); + + @Override + public String doDetermineName(Object[] args, Method method, String key) { + + if (!key.contains("#")) { + return key; + } + + EvaluationContext context = new MethodBasedEvaluationContext(null, method, args, NAME_DISCOVERER); + final Object value = PARSER.parseExpression(key).getValue(context); + return value == null ? null : value.toString(); + } + +} diff --git a/common/excel-spring-boot-starter/src/main/java/com/rax/excel/vo/ErrorMessage.java b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/vo/ErrorMessage.java new file mode 100644 index 0000000..b6bbfcd --- /dev/null +++ b/common/excel-spring-boot-starter/src/main/java/com/rax/excel/vo/ErrorMessage.java @@ -0,0 +1,41 @@ +package com.rax.excel.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.HashSet; +import java.util.Set; + +/** + * 校验错误信息 + * + * @author lengleng + * @date 2021/8/4 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ErrorMessage { + + /** + * 行号 + */ + private Long lineNum; + + /** + * 错误信息 + */ + private Set errors = new HashSet<>(); + + public ErrorMessage(Set errors) { + this.errors = errors; + } + + public ErrorMessage(String error) { + HashSet objects = new HashSet<>(); + objects.add(error); + this.errors = objects; + } + +} diff --git a/common/pom.xml b/common/pom.xml new file mode 100644 index 0000000..00530fe --- /dev/null +++ b/common/pom.xml @@ -0,0 +1,31 @@ + + + + 4.0.0 + + com.rax + rax + 3.7.3 + + + common + pom + + 公共聚合模块 + + + common-bom + common-core + common-datasource + common-log + common-mybatis + common-oss + common-seata + common-security + common-feign + common-swagger + common-xss + excel-spring-boot-starter + + diff --git a/db/pig.sql b/db/pig.sql index 2472749..b3bab72 100644 --- a/db/pig.sql +++ b/db/pig.sql @@ -622,8 +622,6 @@ CREATE TABLE `sys_user` ( `wx_openid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '微信登录openId', `mini_openid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '小程序openId', `qq_openid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'QQ openId', - `gitee_login` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '码云标识', - `osc_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '开源中国标识', PRIMARY KEY (`user_id`) USING BTREE, KEY `user_wx_openid` (`wx_openid`) USING BTREE, KEY `user_qq_openid` (`qq_openid`) USING BTREE, diff --git a/db/pig_codegen.sql b/db/pig_codegen.sql index 1daff68..a36752e 100644 --- a/db/pig_codegen.sql +++ b/db/pig_codegen.sql @@ -208,7 +208,7 @@ CREATE TABLE `gen_template` ( -- Records of gen_template -- ---------------------------- BEGIN; -INSERT INTO `gen_template` VALUES (1, 'Controller', '${backendPath}/src/main/java/${packagePath}/${moduleName}/controller/${ClassName}Controller.java', '后台Controller', 'package ${package}.${moduleName}.controller;\n\n#if($queryList)\nimport cn.hutool.core.util.StrUtil;\n#end\nimport cn.hutool.core.util.ArrayUtil;\nimport cn.hutool.core.collection.CollUtil;\nimport com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;\nimport com.baomidou.mybatisplus.core.toolkit.Wrappers;\nimport com.baomidou.mybatisplus.extension.plugins.pagination.Page;\nimport com.pig4cloud.pig.common.core.util.R;\nimport com.pig4cloud.pig.common.log.annotation.SysLog;\nimport ${package}.${moduleName}.entity.${ClassName}Entity;\nimport ${package}.${moduleName}.service.${ClassName}Service;\nimport org.springframework.security.access.prepost.PreAuthorize;\nimport com.pig4cloud.plugin.excel.annotation.ResponseExcel;\nimport io.swagger.v3.oas.annotations.security.SecurityRequirement;\nimport org.springdoc.core.annotations.ParameterObject;\nimport org.springframework.http.HttpHeaders;\nimport io.swagger.v3.oas.annotations.tags.Tag;\nimport io.swagger.v3.oas.annotations.Operation;\nimport lombok.RequiredArgsConstructor;\nimport org.springframework.web.bind.annotation.*;\n\nimport java.util.List;\nimport java.util.Objects;\n\n/**\n * ${tableComment}\n *\n * @author ${author}\n * @date ${datetime}\n */\n@RestController\n@RequiredArgsConstructor\n@RequestMapping(\"/${functionName}\" )\n@Tag(description = \"${functionName}\" , name = \"${tableComment}管理\" )\n@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)\npublic class ${ClassName}Controller {\n\n private final ${ClassName}Service ${className}Service;\n\n /**\n * 分页查询\n * @param page 分页对象\n * @param ${className} ${tableComment}\n * @return\n */\n @Operation(summary = \"分页查询\" , description = \"分页查询\" )\n @GetMapping(\"/page\" )\n @PreAuthorize(\"@pms.hasPermission(\'${moduleName}_${functionName}_view\')\" )\n public R get${ClassName}Page(@ParameterObject Page page, @ParameterObject ${ClassName}Entity ${className}) {\n LambdaQueryWrapper<${ClassName}Entity> wrapper = Wrappers.lambdaQuery();\n#foreach ($field in $queryList)\n#set($getAttrName=$str.getProperty($field.attrName))\n#set($var=\"${className}.$getAttrName()\")\n#if($field.attrType == \'String\')\n#set($expression=\"StrUtil.isNotBlank\")\n#else\n#set($expression=\"Objects.nonNull\")\n#end\n#if($field.queryType == \'=\')\n wrapper.eq($expression($var),${ClassName}Entity::$getAttrName,$var);\n#elseif( $field.queryType == \'like\' )\n wrapper.like($expression($var),${ClassName}Entity::$getAttrName,$var);\n#elseif( $field.queryType == \'!-\' )\n wrapper.ne($expression($var),${ClassName}Entity::$getAttrName,$var);\n#elseif( $field.queryType == \'>\' )\n wrapper.gt($expression($var),${ClassName}Entity::$getAttrName,$var);\n#elseif( $field.queryType == \'<\' )\n wrapper.lt($expression($var),${ClassName}Entity::$getAttrName,$var);\n#elseif( $field.queryType == \'>=\' )\n wrapper.ge($expression($var),${ClassName}Entity::$getAttrName,$var);\n#elseif( $field.queryType == \'<=\' )\n wrapper.le($expression($var),${ClassName}Entity::$getAttrName,$var);\n#elseif( $field.queryType == \'left like\' )\n wrapper.likeLeft($expression($var),${ClassName}Entity::$getAttrName,$var);\n#elseif( $field.queryType == \'right like\' )\n wrapper.likeRight($expression($var),${ClassName}Entity::$getAttrName,$var);\n#end\n#end\n return R.ok(${className}Service.page(page, wrapper));\n }\n\n\n /**\n * 通过id查询${tableComment}\n * @param ${pk.attrName} id\n * @return R\n */\n @Operation(summary = \"通过id查询\" , description = \"通过id查询\" )\n @GetMapping(\"/{${pk.attrName}}\" )\n @PreAuthorize(\"@pms.hasPermission(\'${moduleName}_${functionName}_view\')\" )\n public R getById(@PathVariable(\"${pk.attrName}\" ) ${pk.attrType} ${pk.attrName}) {\n return R.ok(${className}Service.getById(${pk.attrName}));\n }\n\n /**\n * 新增${tableComment}\n * @param ${className} ${tableComment}\n * @return R\n */\n @Operation(summary = \"新增${tableComment}\" , description = \"新增${tableComment}\" )\n @SysLog(\"新增${tableComment}\" )\n @PostMapping\n @PreAuthorize(\"@pms.hasPermission(\'${moduleName}_${functionName}_add\')\" )\n public R save(@RequestBody ${ClassName}Entity ${className}) {\n return R.ok(${className}Service.save(${className}));\n }\n\n /**\n * 修改${tableComment}\n * @param ${className} ${tableComment}\n * @return R\n */\n @Operation(summary = \"修改${tableComment}\" , description = \"修改${tableComment}\" )\n @SysLog(\"修改${tableComment}\" )\n @PutMapping\n @PreAuthorize(\"@pms.hasPermission(\'${moduleName}_${functionName}_edit\')\" )\n public R updateById(@RequestBody ${ClassName}Entity ${className}) {\n return R.ok(${className}Service.updateById(${className}));\n }\n\n /**\n * 通过id删除${tableComment}\n * @param ids ${pk.attrName}列表\n * @return R\n */\n @Operation(summary = \"通过id删除${tableComment}\" , description = \"通过id删除${tableComment}\" )\n @SysLog(\"通过id删除${tableComment}\" )\n @DeleteMapping\n @PreAuthorize(\"@pms.hasPermission(\'${moduleName}_${functionName}_del\')\" )\n public R removeById(@RequestBody ${pk.attrType}[] ids) {\n return R.ok(${className}Service.removeBatchByIds(CollUtil.toList(ids)));\n }\n\n\n /**\n * 导出excel 表格\n * @param ${className} 查询条件\n * @param ids 导出指定ID\n * @return excel 文件流\n */\n @ResponseExcel\n @GetMapping(\"/export\")\n @PreAuthorize(\"@pms.hasPermission(\'${moduleName}_${functionName}_export\')\" )\n public List<${ClassName}Entity> export(${ClassName}Entity ${className},${pk.attrType}[] ids) {\n return ${className}Service.list(Wrappers.lambdaQuery(${className}).in(ArrayUtil.isNotEmpty(ids), ${ClassName}Entity::$str.getProperty($pk.attrName), ids));\n }\n}', '2023-02-23 01:16:17', '2023-08-28 22:48:06', '0', '', 'admin'); +INSERT INTO `gen_template` VALUES (1, 'Controller', '${backendPath}/src/main/java/${packagePath}/${moduleName}/controller/${ClassName}Controller.java', '后台Controller', 'package ${package}.${moduleName}.controller;\n\n#if($queryList)\nimport cn.hutool.core.util.StrUtil;\n#end\nimport cn.hutool.core.util.ArrayUtil;\nimport cn.hutool.core.collection.CollUtil;\nimport com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;\nimport com.baomidou.mybatisplus.core.toolkit.Wrappers;\nimport com.baomidou.mybatisplus.extension.plugins.pagination.Page;\nimport util.com.rax.common.core.R;\nimport annotation.com.rax.common.log.SysLog;\nimport ${package}.${moduleName}.entity.${ClassName}Entity;\nimport ${package}.${moduleName}.service.${ClassName}Service;\nimport org.springframework.security.access.prepost.PreAuthorize;\nimport annotation.com.rax.excel.ResponseExcel;\nimport io.swagger.v3.oas.annotations.security.SecurityRequirement;\nimport org.springdoc.core.annotations.ParameterObject;\nimport org.springframework.http.HttpHeaders;\nimport io.swagger.v3.oas.annotations.tags.Tag;\nimport io.swagger.v3.oas.annotations.Operation;\nimport lombok.RequiredArgsConstructor;\nimport org.springframework.web.bind.annotation.*;\n\nimport java.util.List;\nimport java.util.Objects;\n\n/**\n * ${tableComment}\n *\n * @author ${author}\n * @date ${datetime}\n */\n@RestController\n@RequiredArgsConstructor\n@RequestMapping(\"/${functionName}\" )\n@Tag(description = \"${functionName}\" , name = \"${tableComment}管理\" )\n@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)\npublic class ${ClassName}Controller {\n\n private final ${ClassName}Service ${className}Service;\n\n /**\n * 分页查询\n * @param page 分页对象\n * @param ${className} ${tableComment}\n * @return\n */\n @Operation(summary = \"分页查询\" , description = \"分页查询\" )\n @GetMapping(\"/page\" )\n @PreAuthorize(\"@pms.hasPermission(\'${moduleName}_${functionName}_view\')\" )\n public R get${ClassName}Page(@ParameterObject Page page, @ParameterObject ${ClassName}Entity ${className}) {\n LambdaQueryWrapper<${ClassName}Entity> wrapper = Wrappers.lambdaQuery();\n#foreach ($field in $queryList)\n#set($getAttrName=$str.getProperty($field.attrName))\n#set($var=\"${className}.$getAttrName()\")\n#if($field.attrType == \'String\')\n#set($expression=\"StrUtil.isNotBlank\")\n#else\n#set($expression=\"Objects.nonNull\")\n#end\n#if($field.queryType == \'=\')\n wrapper.eq($expression($var),${ClassName}Entity::$getAttrName,$var);\n#elseif( $field.queryType == \'like\' )\n wrapper.like($expression($var),${ClassName}Entity::$getAttrName,$var);\n#elseif( $field.queryType == \'!-\' )\n wrapper.ne($expression($var),${ClassName}Entity::$getAttrName,$var);\n#elseif( $field.queryType == \'>\' )\n wrapper.gt($expression($var),${ClassName}Entity::$getAttrName,$var);\n#elseif( $field.queryType == \'<\' )\n wrapper.lt($expression($var),${ClassName}Entity::$getAttrName,$var);\n#elseif( $field.queryType == \'>=\' )\n wrapper.ge($expression($var),${ClassName}Entity::$getAttrName,$var);\n#elseif( $field.queryType == \'<=\' )\n wrapper.le($expression($var),${ClassName}Entity::$getAttrName,$var);\n#elseif( $field.queryType == \'left like\' )\n wrapper.likeLeft($expression($var),${ClassName}Entity::$getAttrName,$var);\n#elseif( $field.queryType == \'right like\' )\n wrapper.likeRight($expression($var),${ClassName}Entity::$getAttrName,$var);\n#end\n#end\n return R.ok(${className}Service.page(page, wrapper));\n }\n\n\n /**\n * 通过id查询${tableComment}\n * @param ${pk.attrName} id\n * @return R\n */\n @Operation(summary = \"通过id查询\" , description = \"通过id查询\" )\n @GetMapping(\"/{${pk.attrName}}\" )\n @PreAuthorize(\"@pms.hasPermission(\'${moduleName}_${functionName}_view\')\" )\n public R getById(@PathVariable(\"${pk.attrName}\" ) ${pk.attrType} ${pk.attrName}) {\n return R.ok(${className}Service.getById(${pk.attrName}));\n }\n\n /**\n * 新增${tableComment}\n * @param ${className} ${tableComment}\n * @return R\n */\n @Operation(summary = \"新增${tableComment}\" , description = \"新增${tableComment}\" )\n @SysLog(\"新增${tableComment}\" )\n @PostMapping\n @PreAuthorize(\"@pms.hasPermission(\'${moduleName}_${functionName}_add\')\" )\n public R save(@RequestBody ${ClassName}Entity ${className}) {\n return R.ok(${className}Service.save(${className}));\n }\n\n /**\n * 修改${tableComment}\n * @param ${className} ${tableComment}\n * @return R\n */\n @Operation(summary = \"修改${tableComment}\" , description = \"修改${tableComment}\" )\n @SysLog(\"修改${tableComment}\" )\n @PutMapping\n @PreAuthorize(\"@pms.hasPermission(\'${moduleName}_${functionName}_edit\')\" )\n public R updateById(@RequestBody ${ClassName}Entity ${className}) {\n return R.ok(${className}Service.updateById(${className}));\n }\n\n /**\n * 通过id删除${tableComment}\n * @param ids ${pk.attrName}列表\n * @return R\n */\n @Operation(summary = \"通过id删除${tableComment}\" , description = \"通过id删除${tableComment}\" )\n @SysLog(\"通过id删除${tableComment}\" )\n @DeleteMapping\n @PreAuthorize(\"@pms.hasPermission(\'${moduleName}_${functionName}_del\')\" )\n public R removeById(@RequestBody ${pk.attrType}[] ids) {\n return R.ok(${className}Service.removeBatchByIds(CollUtil.toList(ids)));\n }\n\n\n /**\n * 导出excel 表格\n * @param ${className} 查询条件\n * @param ids 导出指定ID\n * @return excel 文件流\n */\n @ResponseExcel\n @GetMapping(\"/export\")\n @PreAuthorize(\"@pms.hasPermission(\'${moduleName}_${functionName}_export\')\" )\n public List<${ClassName}Entity> export(${ClassName}Entity ${className},${pk.attrType}[] ids) {\n return ${className}Service.list(Wrappers.lambdaQuery(${className}).in(ArrayUtil.isNotEmpty(ids), ${ClassName}Entity::$str.getProperty($pk.attrName), ids));\n }\n}', '2023-02-23 01:16:17', '2023-08-28 22:48:06', '0', '', 'admin'); INSERT INTO `gen_template` VALUES (2, 'Service', '${backendPath}/src/main/java/${packagePath}/${moduleName}/service/${ClassName}Service.java', 'Service', 'package ${package}.${moduleName}.service;\n\n#if($ChildClassName)\nimport com.github.yulichang.extension.mapping.base.MPJDeepService;\nimport ${package}.${moduleName}.entity.${ChildClassName}Entity;\n#else\nimport com.baomidou.mybatisplus.extension.service.IService;\n#end\nimport ${package}.${moduleName}.entity.${ClassName}Entity;\n\n#if($ChildClassName)\npublic interface ${ClassName}Service extends MPJDeepService<${ClassName}Entity> {\n Boolean saveDeep(${ClassName}Entity ${className});\n\n Boolean updateDeep(${ClassName}Entity ${className});\n\n Boolean removeDeep(Long[] ids);\n\n Boolean removeChild(Long[] ids);\n#else\npublic interface ${ClassName}Service extends IService<${ClassName}Entity> {\n#end\n\n}', '2023-02-23 01:16:53', '2023-06-04 10:35:25', '0', ' ', ' '); INSERT INTO `gen_template` VALUES (3, 'ServiceImpl', '${backendPath}/src/main/java/${packagePath}/${moduleName}/service/impl/${ClassName}ServiceImpl.java', 'ServiceImpl', 'package ${package}.${moduleName}.service.impl;\n\nimport com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;\nimport ${package}.${moduleName}.entity.${ClassName}Entity;\nimport ${package}.${moduleName}.mapper.${ClassName}Mapper;\nimport ${package}.${moduleName}.service.${ClassName}Service;\nimport org.springframework.stereotype.Service;\n#if($ChildClassName)\nimport cn.hutool.core.collection.CollUtil;\nimport com.baomidou.mybatisplus.core.toolkit.Wrappers;\nimport ${package}.${moduleName}.entity.${ChildClassName}Entity;\nimport ${package}.${moduleName}.mapper.${ChildClassName}Mapper;\nimport org.springframework.transaction.annotation.Transactional;\nimport lombok.RequiredArgsConstructor;\nimport java.util.Objects;\n#end\n/**\n * ${tableComment}\n *\n * @author ${author}\n * @date ${datetime}\n */\n@Service\n#if($ChildClassName)\n@RequiredArgsConstructor\n#end\npublic class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${ClassName}Entity> implements ${ClassName}Service {\n#if($ChildClassName)\n private final ${ChildClassName}Mapper ${childClassName}Mapper;\n\n @Override\n @Transactional(rollbackFor = Exception.class)\n public Boolean saveDeep(${ClassName}Entity ${className}) {\n baseMapper.insert(${className});\n for (${ChildClassName}Entity ${childClassName} : ${className}.get${ChildClassName}List()) {\n ${childClassName}.$str.setProperty($childField)(${className}.$str.getProperty($mainField)());\n ${childClassName}Mapper.insert( ${childClassName});\n }\n\n return Boolean.TRUE;\n }\n\n @Override\n @Transactional(rollbackFor = Exception.class)\n public Boolean updateDeep(${ClassName}Entity ${className}) {\n baseMapper.updateById(${className});\n for (${ChildClassName}Entity ${childClassName} : ${className}.get${ChildClassName}List()) {\n#set($getChildPkName=$str.getProperty(${pk.attrName}))\n if (Objects.isNull(${childClassName}.$getChildPkName())) {\n ${childClassName}.$str.setProperty($childField)(${className}.getId());\n ${childClassName}Mapper.insert(${childClassName});\n } else {\n ${childClassName}Mapper.updateById(${childClassName});\n }\n }\n return Boolean.TRUE;\n }\n\n @Override\n @Transactional(rollbackFor = Exception.class)\n public Boolean removeDeep(Long[] ids) {\n baseMapper.deleteBatchIds(CollUtil.toList(ids));\n ${childClassName}Mapper.delete(Wrappers.<${ChildClassName}Entity>lambdaQuery().in(${ChildClassName}Entity::$str.getProperty($childField), ids));\n return Boolean.TRUE;\n }\n\n @Override\n @Transactional(rollbackFor = Exception.class)\n public Boolean removeChild(Long[] ids) {\n ${childClassName}Mapper.deleteBatchIds(CollUtil.toList(ids));\n return Boolean.TRUE;\n }\n#end\n}', '2023-02-23 01:17:36', '2023-08-27 23:29:58', '0', ' ', ' '); INSERT INTO `gen_template` VALUES (4, '实体', '${backendPath}/src/main/java/${packagePath}/${moduleName}/entity/${ClassName}Entity.java', 'Entity', 'package ${package}.${moduleName}.entity;\n\nimport com.baomidou.mybatisplus.annotation.*;\nimport com.baomidou.mybatisplus.extension.activerecord.Model;\nimport io.swagger.v3.oas.annotations.media.Schema;\nimport lombok.Data;\nimport lombok.EqualsAndHashCode;\n#foreach($import in $importList)\nimport $import;\n#end\n#if($ChildClassName)\nimport com.alibaba.excel.annotation.ExcelIgnore;\nimport com.github.yulichang.annotation.EntityMapping;\nimport java.util.List;\n#end\n\n/**\n * ${tableComment}\n *\n * @author ${author}\n * @date ${datetime}\n */\n@Data\n@TableName(\"${tableName}\")\n@EqualsAndHashCode(callSuper = true)\n@Schema(description = \"${tableComment}\")\npublic class ${ClassName}Entity extends Model<${ClassName}Entity> {\n\n#foreach ($field in $fieldList)\n#if(${field.fieldComment})#set($comment=${field.fieldComment})#else #set($comment=${field.attrName})#end\n\n /**\n * $comment\n */\n#if($field.primaryPk == \'1\')\n @TableId(type = IdType.ASSIGN_ID)\n#end\n#if($field.autoFill == \'INSERT\')\n @TableField(fill = FieldFill.INSERT)\n#elseif($field.autoFill == \'INSERT_UPDATE\')\n @TableField(fill = FieldFill.INSERT_UPDATE)\n#elseif($field.autoFill == \'UPDATE\')\n @TableField(fill = FieldFill.UPDATE)\n#end\n#if($field.fieldName == \'del_flag\')\n @TableLogic\n @TableField(fill = FieldFill.INSERT)\n#end\n @Schema(description=\"$comment\"#if($field.hidden),hidden=$field.hidden#end)\n private $field.attrType $field.attrName;\n#end\n#if($ChildClassName)\n @ExcelIgnore\n @TableField(exist = false)\n @EntityMapping(thisField = \"$mainField\", joinField = \"$childField\")\n private List<${ChildClassName}Entity> ${childClassName}List;\n#end\n}', '2023-02-23 01:17:53', '2023-08-27 22:26:06', '0', ' ', ' '); diff --git a/docker-compose.yml b/docker-compose.yml index aa892b6..16ede00 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,28 +19,28 @@ services: ports: - 6379:6379 restart: always - container_name: pig-redis - hostname: pig-redis + container_name: redis + hostname: redis networks: - spring_cloud_default pig-upms: build: - context: ./pig-upms/pig-upms-biz + context: ./upms/upms-biz restart: always - container_name: pig-upms - hostname: pig-upms - image: pig-upms + container_name: upms + hostname: upms + image: upms networks: - spring_cloud_default pig-codegen: build: - context: ./pig-visual/pig-codegen + context: ./visual/codegen restart: always - container_name: pig-codegen - hostname: pig-codegen - image: pig-codegen + container_name: codegen + hostname: rax-codegen + image: codegen networks: - spring_cloud_default diff --git a/pig-auth/pom.xml b/pig-auth/pom.xml deleted file mode 100644 index 230efef..0000000 --- a/pig-auth/pom.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - 4.0.0 - - com.pig4cloud - pig - 3.7.3 - - - pig-auth - jar - - pig 认证授权中心，基于 spring security oAuth2 - - - - - com.pig4cloud - pig-common-feign - - - - com.pig4cloud - pig-upms-api - - - - com.pig4cloud - pig-common-security - - - - org.springframework.boot - spring-boot-starter-security - - - - com.pig4cloud - pig-common-log - - - - io.springboot.plugin - captcha-core - ${captcha.version} - - - - cn.hutool - hutool-crypto - - - - diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/password/package-info.java b/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/password/package-info.java deleted file mode 100644 index e1b0539..0000000 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/password/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 密码模式 - */ -package com.pig4cloud.pig.auth.support.password; diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/sms/package-info.java b/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/sms/package-info.java deleted file mode 100644 index 46dcd59..0000000 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/sms/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 短信模式 - */ -package com.pig4cloud.pig.auth.support.sms; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/PigCodeGenApplication.java b/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/PigCodeGenApplication.java deleted file mode 100644 index 4a64846..0000000 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/PigCodeGenApplication.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.codegen; - -import com.pig4cloud.pig.common.datasource.annotation.EnableDynamicDataSource; -import com.pig4cloud.pig.common.security.annotation.EnablePigResourceServer; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author lengleng - * @date 2018/07/29 代码生成模块 - */ -@EnableDynamicDataSource -@EnablePigResourceServer -@SpringBootApplication -public class PigCodeGenApplication { - - public static void main(String[] args) { - SpringApplication.run(PigCodeGenApplication.class, args); - } - -} diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/RestTemplateConfiguration.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/RestTemplateConfiguration.java deleted file mode 100644 index 39f5e99..0000000 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/RestTemplateConfiguration.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.common.core.config; - -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.context.annotation.Bean; -import org.springframework.web.client.RestTemplate; - -/** - * @author lengleng - * @date 2019/2/1 RestTemplate - */ -@AutoConfiguration -public class RestTemplateConfiguration { - - @Bean - public RestTemplate restTemplate() { - return new RestTemplate(); - } - -} diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/CommonConstants.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/CommonConstants.java deleted file mode 100644 index 5336a30..0000000 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/CommonConstants.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.common.core.constant; - -/** - * @author lengleng - * @date 2019/2/1 - */ -public interface CommonConstants { - - /** - * 删除 - */ - String STATUS_DEL = "1"; - - /** - * 正常 - */ - String STATUS_NORMAL = "0"; - - /** - * 锁定 - */ - String STATUS_LOCK = "9"; - - /** - * 菜单树根节点 - */ - Long MENU_TREE_ROOT_ID = -1L; - - /** - * 菜单 - */ - String MENU = "0"; - - /** - * 编码 - */ - String UTF8 = "UTF-8"; - - /** - * JSON 资源 - */ - String CONTENT_TYPE = "application/json; charset=utf-8"; - - /** - * 前端工程名 - */ - String FRONT_END_PROJECT = "pig-ui"; - - /** - * 后端工程名 - */ - String BACK_END_PROJECT = "pig"; - - /** - * 成功标记 - */ - Integer SUCCESS = 0; - - /** - * 失败标记 - */ - Integer FAIL = 1; - - /** - * 当前页 - */ - String CURRENT = "current"; - - /** - * size - */ - String SIZE = "size"; - - /** - * 请求开始时间 - */ - String REQUEST_START_TIME = "REQUEST-START-TIME"; - -} diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/ServiceNameConstants.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/ServiceNameConstants.java deleted file mode 100644 index cabae2c..0000000 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/ServiceNameConstants.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.common.core.constant; - -/** - * @author lengleng - * @date 2018年06月22日16:41:01 服务名称 - */ -public interface ServiceNameConstants { - - /** - * 认证服务的SERVICEID - */ - String AUTH_SERVICE = "pig-auth"; - - /** - * UPMS模块 - */ - String UPMS_SERVICE = "pig-upms-biz"; - -} diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/DictTypeEnum.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/DictTypeEnum.java deleted file mode 100644 index 5896627..0000000 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/DictTypeEnum.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.common.core.constant.enums; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -/** - * @author lengleng - * @date 2019-05-16 - *

    - * 字典类型 - */ -@Getter -@RequiredArgsConstructor -public enum DictTypeEnum { - - /** - * 字典类型-系统内置（不可修改） - */ - SYSTEM("1", "系统内置"), - - /** - * 字典类型-业务类型 - */ - BIZ("0", "业务类"); - - /** - * 类型 - */ - private final String type; - - /** - * 描述 - */ - private final String description; - -} diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/LoginTypeEnum.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/LoginTypeEnum.java deleted file mode 100644 index ef4b810..0000000 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/LoginTypeEnum.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.common.core.constant.enums; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -/** - * @author lengleng - * @date 2018/8/15 社交登录类型 - */ -@Getter -@RequiredArgsConstructor -public enum LoginTypeEnum { - - /** - * 账号密码登录 - */ - PWD("PWD", "账号密码登录"), - - /** - * 验证码登录 - */ - SMS("SMS", "验证码登录"); - - /** - * 类型 - */ - private final String type; - - /** - * 描述 - */ - private final String description; - -} diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/MenuTypeEnum.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/MenuTypeEnum.java deleted file mode 100644 index 44b2802..0000000 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/MenuTypeEnum.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.common.core.constant.enums; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -/** - * @author lengleng - * @date 2020-02-17 - *

    - * 菜单类型 - */ -@Getter -@RequiredArgsConstructor -public enum MenuTypeEnum { - - /** - * 左侧菜单 - */ - LEFT_MENU("0", "left"), - - /** - * 顶部菜单 - */ - TOP_MENU("2", "top"), - - /** - * 按钮 - */ - BUTTON("1", "button"); - - /** - * 类型 - */ - private final String type; - - /** - * 描述 - */ - private final String description; - -} diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/exception/CheckedException.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/exception/CheckedException.java deleted file mode 100644 index 2888873..0000000 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/exception/CheckedException.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.common.core.exception; - -import lombok.NoArgsConstructor; - -/** - * @author lengleng - * @date 😴2018年06月22日16:21:57 - */ -@NoArgsConstructor -public class CheckedException extends RuntimeException { - - private static final long serialVersionUID = 1L; - - public CheckedException(String message) { - super(message); - } - - public CheckedException(Throwable cause) { - super(cause); - } - - public CheckedException(String message, Throwable cause) { - super(message, cause); - } - - public CheckedException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { - super(message, cause, enableSuppression, writableStackTrace); - } - -} diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/exception/PigDeniedException.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/exception/PigDeniedException.java deleted file mode 100644 index b511230..0000000 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/exception/PigDeniedException.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.common.core.exception; - -import lombok.NoArgsConstructor; - -/** - * @author lengleng - * @date 2018年06月22日16:22:03 403 授权拒绝 - */ -@NoArgsConstructor -public class PigDeniedException extends RuntimeException { - - private static final long serialVersionUID = 1L; - - public PigDeniedException(String message) { - super(message); - } - - public PigDeniedException(Throwable cause) { - super(cause); - } - - public PigDeniedException(String message, Throwable cause) { - super(message, cause); - } - - public PigDeniedException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { - super(message, cause, enableSuppression, writableStackTrace); - } - -} diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/exception/ValidateCodeException.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/exception/ValidateCodeException.java deleted file mode 100644 index a89bcd0..0000000 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/exception/ValidateCodeException.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.common.core.exception; - -/** - * @author lengleng - * @date 2018年06月22日16:22:15 - */ -public class ValidateCodeException extends RuntimeException { - - private static final long serialVersionUID = -7285211528095468156L; - - public ValidateCodeException() { - } - - public ValidateCodeException(String msg) { - super(msg); - } - -} diff --git a/pig-common/pig-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pig-common/pig-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 6fe4f1a..0000000 --- a/pig-common/pig-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,6 +0,0 @@ -com.pig4cloud.pig.common.core.config.TaskExecutorConfiguration -com.pig4cloud.pig.common.core.config.JacksonConfiguration -com.pig4cloud.pig.common.core.config.RedisTemplateConfiguration -com.pig4cloud.pig.common.core.config.RestTemplateConfiguration -com.pig4cloud.pig.common.core.util.SpringContextHolder -com.pig4cloud.pig.common.core.config.WebMvcConfiguration diff --git a/pig-common/pig-common-core/src/main/resources/banner.txt b/pig-common/pig-common-core/src/main/resources/banner.txt deleted file mode 100644 index 7162661..0000000 --- a/pig-common/pig-common-core/src/main/resources/banner.txt +++ /dev/null @@ -1,17 +0,0 @@ -${AnsiColor.BRIGHT_YELLOW} - - ::::::::: ::::::::::: :::::::: - :+: :+: :+: :+: :+: - +:+ +:+ +:+ +:+ - +#++:++#+ +#+ :#: - +#+ +#+ +#+ +#+# - #+# #+# #+# #+# - ### ########### ######## - - www.pig4cloud.com - - Pig Microservice Architecture -${AnsiColor.DEFAULT} - - - diff --git a/pig-common/pig-common-datasource/pom.xml b/pig-common/pig-common-datasource/pom.xml deleted file mode 100644 index 4cfbb4c..0000000 --- a/pig-common/pig-common-datasource/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - pig-common - com.pig4cloud - 3.7.3 - - 4.0.0 - - com.pig4cloud - pig-common-datasource - - jar - - pig 动态切换数据源 - - - - - com.baomidou - dynamic-datasource-spring-boot3-starter - - - jakarta.servlet - jakarta.servlet-api - - - diff --git a/pig-common/pig-common-feign/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pig-common/pig-common-feign/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index caa9f52..0000000 --- a/pig-common/pig-common-feign/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,3 +0,0 @@ -com.pig4cloud.pig.common.feign.PigFeignAutoConfiguration -com.pig4cloud.pig.common.feign.sentinel.SentinelAutoConfiguration -com.pig4cloud.pig.common.feign.sentinel.handle.GlobalBizExceptionHandler diff --git a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/LogAutoConfiguration.java b/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/LogAutoConfiguration.java deleted file mode 100644 index 1f3b46f..0000000 --- a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/LogAutoConfiguration.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.common.log; - -import com.pig4cloud.pig.admin.api.feign.RemoteLogService; -import com.pig4cloud.pig.common.log.aspect.SysLogAspect; -import com.pig4cloud.pig.common.log.config.PigLogProperties; -import com.pig4cloud.pig.common.log.event.SysLogListener; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.EnableAsync; - -/** - * @author lengleng - * @date 2019/2/1 日志自动配置 - */ -@EnableAsync -@Configuration(proxyBeanMethods = false) -@EnableConfigurationProperties(PigLogProperties.class) -@ConditionalOnProperty(value = "security.log.enabled", matchIfMissing = true) -public class LogAutoConfiguration { - - @Bean - public SysLogListener sysLogListener(PigLogProperties logProperties, RemoteLogService remoteLogService) { - return new SysLogListener(remoteLogService, logProperties); - } - - @Bean - public SysLogAspect sysLogAspect() { - return new SysLogAspect(); - } - -} diff --git a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/annotation/SysLog.java b/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/annotation/SysLog.java deleted file mode 100644 index d01fd1a..0000000 --- a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/annotation/SysLog.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.common.log.annotation; - -import java.lang.annotation.*; - -/** - * @author lengleng - * @date 2019/2/1 操作日志注解 - */ -@Target(ElementType.METHOD) -@Retention(RetentionPolicy.RUNTIME) -@Documented -public @interface SysLog { - - /** - * 描述 - * @return {String} - */ - String value() default ""; - - /** - * spel 表达式 - * @return 日志描述 - */ - String expression() default ""; - -} diff --git a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogEvent.java b/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogEvent.java deleted file mode 100644 index 4e12582..0000000 --- a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogEvent.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.common.log.event; - -import com.pig4cloud.pig.admin.api.entity.SysLog; -import org.springframework.context.ApplicationEvent; - -/** - * @author lengleng 系统日志事件 - */ -public class SysLogEvent extends ApplicationEvent { - - public SysLogEvent(SysLog source) { - super(source); - } - -} diff --git a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/util/LogTypeEnum.java b/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/util/LogTypeEnum.java deleted file mode 100644 index d3754fc..0000000 --- a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/util/LogTypeEnum.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.common.log.util; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -/** - * @author lengleng - * @date 2020/7/30 - *

    - * 日志类型 - */ -@Getter -@RequiredArgsConstructor -public enum LogTypeEnum { - - /** - * 正常日志类型 - */ - NORMAL("0", "正常日志"), - - /** - * 错误日志类型 - */ - ERROR("9", "错误日志"); - - /** - * 类型 - */ - private final String type; - - /** - * 描述 - */ - private final String description; - -} diff --git a/pig-common/pig-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pig-common/pig-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 6dc4cbe..0000000 --- a/pig-common/pig-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -com.pig4cloud.pig.common.log.LogAutoConfiguration diff --git a/pig-common/pig-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pig-common/pig-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index f1783c2..0000000 --- a/pig-common/pig-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -com.pig4cloud.pig.common.mybatis.MybatisAutoConfiguration diff --git a/pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/FileAutoConfiguration.java b/pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/FileAutoConfiguration.java deleted file mode 100644 index 2227b95..0000000 --- a/pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/FileAutoConfiguration.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.common.file; - -import com.pig4cloud.pig.common.file.core.FileProperties; -import com.pig4cloud.pig.common.file.local.LocalFileAutoConfiguration; -import com.pig4cloud.pig.common.file.oss.OssAutoConfiguration; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Import; - -/** - * aws 自动配置类 - * - * @author lengleng - * @author 858695266 - */ -@Import({ LocalFileAutoConfiguration.class, OssAutoConfiguration.class }) -@EnableConfigurationProperties({ FileProperties.class }) -public class FileAutoConfiguration { - -} diff --git a/pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/core/FileProperties.java b/pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/core/FileProperties.java deleted file mode 100644 index ea322b8..0000000 --- a/pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/core/FileProperties.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.common.file.core; - -import com.pig4cloud.pig.common.file.local.LocalFileProperties; -import com.pig4cloud.pig.common.file.oss.OssProperties; -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.context.properties.NestedConfigurationProperty; - -/** - * 文件 配置信息 - * - * @author lengleng - *

    - * bucket 设置公共读权限 - */ -@Data -@ConfigurationProperties(prefix = "file") -public class FileProperties { - - /** - * 默认的存储桶名称 - */ - private String bucketName = "local"; - - /** - * 本地文件配置信息 - */ - @NestedConfigurationProperty - private LocalFileProperties local; - - /** - * oss 文件配置信息 - */ - @NestedConfigurationProperty - private OssProperties oss; - -} diff --git a/pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/local/LocalFileAutoConfiguration.java b/pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/local/LocalFileAutoConfiguration.java deleted file mode 100644 index bf34b0c..0000000 --- a/pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/local/LocalFileAutoConfiguration.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.common.file.local; - -import com.pig4cloud.pig.common.file.core.FileProperties; -import com.pig4cloud.pig.common.file.core.FileTemplate; -import lombok.AllArgsConstructor; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.context.annotation.Bean; - -/** - * aws 自动配置类 - * - * @author lengleng - * @author 858695266 - */ -@AllArgsConstructor -public class LocalFileAutoConfiguration { - - private final FileProperties properties; - - @Bean - @ConditionalOnMissingBean(LocalFileTemplate.class) - @ConditionalOnProperty(name = "file.local.enable", havingValue = "true", matchIfMissing = true) - public FileTemplate localFileTemplate() { - return new LocalFileTemplate(properties); - } - -} diff --git a/pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/local/LocalFileProperties.java b/pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/local/LocalFileProperties.java deleted file mode 100644 index 7cf833e..0000000 --- a/pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/local/LocalFileProperties.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.common.file.local; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; - -/** - * 本地文件 配置信息 - * - * @author lengleng - *

    - * bucket 设置公共读权限 - */ -@Data -@ConfigurationProperties(prefix = "local") -public class LocalFileProperties { - - /** - * 是否开启 - */ - private boolean enable; - - /** - * 默认路径 - */ - private String basePath; - -} diff --git a/pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/oss/OssAutoConfiguration.java b/pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/oss/OssAutoConfiguration.java deleted file mode 100644 index e0b3144..0000000 --- a/pig-common/pig-common-oss/src/main/java/com/pig4cloud/pig/common/file/oss/OssAutoConfiguration.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.common.file.oss; - -import com.pig4cloud.pig.common.file.core.FileProperties; -import com.pig4cloud.pig.common.file.core.FileTemplate; -import com.pig4cloud.pig.common.file.oss.http.OssEndpoint; -import com.pig4cloud.pig.common.file.oss.service.OssTemplate; -import lombok.AllArgsConstructor; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Primary; - -/** - * aws 自动配置类 - * - * @author lengleng - * @author 858695266 - */ -@AllArgsConstructor -public class OssAutoConfiguration { - - private final FileProperties properties; - - @Bean - @Primary - @ConditionalOnMissingBean(OssTemplate.class) - @ConditionalOnProperty(name = "file.oss.enable", havingValue = "true") - public FileTemplate ossTemplate() { - return new OssTemplate(properties); - } - - @Bean - @ConditionalOnMissingBean - @ConditionalOnProperty(name = "file.oss.info", havingValue = "true") - public OssEndpoint ossEndpoint(OssTemplate template) { - return new OssEndpoint(template); - } - -} diff --git a/pig-common/pig-common-oss/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pig-common/pig-common-oss/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index ae145c0..0000000 --- a/pig-common/pig-common-oss/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -com.pig4cloud.pig.common.file.FileAutoConfiguration diff --git a/pig-common/pig-common-seata/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pig-common/pig-common-seata/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 404246a..0000000 --- a/pig-common/pig-common-seata/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ - com.pig4cloud.pig.common.seata.config.SeataAutoConfiguration diff --git a/pig-common/pig-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pig-common/pig-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 6e5c51f..0000000 --- a/pig-common/pig-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,7 +0,0 @@ -com.pig4cloud.pig.common.security.service.PigUserDetailsServiceImpl -com.pig4cloud.pig.common.security.service.PigAppUserDetailsServiceImpl -com.pig4cloud.pig.common.security.service.PigRedisOAuth2AuthorizationService -com.pig4cloud.pig.common.security.service.PigRedisOAuth2AuthorizationConsentService -com.pig4cloud.pig.common.security.component.PigSecurityInnerAspect -com.pig4cloud.pig.common.security.component.PigSecurityMessageSourceConfiguration -com.pig4cloud.pig.common.security.service.PigRemoteRegisteredClientRepository diff --git a/pig-common/pig-common-xss/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pig-common/pig-common-xss/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 1822679..0000000 --- a/pig-common/pig-common-xss/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -com.pig4cloud.pig.common.xss.PigXssAutoConfiguration diff --git a/pig-common/pom.xml b/pig-common/pom.xml deleted file mode 100644 index f4eb87b..0000000 --- a/pig-common/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - 4.0.0 - - com.pig4cloud - pig - 3.7.3 - - - pig-common - pom - - pig 公共聚合模块 - - - pig-common-bom - pig-common-core - pig-common-datasource - pig-common-log - pig-common-mybatis - pig-common-oss - pig-common-seata - pig-common-security - pig-common-feign - pig-common-swagger - pig-common-xss - - diff --git a/pig-upms/pig-upms-api/pom.xml b/pig-upms/pig-upms-api/pom.xml deleted file mode 100644 index 597ed87..0000000 --- a/pig-upms/pig-upms-api/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - 4.0.0 - - com.pig4cloud - pig-upms - 3.7.3 - - - pig-upms-api - jar - - pig 通用用户权限管理系统公共api模块 - - - - - - com.pig4cloud - pig-common-core - - - - org.springframework.cloud - spring-cloud-openfeign-core - true - - - - com.pig4cloud - pig-common-mybatis - - - - com.pig4cloud.excel - excel-spring-boot-starter - - - diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/UserDTO.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/UserDTO.java deleted file mode 100644 index 287bae3..0000000 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/UserDTO.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.api.dto; - -import com.pig4cloud.pig.admin.api.entity.SysUser; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * @author lengleng - * @date 2017/11/5 - */ -@Data -@Schema(description = "系统用户传输对象") -@EqualsAndHashCode(callSuper = true) -public class UserDTO extends SysUser { - - /** - * 角色ID - */ - @Schema(description = "角色id集合") - private List role; - - /** - * 部门id - */ - @Schema(description = "部门id") - private Long deptId; - - /** - * 岗位ID - */ - private List post; - - /** - * 新密码 - */ - @Schema(description = "新密码") - private String newpassword1; - -} diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/UserInfo.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/UserInfo.java deleted file mode 100644 index d055864..0000000 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/UserInfo.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.api.dto; - -import com.pig4cloud.pig.admin.api.entity.SysUser; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serializable; - -/** - * @author lengleng - * @date 2017/11/11 - */ -@Data -@Schema(description = "用户信息") -public class UserInfo implements Serializable { - - /** - * 用户基本信息 - */ - @Schema(description = "用户基本信息") - private SysUser sysUser; - - /** - * 权限标识集合 - */ - @Schema(description = "权限标识集合") - private String[] permissions; - - /** - * 角色集合 - */ - @Schema(description = "角色标识集合") - private Long[] roles; - -} diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDeptRelation.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDeptRelation.java deleted file mode 100644 index 133622c..0000000 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDeptRelation.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.api.entity; - -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - *

    - * 部门关系表 - *

    - * - * @author lengleng - * @since 2018-01-22 - */ -@Data -@Schema(description = "部门关系") -@EqualsAndHashCode(callSuper = true) -public class SysDeptRelation extends Model { - - private static final long serialVersionUID = 1L; - - /** - * 祖先节点 - */ - @Schema(description = "祖先节点") - private Long ancestor; - - /** - * 后代节点 - */ - @Schema(description = "后代节点") - private Long descendant; - -} diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysRoleMenu.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysRoleMenu.java deleted file mode 100644 index bdc264f..0000000 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysRoleMenu.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.api.entity; - -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - *

    - * 角色菜单表 - *

    - * - * @author lengleng - * @since 2017-10-29 - */ -@Data -@Schema(description = "角色菜单") -@EqualsAndHashCode(callSuper = true) -public class SysRoleMenu extends Model { - - private static final long serialVersionUID = 1L; - - /** - * 角色ID - */ - @Schema(description = "角色id") - private Long roleId; - - /** - * 菜单ID - */ - @Schema(description = "菜单id") - private Long menuId; - -} diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysUserPost.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysUserPost.java deleted file mode 100644 index 9efe37c..0000000 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysUserPost.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.admin.api.entity; - -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - *

    - * 用户岗位表 - *

    - * - * @author fxz - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class SysUserPost extends Model { - - private static final long serialVersionUID = 1L; - - /** - * 用户ID - */ - @Schema(description = "用户id") - private Long userId; - - /** - * 岗位ID - */ - @Schema(description = "岗位id") - private Long postId; - -} diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysUserRole.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysUserRole.java deleted file mode 100644 index ffb92d8..0000000 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysUserRole.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.api.entity; - -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - *

    - * 用户角色表 - *

    - * - * @author lengleng - * @since 2017-10-29 - */ -@Data -@Schema(description = "用户角色") -@EqualsAndHashCode(callSuper = true) -public class SysUserRole extends Model { - - private static final long serialVersionUID = 1L; - - /** - * 用户ID - */ - @Schema(description = "用户id") - private Long userId; - - /** - * 角色ID - */ - @Schema(description = "角色id") - private Long roleId; - -} diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteClientDetailsService.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteClientDetailsService.java deleted file mode 100644 index c5e788b..0000000 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteClientDetailsService.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.api.feign; - -import com.pig4cloud.pig.admin.api.entity.SysOauthClientDetails; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import com.pig4cloud.pig.common.core.constant.ServiceNameConstants; -import com.pig4cloud.pig.common.core.util.R; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestHeader; - -import java.util.List; - -/** - * @author lengleng - * @date 2020/12/05 - */ -@FeignClient(contextId = "remoteClientDetailsService", value = ServiceNameConstants.UPMS_SERVICE) -public interface RemoteClientDetailsService { - - /** - * 通过clientId 查询客户端信息 - * @param clientId 用户名 - * @param from 调用标志 - * @return R - */ - @GetMapping("/client/getClientDetailsById/{clientId}") - R getClientDetailsById(@PathVariable("clientId") String clientId, - @RequestHeader(SecurityConstants.FROM) String from); - - /** - * 查询全部客户端 - * @param from 调用标识 - * @return R - */ - @GetMapping("/client/list") - R> listClientDetails(@RequestHeader(SecurityConstants.FROM) String from); - -} diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteLogService.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteLogService.java deleted file mode 100644 index e9ad3b3..0000000 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteLogService.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.api.feign; - -import com.pig4cloud.pig.admin.api.entity.SysLog; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import com.pig4cloud.pig.common.core.constant.ServiceNameConstants; -import com.pig4cloud.pig.common.core.util.R; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; - -/** - * @author lengleng - * @date 2018/6/28 - */ -@FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.UPMS_SERVICE) -public interface RemoteLogService { - - /** - * 保存日志 - * @param sysLog 日志实体 - * @param from 是否内部调用 - * @return succes、false - */ - @PostMapping("/log/save") - R saveLog(@RequestBody SysLog sysLog, @RequestHeader(SecurityConstants.FROM) String from); - -} diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteUserService.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteUserService.java deleted file mode 100644 index fcb5d93..0000000 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteUserService.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.api.feign; - -import com.pig4cloud.pig.admin.api.dto.UserDTO; -import com.pig4cloud.pig.admin.api.dto.UserInfo; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import com.pig4cloud.pig.common.core.constant.ServiceNameConstants; -import com.pig4cloud.pig.common.core.util.R; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.cloud.openfeign.SpringQueryMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestHeader; - -/** - * @author lengleng - * @date 2018/6/22 - */ -@FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.UPMS_SERVICE) -public interface RemoteUserService { - - /** - * 通过用户名查询用户、角色信息 - * @param user 用户查询对象 - * @param from 调用标志 - * @return R - */ - @GetMapping("/user/info/query") - R info(@SpringQueryMap UserDTO user, @RequestHeader(SecurityConstants.FROM) String from); - - /** - * 锁定用户 - * @param username 用户名 - * @param from 调用标识 - * @return - */ - @PutMapping("/user/lock/{username}") - R lockUser(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM) String from); - -} diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/RoleVO.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/RoleVO.java deleted file mode 100644 index fde0bbe..0000000 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/RoleVO.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.admin.api.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -/** - * @author lengleng - * @date 2020/2/10 - */ -@Data -@Schema(description = "前端角色展示对象") -public class RoleVO { - - /** - * 角色id - */ - private Long roleId; - - /** - * 菜单列表 - */ - private String menuIds; - -} diff --git a/pig-upms/pig-upms-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports b/pig-upms/pig-upms-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports deleted file mode 100644 index cedeeaf..0000000 --- a/pig-upms/pig-upms-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports +++ /dev/null @@ -1,6 +0,0 @@ -com.pig4cloud.pig.admin.api.feign.RemoteClientDetailsService -com.pig4cloud.pig.admin.api.feign.RemoteDictService -com.pig4cloud.pig.admin.api.feign.RemoteLogService -com.pig4cloud.pig.admin.api.feign.RemoteParamService -com.pig4cloud.pig.admin.api.feign.RemoteTokenService -com.pig4cloud.pig.admin.api.feign.RemoteUserService diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/PigAdminApplication.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/PigAdminApplication.java deleted file mode 100644 index 8ad35a3..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/PigAdminApplication.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig; - -import com.pig4cloud.pig.common.security.annotation.EnablePigResourceServer; -import com.pig4cloud.pig.common.swagger.annotation.EnablePigDoc; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @author lengleng - * @date 2018年06月21日 - *

    - * 用户统一管理系统 - */ -@EnablePigDoc(value = "admin") -@EnablePigResourceServer -@SpringBootApplication -public class PigAdminApplication { - - public static void main(String[] args) { - SpringApplication.run(PigAdminApplication.class, args); - } - -} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysMobileController.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysMobileController.java deleted file mode 100644 index 31f5d08..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysMobileController.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.admin.controller; - -import com.pig4cloud.pig.admin.service.SysMobileService; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.security.annotation.Inner; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import org.springframework.http.HttpHeaders; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author lengleng - * @date 2018/11/14 - *

    - * 手机验证码 - */ -@RestController -@AllArgsConstructor -@RequestMapping("/mobile") -@Tag(description = "mobile", name = "手机管理模块") -@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) -public class SysMobileController { - - private final SysMobileService mobileService; - - @Inner(value = false) - @GetMapping("/{mobile}") - public R sendSmsCode(@PathVariable String mobile) { - return mobileService.sendSmsCode(mobile); - } - -} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDeptMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDeptMapper.java deleted file mode 100644 index 534eb29..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDeptMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pig4cloud.pig.admin.api.entity.SysDept; -import org.apache.ibatis.annotations.Mapper; - -/** - *

    - * 部门管理 Mapper 接口 - *

    - * - * @author lengleng - * @since 2018-01-20 - */ -@Mapper -public interface SysDeptMapper extends BaseMapper { - -} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDictItemMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDictItemMapper.java deleted file mode 100644 index 9016101..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDictItemMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ -package com.pig4cloud.pig.admin.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pig4cloud.pig.admin.api.entity.SysDictItem; -import org.apache.ibatis.annotations.Mapper; - -/** - * 字典项 - * - * @author lengleng - * @date 2019/03/19 - */ -@Mapper -public interface SysDictItemMapper extends BaseMapper { - -} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDictMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDictMapper.java deleted file mode 100644 index 5f13551..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDictMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pig4cloud.pig.admin.api.entity.SysDict; -import org.apache.ibatis.annotations.Mapper; - -/** - *

    - * 字典表 Mapper 接口 - *

    - * - * @author lengleng - * @since 2017-11-19 - */ -@Mapper -public interface SysDictMapper extends BaseMapper { - -} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysFileMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysFileMapper.java deleted file mode 100644 index 0c80a77..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysFileMapper.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.admin.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pig4cloud.pig.admin.api.entity.SysFile; -import org.apache.ibatis.annotations.Mapper; - -/** - * 文件管理 - * - * @author Luckly - * @date 2019-06-18 17:18:42 - */ -@Mapper -public interface SysFileMapper extends BaseMapper { - -} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysLogMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysLogMapper.java deleted file mode 100644 index 2f0d844..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysLogMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pig4cloud.pig.admin.api.entity.SysLog; -import org.apache.ibatis.annotations.Mapper; - -/** - *

    - * 日志表 Mapper 接口 - *

    - * - * @author lengleng - * @since 2017-11-20 - */ -@Mapper -public interface SysLogMapper extends BaseMapper { - -} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysMenuMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysMenuMapper.java deleted file mode 100644 index 86c65c2..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysMenuMapper.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pig4cloud.pig.admin.api.entity.SysMenu; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - *

    - * 菜单权限表 Mapper 接口 - *

    - * - * @author lengleng - * @since 2017-10-29 - */ -@Mapper -public interface SysMenuMapper extends BaseMapper { - - /** - * 通过角色编号查询菜单 - * @param roleId 角色ID - * @return - */ - List listMenusByRoleId(Long roleId); - -} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysOauthClientDetailsMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysOauthClientDetailsMapper.java deleted file mode 100644 index d1a2c9c..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysOauthClientDetailsMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pig4cloud.pig.admin.api.entity.SysOauthClientDetails; -import org.apache.ibatis.annotations.Mapper; - -/** - *

    - * Mapper 接口 - *

    - * - * @author lengleng - * @since 2018-05-15 - */ -@Mapper -public interface SysOauthClientDetailsMapper extends BaseMapper { - -} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysPostMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysPostMapper.java deleted file mode 100644 index e482467..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysPostMapper.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.admin.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pig4cloud.pig.admin.api.entity.SysPost; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 岗位信息表 - * - * @author fxz - * @date 2022-03-26 12:50:43 - */ -@Mapper -public interface SysPostMapper extends BaseMapper { - - /** - * 通过用户ID，查询岗位信息 - * @param userId 用户id - * @return 岗位信息 - */ - List listPostsByUserId(Long userId); - -} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysPublicParamMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysPublicParamMapper.java deleted file mode 100644 index 55a8659..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysPublicParamMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ -package com.pig4cloud.pig.admin.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pig4cloud.pig.admin.api.entity.SysPublicParam; -import org.apache.ibatis.annotations.Mapper; - -/** - * 公共参数配置 - * - * @author Lucky - * @date 2019-04-29 - */ -@Mapper -public interface SysPublicParamMapper extends BaseMapper { - -} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysRoleMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysRoleMapper.java deleted file mode 100644 index 8bed21e..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysRoleMapper.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pig4cloud.pig.admin.api.entity.SysRole; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - *

    - * Mapper 接口 - *

    - * - * @author lengleng - * @since 2017-10-29 - */ -@Mapper -public interface SysRoleMapper extends BaseMapper { - - /** - * 通过用户ID，查询角色信息 - * @param userId - * @return - */ - List listRolesByUserId(Long userId); - -} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysRoleMenuMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysRoleMenuMapper.java deleted file mode 100644 index 556f503..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysRoleMenuMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pig4cloud.pig.admin.api.entity.SysRoleMenu; -import org.apache.ibatis.annotations.Mapper; - -/** - *

    - * 角色菜单表 Mapper 接口 - *

    - * - * @author lengleng - * @since 2017-10-29 - */ -@Mapper -public interface SysRoleMenuMapper extends BaseMapper { - -} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserPostMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserPostMapper.java deleted file mode 100644 index 221a211..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserPostMapper.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.pig4cloud.pig.admin.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pig4cloud.pig.admin.api.entity.SysUserPost; -import org.apache.ibatis.annotations.Mapper; - -/** - *

    - * 用户岗位 Mapper 接口 - *

    - * - * @author fxz - * @since 2022/3/19 - */ -@Mapper -public interface SysUserPostMapper extends BaseMapper { - -} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserRoleMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserRoleMapper.java deleted file mode 100644 index ded9638..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserRoleMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pig4cloud.pig.admin.api.entity.SysUserRole; -import org.apache.ibatis.annotations.Mapper; - -/** - *

    - * 用户角色表 Mapper 接口 - *

    - * - * @author lengleng - * @since 2017-10-29 - */ -@Mapper -public interface SysUserRoleMapper extends BaseMapper { - -} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDeptService.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDeptService.java deleted file mode 100644 index 4153e6e..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDeptService.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.service; - -import cn.hutool.core.lang.tree.Tree; -import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pig.admin.api.entity.SysDept; -import com.pig4cloud.pig.admin.api.vo.DeptExcelVo; -import com.pig4cloud.pig.common.core.util.R; -import org.springframework.validation.BindingResult; - -import java.util.List; - -/** - *

    - * 部门管理 服务类 - *

    - * - * @author lengleng - * @since 2018-01-20 - */ -public interface SysDeptService extends IService { - - /** - * 查询部门树菜单 - * @param deptName 部门名称 - * @return 树 - */ - List> selectTree(String deptName); - - /** - * 删除部门 - * @param id 部门 ID - * @return 成功、失败 - */ - Boolean removeDeptById(Long id); - - List listExcelVo(); - - R importDept(List excelVOList, BindingResult bindingResult); - - /** - * 获取部门的所有后代部门列表 - * @param deptId 部门ID - * @return 后代部门列表 - */ - List listDescendant(Long deptId); - -} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDictItemService.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDictItemService.java deleted file mode 100644 index 8963eb3..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDictItemService.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ -package com.pig4cloud.pig.admin.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pig.admin.api.entity.SysDictItem; -import com.pig4cloud.pig.common.core.util.R; - -/** - * 字典项 - * - * @author lengleng - * @date 2019/03/19 - */ -public interface SysDictItemService extends IService { - - /** - * 删除字典项 - * @param id 字典项ID - * @return - */ - R removeDictItem(Long id); - - /** - * 更新字典项 - * @param item 字典项 - * @return - */ - R updateDictItem(SysDictItem item); - -} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDictService.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDictService.java deleted file mode 100644 index 9077962..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDictService.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ -package com.pig4cloud.pig.admin.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pig.admin.api.entity.SysDict; -import com.pig4cloud.pig.common.core.util.R; - -/** - * 字典表 - * - * @author lengleng - * @date 2019/03/19 - */ -public interface SysDictService extends IService { - - /** - * 根据ID 删除字典 - * @param ids ID列表 - * @return - */ - R removeDictByIds(Long[] ids); - - /** - * 更新字典 - * @param sysDict 字典 - * @return - */ - R updateDict(SysDict sysDict); - - /** - * 同步缓存 （清空缓存） - * @return R - */ - R syncDictCache(); - -} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysFileService.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysFileService.java deleted file mode 100644 index 2ca5ba7..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysFileService.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.admin.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pig.admin.api.entity.SysFile; -import com.pig4cloud.pig.common.core.util.R; -import jakarta.servlet.http.HttpServletResponse; -import org.springframework.web.multipart.MultipartFile; - -/** - * 文件管理 - * - * @author Luckly - * @date 2019-06-18 17:18:42 - */ -public interface SysFileService extends IService { - - /** - * 上传文件 - * @param file - * @return - */ - R uploadFile(MultipartFile file); - - /** - * 读取文件 - * @param bucket 桶名称 - * @param fileName 文件名称 - * @param response 输出流 - */ - void getFile(String bucket, String fileName, HttpServletResponse response); - - /** - * 删除文件 - * @param id - * @return - */ - Boolean deleteFile(Long id); - -} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysLogService.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysLogService.java deleted file mode 100644 index 7fe4dc7..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysLogService.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.service; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pig.admin.api.dto.SysLogDTO; -import com.pig4cloud.pig.admin.api.entity.SysLog; - -/** - *

    - * 日志表 服务类 - *

    - * - * @author lengleng - * @since 2017-11-20 - */ -public interface SysLogService extends IService { - - /** - * 分页查询日志 - * @param page - * @param sysLog - * @return - */ - Page getLogByPage(Page page, SysLogDTO sysLog); - - /** - * 插入日志 - * @param sysLog 日志对象 - * @return true/false - */ - Boolean saveLog(SysLog sysLog); - -} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysMobileService.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysMobileService.java deleted file mode 100644 index d102831..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysMobileService.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.admin.service; - -import com.pig4cloud.pig.common.core.util.R; - -/** - * @author lengleng - * @date 2018/11/14 - */ -public interface SysMobileService { - - /** - * 发送手机验证码 - * @param mobile mobile - * @return code - */ - R sendSmsCode(String mobile); - -} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysOauthClientDetailsService.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysOauthClientDetailsService.java deleted file mode 100644 index 110c7c9..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysOauthClientDetailsService.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.service; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pig.admin.api.entity.SysOauthClientDetails; -import com.pig4cloud.pig.common.core.util.R; - -/** - *

    - * 服务类 - *

    - * - * @author lengleng - * @since 2018-05-15 - */ -public interface SysOauthClientDetailsService extends IService { - - /** - * 根据客户端信息 - * @param clientDetails - * @return - */ - Boolean updateClientById(SysOauthClientDetails clientDetails); - - /** - * 添加客户端 - * @param clientDetails - * @return - */ - Boolean saveClient(SysOauthClientDetails clientDetails); - - /** - * 分页查询客户端信息 - * @param page - * @param query - * @return - */ - Page queryPage(Page page, SysOauthClientDetails query); - - /** - * 同步缓存 （清空缓存） - * @return R - */ - R syncClientCache(); - -} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysPostService.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysPostService.java deleted file mode 100644 index e7349fa..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysPostService.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.admin.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pig.admin.api.entity.SysPost; -import com.pig4cloud.pig.admin.api.vo.PostExcelVO; -import com.pig4cloud.pig.common.core.util.R; -import org.springframework.validation.BindingResult; - -import java.util.List; - -/** - * 岗位信息表 - * - * @author fxz - * @date 2022-03-26 12:50:43 - */ -public interface SysPostService extends IService { - - /** - * 导出excel 表格 - * @return - */ - List listPost(); - - /** - * 导入岗位 - * @param excelVOList 岗位列表 - * @param bindingResult 错误信息列表 - * @return ok fail - */ - R importPost(List excelVOList, BindingResult bindingResult); - -} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysPublicParamService.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysPublicParamService.java deleted file mode 100644 index e6f50ee..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysPublicParamService.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.admin.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pig.admin.api.entity.SysPublicParam; -import com.pig4cloud.pig.common.core.util.R; - -/** - * 公共参数配置 - * - * @author Lucky - * @date 2019-04-29 - */ -public interface SysPublicParamService extends IService { - - /** - * 通过key查询公共参数指定值 - * @param publicKey - * @return - */ - String getSysPublicParamKeyToValue(String publicKey); - - /** - * 更新参数 - * @param sysPublicParam - * @return - */ - R updateParam(SysPublicParam sysPublicParam); - - /** - * 删除参数 - * @param publicIds 参数列表 - * @return - */ - R removeParamByIds(Long[] publicIds); - - /** - * 同步缓存 - * @return R - */ - R syncParamCache(); - -} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysRoleMenuService.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysRoleMenuService.java deleted file mode 100644 index 73a13c6..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysRoleMenuService.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pig.admin.api.entity.SysRoleMenu; - -/** - *

    - * 角色菜单表 服务类 - *

    - * - * @author lengleng - * @since 2017-10-29 - */ -public interface SysRoleMenuService extends IService { - - /** - * 更新角色菜单 - * @param roleId 角色ID - * @param menuIds 菜单ID拼成的字符串，每个id之间根据逗号分隔 - * @return - */ - Boolean saveRoleMenus(Long roleId, String menuIds); - -} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysUserRoleService.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysUserRoleService.java deleted file mode 100644 index b86a402..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysUserRoleService.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pig.admin.api.entity.SysUserRole; - -/** - *

    - * 用户角色表 服务类 - *

    - * - * @author lengleng - * @since 2017-10-29 - */ -public interface SysUserRoleService extends IService { - -} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysUserRoleServiceImpl.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysUserRoleServiceImpl.java deleted file mode 100644 index 820d420..0000000 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysUserRoleServiceImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pig.admin.api.entity.SysUserRole; -import com.pig4cloud.pig.admin.mapper.SysUserRoleMapper; -import com.pig4cloud.pig.admin.service.SysUserRoleService; -import org.springframework.stereotype.Service; - -/** - *

    - * 用户角色表 服务实现类 - *

    - * - * @author lengleng - * @since 2017-10-29 - */ -@Service -public class SysUserRoleServiceImpl extends ServiceImpl implements SysUserRoleService { - -} diff --git a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysDeptMapper.xml b/pig-upms/pig-upms-biz/src/main/resources/mapper/SysDeptMapper.xml deleted file mode 100644 index 25dcf12..0000000 --- a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysDeptMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - diff --git a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysPostMapper.xml b/pig-upms/pig-upms-biz/src/main/resources/mapper/SysPostMapper.xml deleted file mode 100644 index eaf2927..0000000 --- a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysPostMapper.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/pig-upms/pom.xml b/pig-upms/pom.xml deleted file mode 100644 index 2e3edcb..0000000 --- a/pig-upms/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - 4.0.0 - - com.pig4cloud - pig - 3.7.3 - - - pig-upms - - pig 通用用户权限管理聚合模块 - pom - - - pig-upms-api - pig-upms-biz - - diff --git a/pom.xml b/pom.xml index c9fef16..46cdf1c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,30 +1,14 @@ - 4.0.0 - com.pig4cloud - pig + com.rax + rax ${project.artifactId} 3.7.3 pom - https://www.pig4cloud.com 3.2.1 @@ -48,12 +32,14 @@ 0.32.0 http://192.168.0.100:2375 registry.cn-shanghai.aliyuncs.com - pig4cloud + rax username password 6.0.0 0.0.39 3.11.0 + 5.8.25 + @@ -102,24 +88,26 @@ - - pig-codegen - - pig-quartz - - pig-auth - - pig-upms - - pig-common - + + codegen + + quartz + + auth + + upms + + common + + vital-signs + - + - com.pig4cloud - pig-common-bom + com.rax + common-bom ${project.version} pom import @@ -197,7 +185,7 @@ - + ${docker.registry}/${docker.namespace}/${project.name}:${project.version} ${project.basedir}/Dockerfile diff --git a/pig-quartz/Dockerfile b/quartz/Dockerfile similarity index 80% rename from pig-quartz/Dockerfile rename to quartz/Dockerfile index dda0ae4..55bf4e1 100644 --- a/pig-quartz/Dockerfile +++ b/quartz/Dockerfile @@ -1,8 +1,8 @@ FROM alibabadragonwell/dragonwell:17-anolis -WORKDIR /pig-quartz +WORKDIR /quartz -ARG JAR_FILE=target/pig-quartz.jar +ARG JAR_FILE=target/quartz.jar COPY ${JAR_FILE} app.jar diff --git a/pig-quartz/pom.xml b/quartz/pom.xml similarity index 63% rename from pig-quartz/pom.xml rename to quartz/pom.xml index b34596d..b3f5953 100644 --- a/pig-quartz/pom.xml +++ b/quartz/pom.xml @@ -3,13 +3,13 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.pig4cloud - pig + com.rax + rax 3.7.3 4.0.0 - pig-quartz + quartz jar 基于quartz后台定时任务模块 @@ -17,28 +17,28 @@ - com.pig4cloud - pig-common-log + com.rax + common-log - com.pig4cloud - pig-common-feign + com.rax + common-feign - com.pig4cloud - pig-common-mybatis + com.rax + common-mybatis - com.pig4cloud - pig-common-swagger + com.rax + common-swagger - com.pig4cloud - pig-common-security + com.rax + common-security diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/config/AutowireCapableBeanJobFactory.java b/quartz/src/main/java/com/rax/daemon/quartz/config/AutowireCapableBeanJobFactory.java similarity index 97% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/config/AutowireCapableBeanJobFactory.java rename to quartz/src/main/java/com/rax/daemon/quartz/config/AutowireCapableBeanJobFactory.java index 679a3a4..5ba9ea4 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/config/AutowireCapableBeanJobFactory.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/config/AutowireCapableBeanJobFactory.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.config; +package com.rax.daemon.quartz.config; import org.quartz.JobKey; import org.quartz.spi.TriggerFiredBundle; diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/config/PigInitQuartzJob.java b/quartz/src/main/java/com/rax/daemon/quartz/config/PigInitQuartzJob.java similarity index 87% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/config/PigInitQuartzJob.java rename to quartz/src/main/java/com/rax/daemon/quartz/config/PigInitQuartzJob.java index 3b18e02..7fc0ea4 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/config/PigInitQuartzJob.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/config/PigInitQuartzJob.java @@ -15,16 +15,15 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.config; +package com.rax.daemon.quartz.config; -import com.pig4cloud.pig.daemon.quartz.constants.PigQuartzEnum; -import com.pig4cloud.pig.daemon.quartz.service.SysJobService; -import com.pig4cloud.pig.daemon.quartz.util.TaskUtil; +import com.rax.daemon.quartz.constants.PigQuartzEnum; +import com.rax.daemon.quartz.service.SysJobService; +import com.rax.daemon.quartz.util.TaskUtil; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.quartz.Scheduler; import org.springframework.beans.factory.InitializingBean; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; /** diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/config/PigQuartzConfig.java b/quartz/src/main/java/com/rax/daemon/quartz/config/PigQuartzConfig.java similarity index 98% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/config/PigQuartzConfig.java rename to quartz/src/main/java/com/rax/daemon/quartz/config/PigQuartzConfig.java index 76dfe30..34e20e9 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/config/PigQuartzConfig.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/config/PigQuartzConfig.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.config; +package com.rax.daemon.quartz.config; import org.quartz.Calendar; import org.quartz.JobDetail; diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/config/PigQuartzCustomizerConfig.java b/quartz/src/main/java/com/rax/daemon/quartz/config/PigQuartzCustomizerConfig.java similarity index 96% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/config/PigQuartzCustomizerConfig.java rename to quartz/src/main/java/com/rax/daemon/quartz/config/PigQuartzCustomizerConfig.java index 1ef6c1d..58c137e 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/config/PigQuartzCustomizerConfig.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/config/PigQuartzCustomizerConfig.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.config; +package com.rax.daemon.quartz.config; import org.springframework.boot.autoconfigure.quartz.SchedulerFactoryBeanCustomizer; import org.springframework.context.annotation.Configuration; diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/config/PigQuartzFactory.java b/quartz/src/main/java/com/rax/daemon/quartz/config/PigQuartzFactory.java similarity index 90% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/config/PigQuartzFactory.java rename to quartz/src/main/java/com/rax/daemon/quartz/config/PigQuartzFactory.java index 6617695..2339676 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/config/PigQuartzFactory.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/config/PigQuartzFactory.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.config; +package com.rax.daemon.quartz.config; -import com.pig4cloud.pig.daemon.quartz.constants.PigQuartzEnum; -import com.pig4cloud.pig.daemon.quartz.entity.SysJob; +import com.rax.daemon.quartz.constants.PigQuartzEnum; +import com.rax.daemon.quartz.entity.SysJob; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.quartz.DisallowConcurrentExecution; diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/config/PigQuartzInvokeFactory.java b/quartz/src/main/java/com/rax/daemon/quartz/config/PigQuartzInvokeFactory.java similarity index 89% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/config/PigQuartzInvokeFactory.java rename to quartz/src/main/java/com/rax/daemon/quartz/config/PigQuartzInvokeFactory.java index 75e4fa4..5bc2661 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/config/PigQuartzInvokeFactory.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/config/PigQuartzInvokeFactory.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.config; +package com.rax.daemon.quartz.config; -import com.pig4cloud.pig.daemon.quartz.entity.SysJob; -import com.pig4cloud.pig.daemon.quartz.event.SysJobEvent; +import com.rax.daemon.quartz.entity.SysJob; +import com.rax.daemon.quartz.event.SysJobEvent; import lombok.AllArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/constants/JobTypeQuartzEnum.java b/quartz/src/main/java/com/rax/daemon/quartz/constants/JobTypeQuartzEnum.java similarity index 96% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/constants/JobTypeQuartzEnum.java rename to quartz/src/main/java/com/rax/daemon/quartz/constants/JobTypeQuartzEnum.java index b4e597a..704aa37 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/constants/JobTypeQuartzEnum.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/constants/JobTypeQuartzEnum.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.constants; +package com.rax.daemon.quartz.constants; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/constants/PigQuartzEnum.java b/quartz/src/main/java/com/rax/daemon/quartz/constants/PigQuartzEnum.java similarity index 97% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/constants/PigQuartzEnum.java rename to quartz/src/main/java/com/rax/daemon/quartz/constants/PigQuartzEnum.java index 0f12b08..a28504d 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/constants/PigQuartzEnum.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/constants/PigQuartzEnum.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.constants; +package com.rax.daemon.quartz.constants; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/controller/SysJobController.java b/quartz/src/main/java/com/rax/daemon/quartz/controller/SysJobController.java similarity index 94% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/controller/SysJobController.java rename to quartz/src/main/java/com/rax/daemon/quartz/controller/SysJobController.java index dd0dfb6..b36301b 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/controller/SysJobController.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/controller/SysJobController.java @@ -15,23 +15,23 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.controller; +package com.rax.daemon.quartz.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.log.annotation.SysLog; -import com.pig4cloud.pig.common.security.util.SecurityUtils; -import com.pig4cloud.pig.daemon.quartz.constants.PigQuartzEnum; -import com.pig4cloud.pig.daemon.quartz.entity.SysJob; -import com.pig4cloud.pig.daemon.quartz.entity.SysJobLog; -import com.pig4cloud.pig.daemon.quartz.service.SysJobLogService; -import com.pig4cloud.pig.daemon.quartz.service.SysJobService; -import com.pig4cloud.pig.daemon.quartz.util.TaskUtil; -import com.pig4cloud.plugin.excel.annotation.ResponseExcel; +import com.rax.common.core.util.R; +import com.rax.common.log.annotation.SysLog; +import com.rax.common.security.util.SecurityUtils; +import com.rax.daemon.quartz.constants.PigQuartzEnum; +import com.rax.daemon.quartz.entity.SysJob; +import com.rax.daemon.quartz.entity.SysJobLog; +import com.rax.daemon.quartz.service.SysJobLogService; +import com.rax.daemon.quartz.service.SysJobService; +import com.rax.daemon.quartz.util.TaskUtil; +import com.rax.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/controller/SysJobLogController.java b/quartz/src/main/java/com/rax/daemon/quartz/controller/SysJobLogController.java similarity index 90% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/controller/SysJobLogController.java rename to quartz/src/main/java/com/rax/daemon/quartz/controller/SysJobLogController.java index 4392f03..64d701d 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/controller/SysJobLogController.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/controller/SysJobLogController.java @@ -15,14 +15,14 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.controller; +package com.rax.daemon.quartz.controller; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.daemon.quartz.entity.SysJobLog; -import com.pig4cloud.pig.daemon.quartz.service.SysJobLogService; +import com.rax.common.core.util.R; +import com.rax.daemon.quartz.entity.SysJobLog; +import com.rax.daemon.quartz.service.SysJobLogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/entity/SysJob.java b/quartz/src/main/java/com/rax/daemon/quartz/entity/SysJob.java similarity index 98% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/entity/SysJob.java rename to quartz/src/main/java/com/rax/daemon/quartz/entity/SysJob.java index 3d3ca84..37ec213 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/entity/SysJob.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/entity/SysJob.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.entity; +package com.rax.daemon.quartz.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/entity/SysJobLog.java b/quartz/src/main/java/com/rax/daemon/quartz/entity/SysJobLog.java similarity index 98% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/entity/SysJobLog.java rename to quartz/src/main/java/com/rax/daemon/quartz/entity/SysJobLog.java index 9418e66..1f08854 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/entity/SysJobLog.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/entity/SysJobLog.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.entity; +package com.rax.daemon.quartz.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/event/SysJobEvent.java b/quartz/src/main/java/com/rax/daemon/quartz/event/SysJobEvent.java similarity index 91% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/event/SysJobEvent.java rename to quartz/src/main/java/com/rax/daemon/quartz/event/SysJobEvent.java index 981f91a..ae4c765 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/event/SysJobEvent.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/event/SysJobEvent.java @@ -15,9 +15,9 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.event; +package com.rax.daemon.quartz.event; -import com.pig4cloud.pig.daemon.quartz.entity.SysJob; +import com.rax.daemon.quartz.entity.SysJob; import lombok.AllArgsConstructor; import lombok.Getter; import org.quartz.Trigger; diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/event/SysJobListener.java b/quartz/src/main/java/com/rax/daemon/quartz/event/SysJobListener.java similarity index 90% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/event/SysJobListener.java rename to quartz/src/main/java/com/rax/daemon/quartz/event/SysJobListener.java index 27e4140..914537a 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/event/SysJobListener.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/event/SysJobListener.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.event; +package com.rax.daemon.quartz.event; -import com.pig4cloud.pig.daemon.quartz.entity.SysJob; -import com.pig4cloud.pig.daemon.quartz.util.TaskInvokUtil; +import com.rax.daemon.quartz.entity.SysJob; +import com.rax.daemon.quartz.util.TaskInvokUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.quartz.Trigger; diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/event/SysJobLogEvent.java b/quartz/src/main/java/com/rax/daemon/quartz/event/SysJobLogEvent.java similarity index 90% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/event/SysJobLogEvent.java rename to quartz/src/main/java/com/rax/daemon/quartz/event/SysJobLogEvent.java index 0351d36..94c3ad5 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/event/SysJobLogEvent.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/event/SysJobLogEvent.java @@ -15,9 +15,9 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.event; +package com.rax.daemon.quartz.event; -import com.pig4cloud.pig.daemon.quartz.entity.SysJobLog; +import com.rax.daemon.quartz.entity.SysJobLog; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/event/SysJobLogListener.java b/quartz/src/main/java/com/rax/daemon/quartz/event/SysJobLogListener.java similarity index 90% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/event/SysJobLogListener.java rename to quartz/src/main/java/com/rax/daemon/quartz/event/SysJobLogListener.java index e7f9c37..52585fb 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/event/SysJobLogListener.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/event/SysJobLogListener.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.event; +package com.rax.daemon.quartz.event; -import com.pig4cloud.pig.daemon.quartz.entity.SysJobLog; -import com.pig4cloud.pig.daemon.quartz.service.SysJobLogService; +import com.rax.daemon.quartz.entity.SysJobLog; +import com.rax.daemon.quartz.service.SysJobLogService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/exception/TaskException.java b/quartz/src/main/java/com/rax/daemon/quartz/exception/TaskException.java similarity index 95% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/exception/TaskException.java rename to quartz/src/main/java/com/rax/daemon/quartz/exception/TaskException.java index 9ed8730..f40d1e9 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/exception/TaskException.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/exception/TaskException.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.exception; +package com.rax.daemon.quartz.exception; /** * 定时任务异常 diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/mapper/SysJobLogMapper.java b/quartz/src/main/java/com/rax/daemon/quartz/mapper/SysJobLogMapper.java similarity index 91% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/mapper/SysJobLogMapper.java rename to quartz/src/main/java/com/rax/daemon/quartz/mapper/SysJobLogMapper.java index 9a19149..6202047 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/mapper/SysJobLogMapper.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/mapper/SysJobLogMapper.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.mapper; +package com.rax.daemon.quartz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pig4cloud.pig.daemon.quartz.entity.SysJobLog; +import com.rax.daemon.quartz.entity.SysJobLog; import org.apache.ibatis.annotations.Mapper; /** diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/mapper/SysJobMapper.java b/quartz/src/main/java/com/rax/daemon/quartz/mapper/SysJobMapper.java similarity index 91% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/mapper/SysJobMapper.java rename to quartz/src/main/java/com/rax/daemon/quartz/mapper/SysJobMapper.java index ebb092d..a8a94ea 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/mapper/SysJobMapper.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/mapper/SysJobMapper.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.mapper; +package com.rax.daemon.quartz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pig4cloud.pig.daemon.quartz.entity.SysJob; +import com.rax.daemon.quartz.entity.SysJob; import org.apache.ibatis.annotations.Mapper; /** diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/service/SysJobLogService.java b/quartz/src/main/java/com/rax/daemon/quartz/service/SysJobLogService.java similarity index 90% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/service/SysJobLogService.java rename to quartz/src/main/java/com/rax/daemon/quartz/service/SysJobLogService.java index 5539541..0f97af3 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/service/SysJobLogService.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/service/SysJobLogService.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.service; +package com.rax.daemon.quartz.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pig.daemon.quartz.entity.SysJobLog; +import com.rax.daemon.quartz.entity.SysJobLog; /** * 定时任务执行日志表 diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/service/SysJobService.java b/quartz/src/main/java/com/rax/daemon/quartz/service/SysJobService.java similarity index 90% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/service/SysJobService.java rename to quartz/src/main/java/com/rax/daemon/quartz/service/SysJobService.java index fd7e3ad..db82378 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/service/SysJobService.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/service/SysJobService.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.service; +package com.rax.daemon.quartz.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pig.daemon.quartz.entity.SysJob; +import com.rax.daemon.quartz.entity.SysJob; /** * 定时任务调度表 diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/service/impl/SysJobLogServiceImpl.java b/quartz/src/main/java/com/rax/daemon/quartz/service/impl/SysJobLogServiceImpl.java similarity index 83% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/service/impl/SysJobLogServiceImpl.java rename to quartz/src/main/java/com/rax/daemon/quartz/service/impl/SysJobLogServiceImpl.java index 23093c5..b2673bf 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/service/impl/SysJobLogServiceImpl.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/service/impl/SysJobLogServiceImpl.java @@ -15,12 +15,12 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.service.impl; +package com.rax.daemon.quartz.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pig.daemon.quartz.entity.SysJobLog; -import com.pig4cloud.pig.daemon.quartz.mapper.SysJobLogMapper; -import com.pig4cloud.pig.daemon.quartz.service.SysJobLogService; +import com.rax.daemon.quartz.entity.SysJobLog; +import com.rax.daemon.quartz.mapper.SysJobLogMapper; +import com.rax.daemon.quartz.service.SysJobLogService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/service/impl/SysJobServiceImpl.java b/quartz/src/main/java/com/rax/daemon/quartz/service/impl/SysJobServiceImpl.java similarity index 84% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/service/impl/SysJobServiceImpl.java rename to quartz/src/main/java/com/rax/daemon/quartz/service/impl/SysJobServiceImpl.java index 3ccdc26..c3241ef 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/service/impl/SysJobServiceImpl.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/service/impl/SysJobServiceImpl.java @@ -15,12 +15,12 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.service.impl; +package com.rax.daemon.quartz.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pig.daemon.quartz.entity.SysJob; -import com.pig4cloud.pig.daemon.quartz.mapper.SysJobMapper; -import com.pig4cloud.pig.daemon.quartz.service.SysJobService; +import com.rax.daemon.quartz.entity.SysJob; +import com.rax.daemon.quartz.mapper.SysJobMapper; +import com.rax.daemon.quartz.service.SysJobService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/task/RestTaskDemo.java b/quartz/src/main/java/com/rax/daemon/quartz/task/RestTaskDemo.java similarity index 83% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/task/RestTaskDemo.java rename to quartz/src/main/java/com/rax/daemon/quartz/task/RestTaskDemo.java index 188769d..4f3eb53 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/task/RestTaskDemo.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/task/RestTaskDemo.java @@ -1,7 +1,7 @@ -package com.pig4cloud.pig.daemon.quartz.task; +package com.rax.daemon.quartz.task; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.security.annotation.Inner; +import com.rax.common.core.util.R; +import com.rax.common.security.annotation.Inner; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/task/SpringBeanTaskDemo.java b/quartz/src/main/java/com/rax/daemon/quartz/task/SpringBeanTaskDemo.java similarity index 92% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/task/SpringBeanTaskDemo.java rename to quartz/src/main/java/com/rax/daemon/quartz/task/SpringBeanTaskDemo.java index 7167cb4..25cbc9e 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/task/SpringBeanTaskDemo.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/task/SpringBeanTaskDemo.java @@ -15,9 +15,9 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.task; +package com.rax.daemon.quartz.task; -import com.pig4cloud.pig.daemon.quartz.constants.PigQuartzEnum; +import com.rax.daemon.quartz.constants.PigQuartzEnum; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/util/ITaskInvok.java b/quartz/src/main/java/com/rax/daemon/quartz/util/ITaskInvok.java similarity index 86% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/util/ITaskInvok.java rename to quartz/src/main/java/com/rax/daemon/quartz/util/ITaskInvok.java index 8db5e56..ca0a5ca 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/util/ITaskInvok.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/util/ITaskInvok.java @@ -15,10 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.util; +package com.rax.daemon.quartz.util; -import com.pig4cloud.pig.daemon.quartz.entity.SysJob; -import com.pig4cloud.pig.daemon.quartz.exception.TaskException; +import com.rax.daemon.quartz.entity.SysJob; +import com.rax.daemon.quartz.exception.TaskException; /** * 定时任务反射实现接口类 diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/util/JarTaskInvok.java b/quartz/src/main/java/com/rax/daemon/quartz/util/JarTaskInvok.java similarity index 92% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/util/JarTaskInvok.java rename to quartz/src/main/java/com/rax/daemon/quartz/util/JarTaskInvok.java index 87c49c3..fbab364 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/util/JarTaskInvok.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/util/JarTaskInvok.java @@ -15,11 +15,11 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.util; +package com.rax.daemon.quartz.util; import cn.hutool.core.util.StrUtil; -import com.pig4cloud.pig.daemon.quartz.entity.SysJob; -import com.pig4cloud.pig.daemon.quartz.exception.TaskException; +import com.rax.daemon.quartz.entity.SysJob; +import com.rax.daemon.quartz.exception.TaskException; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/util/JavaClassTaskInvok.java b/quartz/src/main/java/com/rax/daemon/quartz/util/JavaClassTaskInvok.java similarity index 93% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/util/JavaClassTaskInvok.java rename to quartz/src/main/java/com/rax/daemon/quartz/util/JavaClassTaskInvok.java index d820604..bbd6d46 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/util/JavaClassTaskInvok.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/util/JavaClassTaskInvok.java @@ -15,12 +15,12 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.util; +package com.rax.daemon.quartz.util; import cn.hutool.core.util.StrUtil; -import com.pig4cloud.pig.daemon.quartz.constants.PigQuartzEnum; -import com.pig4cloud.pig.daemon.quartz.entity.SysJob; -import com.pig4cloud.pig.daemon.quartz.exception.TaskException; +import com.rax.daemon.quartz.constants.PigQuartzEnum; +import com.rax.daemon.quartz.entity.SysJob; +import com.rax.daemon.quartz.exception.TaskException; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/util/RestTaskInvok.java b/quartz/src/main/java/com/rax/daemon/quartz/util/RestTaskInvok.java similarity index 90% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/util/RestTaskInvok.java rename to quartz/src/main/java/com/rax/daemon/quartz/util/RestTaskInvok.java index e4536cf..d8da100 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/util/RestTaskInvok.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/util/RestTaskInvok.java @@ -15,12 +15,12 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.util; +package com.rax.daemon.quartz.util; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpUtil; -import com.pig4cloud.pig.daemon.quartz.entity.SysJob; -import com.pig4cloud.pig.daemon.quartz.exception.TaskException; +import com.rax.daemon.quartz.entity.SysJob; +import com.rax.daemon.quartz.exception.TaskException; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/util/SpringBeanTaskInvok.java b/quartz/src/main/java/com/rax/daemon/quartz/util/SpringBeanTaskInvok.java similarity index 91% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/util/SpringBeanTaskInvok.java rename to quartz/src/main/java/com/rax/daemon/quartz/util/SpringBeanTaskInvok.java index bb47d46..a57f428 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/util/SpringBeanTaskInvok.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/util/SpringBeanTaskInvok.java @@ -15,13 +15,13 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.util; +package com.rax.daemon.quartz.util; import cn.hutool.core.util.StrUtil; -import com.pig4cloud.pig.common.core.util.SpringContextHolder; -import com.pig4cloud.pig.daemon.quartz.constants.PigQuartzEnum; -import com.pig4cloud.pig.daemon.quartz.entity.SysJob; -import com.pig4cloud.pig.daemon.quartz.exception.TaskException; +import com.rax.common.core.util.SpringContextHolder; +import com.rax.daemon.quartz.constants.PigQuartzEnum; +import com.rax.daemon.quartz.entity.SysJob; +import com.rax.daemon.quartz.exception.TaskException; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.util.ReflectionUtils; diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/util/TaskInvokFactory.java b/quartz/src/main/java/com/rax/daemon/quartz/util/TaskInvokFactory.java similarity index 84% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/util/TaskInvokFactory.java rename to quartz/src/main/java/com/rax/daemon/quartz/util/TaskInvokFactory.java index 0d0ae0d..21b86e5 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/util/TaskInvokFactory.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/util/TaskInvokFactory.java @@ -1,9 +1,9 @@ -package com.pig4cloud.pig.daemon.quartz.util; +package com.rax.daemon.quartz.util; import cn.hutool.core.util.StrUtil; -import com.pig4cloud.pig.common.core.util.SpringContextHolder; -import com.pig4cloud.pig.daemon.quartz.constants.JobTypeQuartzEnum; -import com.pig4cloud.pig.daemon.quartz.exception.TaskException; +import com.rax.common.core.util.SpringContextHolder; +import com.rax.daemon.quartz.constants.JobTypeQuartzEnum; +import com.rax.daemon.quartz.exception.TaskException; import lombok.extern.slf4j.Slf4j; /** diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/util/TaskInvokUtil.java b/quartz/src/main/java/com/rax/daemon/quartz/util/TaskInvokUtil.java similarity index 92% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/util/TaskInvokUtil.java rename to quartz/src/main/java/com/rax/daemon/quartz/util/TaskInvokUtil.java index 2f5fc2f..c9c625e 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/util/TaskInvokUtil.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/util/TaskInvokUtil.java @@ -15,14 +15,14 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.util; +package com.rax.daemon.quartz.util; import cn.hutool.core.util.StrUtil; -import com.pig4cloud.pig.daemon.quartz.constants.PigQuartzEnum; -import com.pig4cloud.pig.daemon.quartz.entity.SysJob; -import com.pig4cloud.pig.daemon.quartz.entity.SysJobLog; -import com.pig4cloud.pig.daemon.quartz.event.SysJobLogEvent; -import com.pig4cloud.pig.daemon.quartz.service.SysJobService; +import com.rax.daemon.quartz.constants.PigQuartzEnum; +import com.rax.daemon.quartz.entity.SysJob; +import com.rax.daemon.quartz.entity.SysJobLog; +import com.rax.daemon.quartz.event.SysJobLogEvent; +import com.rax.daemon.quartz.service.SysJobService; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/util/TaskUtil.java b/quartz/src/main/java/com/rax/daemon/quartz/util/TaskUtil.java similarity index 96% rename from pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/util/TaskUtil.java rename to quartz/src/main/java/com/rax/daemon/quartz/util/TaskUtil.java index 5890de0..128d53f 100644 --- a/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/util/TaskUtil.java +++ b/quartz/src/main/java/com/rax/daemon/quartz/util/TaskUtil.java @@ -15,11 +15,11 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pig.daemon.quartz.util; +package com.rax.daemon.quartz.util; -import com.pig4cloud.pig.daemon.quartz.config.PigQuartzFactory; -import com.pig4cloud.pig.daemon.quartz.constants.PigQuartzEnum; -import com.pig4cloud.pig.daemon.quartz.entity.SysJob; +import com.rax.daemon.quartz.config.PigQuartzFactory; +import com.rax.daemon.quartz.constants.PigQuartzEnum; +import com.rax.daemon.quartz.entity.SysJob; import lombok.extern.slf4j.Slf4j; import org.quartz.*; import org.springframework.stereotype.Component; diff --git a/upms/pom.xml b/upms/pom.xml new file mode 100644 index 0000000..fc3fea4 --- /dev/null +++ b/upms/pom.xml @@ -0,0 +1,21 @@ + + + + 4.0.0 + + com.rax + rax + 3.7.3 + + + upms + + 通用用户权限管理聚合模块 + pom + + + upms-api + upms-biz + + diff --git a/upms/upms-api/pom.xml b/upms/upms-api/pom.xml new file mode 100644 index 0000000..b802c53 --- /dev/null +++ b/upms/upms-api/pom.xml @@ -0,0 +1,40 @@ + + + + 4.0.0 + + com.rax + upms + 3.7.3 + + + upms-api + jar + + 通用用户权限管理系统公共api模块 + + + + + + com.rax + common-core + + + + org.springframework.cloud + spring-cloud-openfeign-core + true + + + + com.rax + common-mybatis + + + com.rax + excel-spring-boot-starter + + + diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/SysLogDTO.java b/upms/upms-api/src/main/java/com/rax/admin/api/dto/SysLogDTO.java similarity index 96% rename from pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/SysLogDTO.java rename to upms/upms-api/src/main/java/com/rax/admin/api/dto/SysLogDTO.java index 032c5a5..83e899e 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/SysLogDTO.java +++ b/upms/upms-api/src/main/java/com/rax/admin/api/dto/SysLogDTO.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.admin.api.dto; +package com.rax.admin.api.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/upms/upms-api/src/main/java/com/rax/admin/api/dto/UserDTO.java b/upms/upms-api/src/main/java/com/rax/admin/api/dto/UserDTO.java new file mode 100644 index 0000000..e93770c --- /dev/null +++ b/upms/upms-api/src/main/java/com/rax/admin/api/dto/UserDTO.java @@ -0,0 +1,42 @@ +package com.rax.admin.api.dto; + +import com.rax.admin.api.entity.SysUser; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +/** + * @author lengleng + * @date 2017/11/5 + */ +@Data +@Schema(description = "系统用户传输对象") +@EqualsAndHashCode(callSuper = true) +public class UserDTO extends SysUser { + + /** + * 角色ID + */ + @Schema(description = "角色id集合") + private List role; + + /** + * 部门id + */ + @Schema(description = "部门id") + private Long deptId; + + /** + * 岗位ID + */ + private List post; + + /** + * 新密码 + */ + @Schema(description = "新密码") + private String newpassword1; + +} diff --git a/upms/upms-api/src/main/java/com/rax/admin/api/dto/UserInfo.java b/upms/upms-api/src/main/java/com/rax/admin/api/dto/UserInfo.java new file mode 100644 index 0000000..05a1ed5 --- /dev/null +++ b/upms/upms-api/src/main/java/com/rax/admin/api/dto/UserInfo.java @@ -0,0 +1,35 @@ +package com.rax.admin.api.dto; + +import com.rax.admin.api.entity.SysUser; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author lengleng + * @date 2017/11/11 + */ +@Data +@Schema(description = "用户信息") +public class UserInfo implements Serializable { + + /** + * 用户基本信息 + */ + @Schema(description = "用户基本信息") + private SysUser sysUser; + + /** + * 权限标识集合 + */ + @Schema(description = "权限标识集合") + private String[] permissions; + + /** + * 角色集合 + */ + @Schema(description = "角色标识集合") + private Long[] roles; + +} diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDept.java b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysDept.java similarity index 66% rename from pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDept.java rename to upms/upms-api/src/main/java/com/rax/admin/api/entity/SysDept.java index c0d8da1..e5936d4 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDept.java +++ b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysDept.java @@ -1,23 +1,4 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.api.entity; +package com.rax.admin.api.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -34,7 +15,6 @@ import java.time.LocalDateTime; * 部门管理 *

    * - * @author lengleng * @since 2018-01-22 */ @Data diff --git a/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysDeptRelation.java b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysDeptRelation.java new file mode 100644 index 0000000..46e5163 --- /dev/null +++ b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysDeptRelation.java @@ -0,0 +1,35 @@ +package com.rax.admin.api.entity; + +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

    + * 部门关系表 + *

    + * + * @author lengleng + * @since 2018-01-22 + */ +@Data +@Schema(description = "部门关系") +@EqualsAndHashCode(callSuper = true) +public class SysDeptRelation extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 祖先节点 + */ + @Schema(description = "祖先节点") + private Long ancestor; + + /** + * 后代节点 + */ + @Schema(description = "后代节点") + private Long descendant; + +} diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDict.java b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysDict.java similarity index 66% rename from pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDict.java rename to upms/upms-api/src/main/java/com/rax/admin/api/entity/SysDict.java index 31b9829..28a53e8 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDict.java +++ b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysDict.java @@ -1,20 +1,4 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ -package com.pig4cloud.pig.admin.api.entity; +package com.rax.admin.api.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDictItem.java b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysDictItem.java similarity index 70% rename from pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDictItem.java rename to upms/upms-api/src/main/java/com/rax/admin/api/entity/SysDictItem.java index eed39f7..7fbce14 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDictItem.java +++ b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysDictItem.java @@ -1,20 +1,4 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ -package com.pig4cloud.pig.admin.api.entity; +package com.rax.admin.api.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysFile.java b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysFile.java similarity index 67% rename from pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysFile.java rename to upms/upms-api/src/main/java/com/rax/admin/api/entity/SysFile.java index c86ec83..43fd59c 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysFile.java +++ b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysFile.java @@ -1,21 +1,4 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.admin.api.entity; +package com.rax.admin.api.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysHospital.java b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysHospital.java new file mode 100644 index 0000000..2b2651f --- /dev/null +++ b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysHospital.java @@ -0,0 +1,55 @@ +package com.rax.admin.api.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.sql.Timestamp; + +@Data +@Schema(description = "医院信息") +public class SysHospital { + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.ASSIGN_ID) + @Schema(description = "主键") + private Long id; + + @Schema(description = "医院名称") + private String name; + + @Schema(description = "编码") + private String code; + + @Schema(description = "开始时间") + private Timestamp startTime; + + @Schema(description = "结束时间") + private Timestamp endTime; + + @Schema(description = "状态，正常 0， 冻结 1") + private Boolean status; + + @Schema(description = "域名") + private String domain; + + @Schema(description = "是否删除") + private Boolean deleted; + + @Schema(description = "创建时间") + @TableField(fill = FieldFill.INSERT) + private Timestamp createTime; + + @Schema(description = "更新时间") + @TableField(fill = FieldFill.UPDATE) + private Timestamp updateTime; + + @Schema(description = "医院所在省") + private String province; + + @Schema(description = "医院所在市") + private String city; +} diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysLog.java b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysLog.java similarity index 75% rename from pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysLog.java rename to upms/upms-api/src/main/java/com/rax/admin/api/entity/SysLog.java index 55072eb..9d4a6f0 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysLog.java +++ b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysLog.java @@ -1,23 +1,4 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.api.entity; +package com.rax.admin.api.entity; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysMenu.java b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysMenu.java similarity index 75% rename from pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysMenu.java rename to upms/upms-api/src/main/java/com/rax/admin/api/entity/SysMenu.java index ec8d85d..667010a 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysMenu.java +++ b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysMenu.java @@ -1,23 +1,4 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.api.entity; +package com.rax.admin.api.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysMessage.java b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysMessage.java new file mode 100644 index 0000000..72a8865 --- /dev/null +++ b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysMessage.java @@ -0,0 +1,42 @@ +package com.rax.admin.api.entity; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(description = "系统消息") +public class SysMessage { + + private static final long serialVersionUID = 1L; + + /** + * 消息类型 + */ + public enum Category { + // 通知 + NOTICE, + // 公告 + BULLETIN + } + + @Schema(description = "消息类型") + private Category category; + + @Schema(description = "医院名称") + private String history; + + @Schema(description = "消息内容") + private String message; + + @Schema(description = "跳转链接") + private String href; + + @Schema(description = "是否热点") + private Boolean hotspots; + + @Schema(description = "组织权限") + private String organizationPer; + + @Schema(description = "可见组织") + private String organization; +} diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysOauthClientDetails.java b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysOauthClientDetails.java similarity index 75% rename from pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysOauthClientDetails.java rename to upms/upms-api/src/main/java/com/rax/admin/api/entity/SysOauthClientDetails.java index 79c8333..5d261a1 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysOauthClientDetails.java +++ b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysOauthClientDetails.java @@ -1,23 +1,4 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.api.entity; +package com.rax.admin.api.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysPatient.java b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysPatient.java similarity index 85% rename from pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysPatient.java rename to upms/upms-api/src/main/java/com/rax/admin/api/entity/SysPatient.java index 476006a..ea8f61b 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysPatient.java +++ b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysPatient.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.admin.api.entity; +package com.rax.admin.api.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import java.util.Date; +import java.sql.Timestamp; @Data @Schema(description = "病人表") @@ -58,13 +58,13 @@ public class SysPatient { @Schema(description = "科室") private String dept; - @Schema(description = "手术名称") - private String surgeryName; - - @Schema(description = "麻醉方式") - private String anesthesiaMethod; - @Schema(description = "创建时间") @TableField(fill = FieldFill.INSERT) - private Date createTime; + private Timestamp createTime; + + @Schema(description = "医院id") + private String hospitalId; + + @Schema(description = "过敏史") + private String allergy; } diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysPost.java b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysPost.java similarity index 69% rename from pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysPost.java rename to upms/upms-api/src/main/java/com/rax/admin/api/entity/SysPost.java index 542cb21..c151ecb 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysPost.java +++ b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysPost.java @@ -1,21 +1,4 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.admin.api.entity; +package com.rax.admin.api.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysPublicParam.java b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysPublicParam.java similarity index 73% rename from pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysPublicParam.java rename to upms/upms-api/src/main/java/com/rax/admin/api/entity/SysPublicParam.java index a6eb741..0a8d7a6 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysPublicParam.java +++ b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysPublicParam.java @@ -1,21 +1,4 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.admin.api.entity; +package com.rax.admin.api.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysRole.java b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysRole.java similarity index 65% rename from pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysRole.java rename to upms/upms-api/src/main/java/com/rax/admin/api/entity/SysRole.java index 2e49937..023301a 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysRole.java +++ b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysRole.java @@ -1,23 +1,4 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.api.entity; +package com.rax.admin.api.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysRoleMenu.java b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysRoleMenu.java new file mode 100644 index 0000000..3dfc516 --- /dev/null +++ b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysRoleMenu.java @@ -0,0 +1,35 @@ +package com.rax.admin.api.entity; + +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

    + * 角色菜单表 + *

    + * + * @author lengleng + * @since 2017-10-29 + */ +@Data +@Schema(description = "角色菜单") +@EqualsAndHashCode(callSuper = true) +public class SysRoleMenu extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 角色ID + */ + @Schema(description = "角色id") + private Long roleId; + + /** + * 菜单ID + */ + @Schema(description = "菜单id") + private Long menuId; + +} diff --git a/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysSurgery.java b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysSurgery.java new file mode 100644 index 0000000..2672dd1 --- /dev/null +++ b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysSurgery.java @@ -0,0 +1,46 @@ +package com.rax.admin.api.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.sql.Timestamp; + +@Data +@Schema(description = "手术表") +public class SysSurgery { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.ASSIGN_ID) + @Schema(description = "主键") + private Long id; + + @Schema(description = "手术名称") + private String name; + + @Schema(description = "手术总时间，单位min") + private String totalTime; + + @Schema(description = "开始时间") + private Timestamp startTime; + + @Schema(description = "结束时间") + private Timestamp endTime; + + @Schema(description = "手术类别") + private String category; + + @Schema(description = "患者id") + private String patientId; + + @Schema(description = "麻醉方式") + private String anesthesiaMethod; + + @Schema(description = "创建时间") + private Timestamp createTime; + + @Schema(description = "医院id") + private String hospitalId; +} diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysUser.java b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysUser.java similarity index 72% rename from pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysUser.java rename to upms/upms-api/src/main/java/com/rax/admin/api/entity/SysUser.java index c6448ca..48e0b60 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysUser.java +++ b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysUser.java @@ -1,23 +1,4 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.api.entity; +package com.rax.admin.api.entity; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -32,8 +13,8 @@ import java.time.LocalDateTime; * 用户表 *

    * - * @author lengleng - * @since 2017-10-29 + * @author zhaoyz + * @since 20240131 */ @Data @Schema(description = "用户") diff --git a/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysUserPost.java b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysUserPost.java new file mode 100644 index 0000000..9593fb5 --- /dev/null +++ b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysUserPost.java @@ -0,0 +1,33 @@ +package com.rax.admin.api.entity; + +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

    + * 用户岗位表 + *

    + * + * @author fxz + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class SysUserPost extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 用户ID + */ + @Schema(description = "用户id") + private Long userId; + + /** + * 岗位ID + */ + @Schema(description = "岗位id") + private Long postId; + +} diff --git a/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysUserRole.java b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysUserRole.java new file mode 100644 index 0000000..8a4e15f --- /dev/null +++ b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysUserRole.java @@ -0,0 +1,35 @@ +package com.rax.admin.api.entity; + +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

    + * 用户角色表 + *

    + * + * @author lengleng + * @since 2017-10-29 + */ +@Data +@Schema(description = "用户角色") +@EqualsAndHashCode(callSuper = true) +public class SysUserRole extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 用户ID + */ + @Schema(description = "用户id") + private Long userId; + + /** + * 角色ID + */ + @Schema(description = "角色id") + private Long roleId; + +} diff --git a/upms/upms-api/src/main/java/com/rax/admin/api/feign/RemoteClientDetailsService.java b/upms/upms-api/src/main/java/com/rax/admin/api/feign/RemoteClientDetailsService.java new file mode 100644 index 0000000..8f19509 --- /dev/null +++ b/upms/upms-api/src/main/java/com/rax/admin/api/feign/RemoteClientDetailsService.java @@ -0,0 +1,39 @@ +package com.rax.admin.api.feign; + +import com.rax.admin.api.entity.SysOauthClientDetails; +import com.rax.common.core.constant.SecurityConstants; +import com.rax.common.core.constant.ServiceNameConstants; +import com.rax.common.core.util.R; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestHeader; + +import java.util.List; + +/** + * @author lengleng + * @date 2020/12/05 + */ +@FeignClient(contextId = "remoteClientDetailsService", value = ServiceNameConstants.UPMS_SERVICE) +public interface RemoteClientDetailsService { + + /** + * 通过clientId 查询客户端信息 + * @param clientId 用户名 + * @param from 调用标志 + * @return R + */ + @GetMapping("/client/getClientDetailsById/{clientId}") + R getClientDetailsById(@PathVariable("clientId") String clientId, + @RequestHeader(SecurityConstants.FROM) String from); + + /** + * 查询全部客户端 + * @param from 调用标识 + * @return R + */ + @GetMapping("/client/list") + R> listClientDetails(@RequestHeader(SecurityConstants.FROM) String from); + +} diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteDictService.java b/upms/upms-api/src/main/java/com/rax/admin/api/feign/RemoteDictService.java similarity index 74% rename from pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteDictService.java rename to upms/upms-api/src/main/java/com/rax/admin/api/feign/RemoteDictService.java index f17c761..0286ef9 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteDictService.java +++ b/upms/upms-api/src/main/java/com/rax/admin/api/feign/RemoteDictService.java @@ -1,8 +1,8 @@ -package com.pig4cloud.pig.admin.api.feign; +package com.rax.admin.api.feign; -import com.pig4cloud.pig.admin.api.entity.SysDictItem; -import com.pig4cloud.pig.common.core.constant.ServiceNameConstants; -import com.pig4cloud.pig.common.core.util.R; +import com.rax.admin.api.entity.SysDictItem; +import com.rax.common.core.constant.ServiceNameConstants; +import com.rax.common.core.util.R; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/upms/upms-api/src/main/java/com/rax/admin/api/feign/RemoteLogService.java b/upms/upms-api/src/main/java/com/rax/admin/api/feign/RemoteLogService.java new file mode 100644 index 0000000..bd24755 --- /dev/null +++ b/upms/upms-api/src/main/java/com/rax/admin/api/feign/RemoteLogService.java @@ -0,0 +1,28 @@ +package com.rax.admin.api.feign; + +import com.rax.admin.api.entity.SysLog; +import com.rax.common.core.constant.SecurityConstants; +import com.rax.common.core.constant.ServiceNameConstants; +import com.rax.common.core.util.R; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; + +/** + * @author lengleng + * @date 2018/6/28 + */ +@FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.UPMS_SERVICE) +public interface RemoteLogService { + + /** + * 保存日志 + * @param sysLog 日志实体 + * @param from 是否内部调用 + * @return succes、false + */ + @PostMapping("/log/save") + R saveLog(@RequestBody SysLog sysLog, @RequestHeader(SecurityConstants.FROM) String from); + +} diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteParamService.java b/upms/upms-api/src/main/java/com/rax/admin/api/feign/RemoteParamService.java similarity index 76% rename from pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteParamService.java rename to upms/upms-api/src/main/java/com/rax/admin/api/feign/RemoteParamService.java index a473841..5a29ab4 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteParamService.java +++ b/upms/upms-api/src/main/java/com/rax/admin/api/feign/RemoteParamService.java @@ -1,8 +1,8 @@ -package com.pig4cloud.pig.admin.api.feign; +package com.rax.admin.api.feign; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import com.pig4cloud.pig.common.core.constant.ServiceNameConstants; -import com.pig4cloud.pig.common.core.util.R; +import com.rax.common.core.constant.SecurityConstants; +import com.rax.common.core.constant.ServiceNameConstants; +import com.rax.common.core.util.R; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteTokenService.java b/upms/upms-api/src/main/java/com/rax/admin/api/feign/RemoteTokenService.java similarity index 54% rename from pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteTokenService.java rename to upms/upms-api/src/main/java/com/rax/admin/api/feign/RemoteTokenService.java index 85d6487..c102f4b 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteTokenService.java +++ b/upms/upms-api/src/main/java/com/rax/admin/api/feign/RemoteTokenService.java @@ -1,26 +1,9 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.admin.api.feign; +package com.rax.admin.api.feign; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import com.pig4cloud.pig.common.core.constant.ServiceNameConstants; -import com.pig4cloud.pig.common.core.util.R; +import com.rax.common.core.constant.SecurityConstants; +import com.rax.common.core.constant.ServiceNameConstants; +import com.rax.common.core.util.R; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; diff --git a/upms/upms-api/src/main/java/com/rax/admin/api/feign/RemoteUserService.java b/upms/upms-api/src/main/java/com/rax/admin/api/feign/RemoteUserService.java new file mode 100644 index 0000000..7368968 --- /dev/null +++ b/upms/upms-api/src/main/java/com/rax/admin/api/feign/RemoteUserService.java @@ -0,0 +1,40 @@ +package com.rax.admin.api.feign; + +import com.rax.admin.api.dto.UserDTO; +import com.rax.admin.api.dto.UserInfo; +import com.rax.common.core.constant.SecurityConstants; +import com.rax.common.core.constant.ServiceNameConstants; +import com.rax.common.core.util.R; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestHeader; + +/** + * @author lengleng + * @date 2018/6/22 + */ +@FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.UPMS_SERVICE) +public interface RemoteUserService { + + /** + * 通过用户名查询用户、角色信息 + * @param user 用户查询对象 + * @param from 调用标志 + * @return R + */ + @GetMapping("/user/info/query") + R info(@SpringQueryMap UserDTO user, @RequestHeader(SecurityConstants.FROM) String from); + + /** + * 锁定用户 + * @param username 用户名 + * @param from 调用标识 + * @return + */ + @PutMapping("/user/lock/{username}") + R lockUser(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM) String from); + +} diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/util/DictResolver.java b/upms/upms-api/src/main/java/com/rax/admin/api/util/DictResolver.java similarity index 93% rename from pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/util/DictResolver.java rename to upms/upms-api/src/main/java/com/rax/admin/api/util/DictResolver.java index 136b9ea..a5855e0 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/util/DictResolver.java +++ b/upms/upms-api/src/main/java/com/rax/admin/api/util/DictResolver.java @@ -1,13 +1,13 @@ -package com.pig4cloud.pig.admin.api.util; +package com.rax.admin.api.util; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.pig4cloud.pig.admin.api.entity.SysDictItem; -import com.pig4cloud.pig.admin.api.feign.RemoteDictService; -import com.pig4cloud.pig.common.core.util.SpringContextHolder; +import com.rax.admin.api.entity.SysDictItem; +import com.rax.admin.api.feign.RemoteDictService; +import com.rax.common.core.util.SpringContextHolder; import lombok.experimental.UtilityClass; import java.util.List; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/util/ParamResolver.java b/upms/upms-api/src/main/java/com/rax/admin/api/util/ParamResolver.java similarity index 84% rename from pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/util/ParamResolver.java rename to upms/upms-api/src/main/java/com/rax/admin/api/util/ParamResolver.java index 51d0337..811be7d 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/util/ParamResolver.java +++ b/upms/upms-api/src/main/java/com/rax/admin/api/util/ParamResolver.java @@ -1,10 +1,10 @@ -package com.pig4cloud.pig.admin.api.util; +package com.rax.admin.api.util; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; -import com.pig4cloud.pig.admin.api.feign.RemoteParamService; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import com.pig4cloud.pig.common.core.util.SpringContextHolder; +import com.rax.admin.api.feign.RemoteParamService; +import com.rax.common.core.constant.SecurityConstants; +import com.rax.common.core.util.SpringContextHolder; import lombok.experimental.UtilityClass; /** diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/DeptExcelVo.java b/upms/upms-api/src/main/java/com/rax/admin/api/vo/DeptExcelVo.java similarity index 88% rename from pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/DeptExcelVo.java rename to upms/upms-api/src/main/java/com/rax/admin/api/vo/DeptExcelVo.java index 7272f3e..ae8c593 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/DeptExcelVo.java +++ b/upms/upms-api/src/main/java/com/rax/admin/api/vo/DeptExcelVo.java @@ -1,8 +1,8 @@ -package com.pig4cloud.pig.admin.api.vo; +package com.rax.admin.api.vo; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; -import com.pig4cloud.plugin.excel.annotation.ExcelLine; +import com.rax.excel.annotation.ExcelLine; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/PostExcelVO.java b/upms/upms-api/src/main/java/com/rax/admin/api/vo/PostExcelVO.java similarity index 93% rename from pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/PostExcelVO.java rename to upms/upms-api/src/main/java/com/rax/admin/api/vo/PostExcelVO.java index 83998a4..f1bdc99 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/PostExcelVO.java +++ b/upms/upms-api/src/main/java/com/rax/admin/api/vo/PostExcelVO.java @@ -1,9 +1,9 @@ -package com.pig4cloud.pig.admin.api.vo; +package com.rax.admin.api.vo; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.pig4cloud.plugin.excel.annotation.ExcelLine; +import com.rax.excel.annotation.ExcelLine; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/PreLogVO.java b/upms/upms-api/src/main/java/com/rax/admin/api/vo/PreLogVO.java similarity index 50% rename from pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/PreLogVO.java rename to upms/upms-api/src/main/java/com/rax/admin/api/vo/PreLogVO.java index de46b1a..8004a5e 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/PreLogVO.java +++ b/upms/upms-api/src/main/java/com/rax/admin/api/vo/PreLogVO.java @@ -1,21 +1,4 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.admin.api.vo; +package com.rax.admin.api.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/RoleExcelVO.java b/upms/upms-api/src/main/java/com/rax/admin/api/vo/RoleExcelVO.java similarity index 92% rename from pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/RoleExcelVO.java rename to upms/upms-api/src/main/java/com/rax/admin/api/vo/RoleExcelVO.java index c06cd6f..cdc3ef1 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/RoleExcelVO.java +++ b/upms/upms-api/src/main/java/com/rax/admin/api/vo/RoleExcelVO.java @@ -1,9 +1,9 @@ -package com.pig4cloud.pig.admin.api.vo; +package com.rax.admin.api.vo; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.pig4cloud.plugin.excel.annotation.ExcelLine; +import com.rax.excel.annotation.ExcelLine; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/upms/upms-api/src/main/java/com/rax/admin/api/vo/RoleVO.java b/upms/upms-api/src/main/java/com/rax/admin/api/vo/RoleVO.java new file mode 100644 index 0000000..eb983c1 --- /dev/null +++ b/upms/upms-api/src/main/java/com/rax/admin/api/vo/RoleVO.java @@ -0,0 +1,24 @@ +package com.rax.admin.api.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * @author lengleng + * @date 2020/2/10 + */ +@Data +@Schema(description = "前端角色展示对象") +public class RoleVO { + + /** + * 角色id + */ + private Long roleId; + + /** + * 菜单列表 + */ + private String menuIds; + +} diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/TokenVo.java b/upms/upms-api/src/main/java/com/rax/admin/api/vo/TokenVo.java similarity index 88% rename from pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/TokenVo.java rename to upms/upms-api/src/main/java/com/rax/admin/api/vo/TokenVo.java index cf4c129..fed5ce8 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/TokenVo.java +++ b/upms/upms-api/src/main/java/com/rax/admin/api/vo/TokenVo.java @@ -1,4 +1,4 @@ -package com.pig4cloud.pig.admin.api.vo; +package com.rax.admin.api.vo; import lombok.Data; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/UserExcelVO.java b/upms/upms-api/src/main/java/com/rax/admin/api/vo/UserExcelVO.java similarity index 95% rename from pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/UserExcelVO.java rename to upms/upms-api/src/main/java/com/rax/admin/api/vo/UserExcelVO.java index eac6487..54e1076 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/UserExcelVO.java +++ b/upms/upms-api/src/main/java/com/rax/admin/api/vo/UserExcelVO.java @@ -1,9 +1,9 @@ -package com.pig4cloud.pig.admin.api.vo; +package com.rax.admin.api.vo; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.pig4cloud.plugin.excel.annotation.ExcelLine; +import com.rax.excel.annotation.ExcelLine; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/UserVO.java b/upms/upms-api/src/main/java/com/rax/admin/api/vo/UserVO.java similarity index 63% rename from pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/UserVO.java rename to upms/upms-api/src/main/java/com/rax/admin/api/vo/UserVO.java index a42f357..3f90cac 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/UserVO.java +++ b/upms/upms-api/src/main/java/com/rax/admin/api/vo/UserVO.java @@ -1,26 +1,7 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ +package com.rax.admin.api.vo; -package com.pig4cloud.pig.admin.api.vo; - -import com.pig4cloud.pig.admin.api.entity.SysPost; -import com.pig4cloud.pig.admin.api.entity.SysRole; +import com.rax.admin.api.entity.SysPost; +import com.rax.admin.api.entity.SysRole; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -74,18 +55,6 @@ public class UserVO implements Serializable { @Schema(description = "qq open id") private String qqOpenid; - /** - * gitee openid - */ - @Schema(description = "gitee open id") - private String giteeOpenId; - - /** - * 开源中国 openid - */ - @Schema(description = "开源中国 open id") - private String oscOpenId; - /** * 创建时间 */ diff --git a/upms/upms-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports b/upms/upms-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports new file mode 100644 index 0000000..b6a59e6 --- /dev/null +++ b/upms/upms-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports @@ -0,0 +1,6 @@ +com.rax.admin.api.feign.RemoteClientDetailsService +com.rax.admin.api.feign.RemoteDictService +com.rax.admin.api.feign.RemoteLogService +com.rax.admin.api.feign.RemoteParamService +com.rax.admin.api.feign.RemoteTokenService +com.rax.admin.api.feign.RemoteUserService diff --git a/pig-upms/pig-upms-biz/Dockerfile b/upms/upms-biz/Dockerfile similarity index 78% rename from pig-upms/pig-upms-biz/Dockerfile rename to upms/upms-biz/Dockerfile index 8120c36..8547656 100644 --- a/pig-upms/pig-upms-biz/Dockerfile +++ b/upms/upms-biz/Dockerfile @@ -1,8 +1,8 @@ FROM alibabadragonwell/dragonwell:17-anolis -WORKDIR /pig-upms-biz +WORKDIR /upms-biz -ARG JAR_FILE=target/pig-upms-biz.jar +ARG JAR_FILE=target/upms-biz.jar COPY ${JAR_FILE} app.jar diff --git a/pig-upms/pig-upms-biz/pom.xml b/upms/upms-biz/pom.xml similarity index 63% rename from pig-upms/pig-upms-biz/pom.xml rename to upms/upms-biz/pom.xml index 4b9bba2..c62b626 100644 --- a/pig-upms/pig-upms-biz/pom.xml +++ b/upms/upms-biz/pom.xml @@ -1,70 +1,59 @@ - 4.0.0 - com.pig4cloud - pig-upms + com.rax + upms 3.7.3 - pig-upms-biz + upms-biz jar - pig 通用用户权限管理系统业务处理模块 + 通用用户权限管理系统业务处理模块 - com.pig4cloud - pig-auth + com.rax + auth - + - com.pig4cloud - pig-quartz + com.rax + quartz - com.pig4cloud - pig-upms-api + com.rax + upms-api - com.pig4cloud - pig-common-oss + com.rax + common-oss - com.pig4cloud - pig-common-feign + com.rax + common-feign - com.pig4cloud - pig-common-security + com.rax + common-security - com.pig4cloud - pig-common-log + com.rax + common-log + + com.rax + vital-signs + org.springdoc @@ -72,8 +61,8 @@ - com.pig4cloud - pig-common-swagger + com.rax + common-swagger @@ -91,14 +80,18 @@ - com.pig4cloud - pig-common-xss + com.rax + common-xss org.springframework.boot spring-boot-starter-undertow + + org.springframework.boot + spring-boot-starter-data-mongodb + diff --git a/upms/upms-biz/src/main/java/com/rax/RaxAdminApplication.java b/upms/upms-biz/src/main/java/com/rax/RaxAdminApplication.java new file mode 100644 index 0000000..f10e377 --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/RaxAdminApplication.java @@ -0,0 +1,23 @@ +package com.rax; + +import com.rax.common.security.annotation.EnableRaxResourceServer; +import com.rax.common.swagger.annotation.EnableRaxDoc; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @author lengleng + * @date 2018年06月21日 + *

    + * 用户统一管理系统 + */ +@EnableRaxDoc(value = "admin") +@EnableRaxResourceServer +@SpringBootApplication +public class RaxAdminApplication { + + public static void main(String[] args) { + SpringApplication.run(RaxAdminApplication.class, args); + } + +} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysClientController.java b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysClientController.java similarity index 76% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysClientController.java rename to upms/upms-biz/src/main/java/com/rax/admin/controller/SysClientController.java index 7c2d874..3330454 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysClientController.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysClientController.java @@ -1,35 +1,16 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.controller; +package com.rax.admin.controller; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pig4cloud.pig.admin.api.entity.SysOauthClientDetails; -import com.pig4cloud.pig.admin.service.SysOauthClientDetailsService; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.log.annotation.SysLog; -import com.pig4cloud.pig.common.security.annotation.Inner; -import com.pig4cloud.plugin.excel.annotation.ResponseExcel; +import com.rax.admin.api.entity.SysOauthClientDetails; +import com.rax.admin.service.SysOauthClientDetailsService; +import com.rax.common.core.util.R; +import com.rax.common.log.annotation.SysLog; +import com.rax.common.security.annotation.Inner; +import com.rax.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysDeptController.java b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysDeptController.java similarity index 69% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysDeptController.java rename to upms/upms-biz/src/main/java/com/rax/admin/controller/SysDeptController.java index 65e94b4..c46b3e2 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysDeptController.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysDeptController.java @@ -1,31 +1,12 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ +package com.rax.admin.controller; -package com.pig4cloud.pig.admin.controller; - -import com.pig4cloud.pig.admin.api.entity.SysDept; -import com.pig4cloud.pig.admin.api.vo.DeptExcelVo; -import com.pig4cloud.pig.admin.service.SysDeptService; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.log.annotation.SysLog; -import com.pig4cloud.plugin.excel.annotation.RequestExcel; -import com.pig4cloud.plugin.excel.annotation.ResponseExcel; +import com.rax.admin.api.entity.SysDept; +import com.rax.admin.api.vo.DeptExcelVo; +import com.rax.admin.service.SysDeptService; +import com.rax.common.core.util.R; +import com.rax.common.log.annotation.SysLog; +import com.rax.excel.annotation.RequestExcel; +import com.rax.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysDictController.java b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysDictController.java similarity index 81% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysDictController.java rename to upms/upms-biz/src/main/java/com/rax/admin/controller/SysDictController.java index ecfafb0..70758a7 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysDictController.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysDictController.java @@ -1,36 +1,17 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.controller; +package com.rax.admin.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pig4cloud.pig.admin.api.entity.SysDict; -import com.pig4cloud.pig.admin.api.entity.SysDictItem; -import com.pig4cloud.pig.admin.service.SysDictItemService; -import com.pig4cloud.pig.admin.service.SysDictService; -import com.pig4cloud.pig.common.core.constant.CacheConstants; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.log.annotation.SysLog; -import com.pig4cloud.plugin.excel.annotation.ResponseExcel; +import com.rax.admin.api.entity.SysDict; +import com.rax.admin.api.entity.SysDictItem; +import com.rax.admin.service.SysDictItemService; +import com.rax.admin.service.SysDictService; +import com.rax.common.core.constant.CacheConstants; +import com.rax.common.core.util.R; +import com.rax.common.log.annotation.SysLog; +import com.rax.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysFileController.java b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysFileController.java similarity index 74% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysFileController.java rename to upms/upms-biz/src/main/java/com/rax/admin/controller/SysFileController.java index 8f139ac..67198bd 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysFileController.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysFileController.java @@ -1,32 +1,15 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.admin.controller; +package com.rax.admin.controller; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pig4cloud.pig.admin.api.entity.SysFile; -import com.pig4cloud.pig.admin.service.SysFileService; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.log.annotation.SysLog; -import com.pig4cloud.pig.common.security.annotation.Inner; +import com.rax.admin.api.entity.SysFile; +import com.rax.admin.service.SysFileService; +import com.rax.common.core.util.R; +import com.rax.common.log.annotation.SysLog; +import com.rax.common.security.annotation.Inner; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysLogController.java b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysLogController.java similarity index 62% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysLogController.java rename to upms/upms-biz/src/main/java/com/rax/admin/controller/SysLogController.java index 0f8031e..3ee298f 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysLogController.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysLogController.java @@ -1,33 +1,14 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.controller; +package com.rax.admin.controller; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pig4cloud.pig.admin.api.dto.SysLogDTO; -import com.pig4cloud.pig.admin.api.entity.SysLog; -import com.pig4cloud.pig.admin.service.SysLogService; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.security.annotation.Inner; -import com.pig4cloud.plugin.excel.annotation.ResponseExcel; +import com.rax.admin.api.dto.SysLogDTO; +import com.rax.admin.api.entity.SysLog; +import com.rax.admin.service.SysLogService; +import com.rax.common.core.util.R; +import com.rax.common.security.annotation.Inner; +import com.rax.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysMenuController.java b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysMenuController.java similarity index 71% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysMenuController.java rename to upms/upms-biz/src/main/java/com/rax/admin/controller/SysMenuController.java index 78aa094..3f85cc2 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysMenuController.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysMenuController.java @@ -1,29 +1,10 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ +package com.rax.admin.controller; -package com.pig4cloud.pig.admin.controller; - -import com.pig4cloud.pig.admin.api.entity.SysMenu; -import com.pig4cloud.pig.admin.service.SysMenuService; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.log.annotation.SysLog; -import com.pig4cloud.pig.common.security.util.SecurityUtils; +import com.rax.admin.api.entity.SysMenu; +import com.rax.admin.service.SysMenuService; +import com.rax.common.core.util.R; +import com.rax.common.log.annotation.SysLog; +import com.rax.common.security.util.SecurityUtils; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; diff --git a/upms/upms-biz/src/main/java/com/rax/admin/controller/SysMobileController.java b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysMobileController.java new file mode 100644 index 0000000..638c041 --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysMobileController.java @@ -0,0 +1,36 @@ +package com.rax.admin.controller; + +import com.rax.admin.service.SysMobileService; +import com.rax.common.core.util.R; +import com.rax.common.security.annotation.Inner; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import org.springframework.http.HttpHeaders; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author lengleng + * @date 2018/11/14 + *

    + * 手机验证码 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/mobile") +@Tag(description = "mobile", name = "手机管理模块") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) +public class SysMobileController { + + private final SysMobileService mobileService; + + @Inner(value = false) + @GetMapping("/{mobile}") + public R sendSmsCode(@PathVariable String mobile) { + return mobileService.sendSmsCode(mobile); + } + +} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysPostController.java b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysPostController.java similarity index 77% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysPostController.java rename to upms/upms-biz/src/main/java/com/rax/admin/controller/SysPostController.java index 7ec119b..2f48ffe 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysPostController.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysPostController.java @@ -1,33 +1,16 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.admin.controller; +package com.rax.admin.controller; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pig4cloud.pig.admin.api.entity.SysPost; -import com.pig4cloud.pig.admin.api.vo.PostExcelVO; -import com.pig4cloud.pig.admin.service.SysPostService; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.log.annotation.SysLog; -import com.pig4cloud.plugin.excel.annotation.RequestExcel; -import com.pig4cloud.plugin.excel.annotation.ResponseExcel; +import com.rax.admin.api.entity.SysPost; +import com.rax.admin.api.vo.PostExcelVO; +import com.rax.admin.service.SysPostService; +import com.rax.common.core.util.R; +import com.rax.common.log.annotation.SysLog; +import com.rax.excel.annotation.RequestExcel; +import com.rax.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysPublicParamController.java b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysPublicParamController.java similarity index 78% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysPublicParamController.java rename to upms/upms-biz/src/main/java/com/rax/admin/controller/SysPublicParamController.java index 2712d33..ee04dee 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysPublicParamController.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysPublicParamController.java @@ -1,32 +1,15 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.admin.controller; +package com.rax.admin.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pig4cloud.pig.admin.api.entity.SysPublicParam; -import com.pig4cloud.pig.admin.service.SysPublicParamService; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.log.annotation.SysLog; -import com.pig4cloud.pig.common.security.annotation.Inner; -import com.pig4cloud.plugin.excel.annotation.ResponseExcel; +import com.rax.admin.api.entity.SysPublicParam; +import com.rax.admin.service.SysPublicParamService; +import com.rax.common.core.util.R; +import com.rax.common.log.annotation.SysLog; +import com.rax.common.security.annotation.Inner; +import com.rax.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysRegisterController.java b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysRegisterController.java similarity index 75% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysRegisterController.java rename to upms/upms-biz/src/main/java/com/rax/admin/controller/SysRegisterController.java index a73d66b..c269cf5 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysRegisterController.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysRegisterController.java @@ -1,10 +1,10 @@ -package com.pig4cloud.pig.admin.controller; +package com.rax.admin.controller; -import com.pig4cloud.pig.admin.api.dto.UserDTO; -import com.pig4cloud.pig.admin.service.SysUserService; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.log.annotation.SysLog; -import com.pig4cloud.pig.common.security.annotation.Inner; +import com.rax.admin.api.dto.UserDTO; +import com.rax.admin.service.SysUserService; +import com.rax.common.core.util.R; +import com.rax.common.log.annotation.SysLog; +import com.rax.common.security.annotation.Inner; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.web.bind.annotation.PostMapping; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysRoleController.java b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysRoleController.java similarity index 75% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysRoleController.java rename to upms/upms-biz/src/main/java/com/rax/admin/controller/SysRoleController.java index 3066d02..291771c 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysRoleController.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysRoleController.java @@ -1,37 +1,18 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.controller; +package com.rax.admin.controller; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pig4cloud.pig.admin.api.entity.SysRole; -import com.pig4cloud.pig.admin.api.vo.RoleExcelVO; -import com.pig4cloud.pig.admin.api.vo.RoleVO; -import com.pig4cloud.pig.admin.service.SysRoleService; -import com.pig4cloud.pig.common.core.constant.CacheConstants; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.log.annotation.SysLog; -import com.pig4cloud.plugin.excel.annotation.RequestExcel; -import com.pig4cloud.plugin.excel.annotation.ResponseExcel; +import com.rax.admin.api.entity.SysRole; +import com.rax.admin.api.vo.RoleExcelVO; +import com.rax.admin.api.vo.RoleVO; +import com.rax.admin.service.SysRoleService; +import com.rax.common.core.constant.CacheConstants; +import com.rax.common.core.util.R; +import com.rax.common.log.annotation.SysLog; +import com.rax.excel.annotation.RequestExcel; +import com.rax.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysSystemInfoController.java b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysSystemInfoController.java similarity index 95% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysSystemInfoController.java rename to upms/upms-biz/src/main/java/com/rax/admin/controller/SysSystemInfoController.java index 4318abc..9a7324e 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysSystemInfoController.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysSystemInfoController.java @@ -1,6 +1,6 @@ -package com.pig4cloud.pig.admin.controller; +package com.rax.admin.controller; -import com.pig4cloud.pig.common.core.util.R; +import com.rax.common.core.util.R; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysTokenController.java b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysTokenController.java similarity index 57% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysTokenController.java rename to upms/upms-biz/src/main/java/com/rax/admin/controller/SysTokenController.java index 77c31f0..131e392 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysTokenController.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysTokenController.java @@ -1,26 +1,9 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ +package com.rax.admin.controller; -package com.pig4cloud.pig.admin.controller; - -import com.pig4cloud.pig.admin.api.feign.RemoteTokenService; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.log.annotation.SysLog; +import com.rax.admin.api.feign.RemoteTokenService; +import com.rax.common.core.constant.SecurityConstants; +import com.rax.common.core.util.R; +import com.rax.common.log.annotation.SysLog; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysUserController.java b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysUserController.java similarity index 76% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysUserController.java rename to upms/upms-biz/src/main/java/com/rax/admin/controller/SysUserController.java index 7ba9f4e..e7ee372 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysUserController.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/controller/SysUserController.java @@ -1,40 +1,21 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.controller; +package com.rax.admin.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pig4cloud.pig.admin.api.dto.UserDTO; -import com.pig4cloud.pig.admin.api.entity.SysUser; -import com.pig4cloud.pig.admin.api.vo.UserExcelVO; -import com.pig4cloud.pig.admin.service.SysUserService; -import com.pig4cloud.pig.common.core.constant.CommonConstants; -import com.pig4cloud.pig.common.core.exception.ErrorCodes; -import com.pig4cloud.pig.common.core.util.MsgUtils; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.log.annotation.SysLog; -import com.pig4cloud.pig.common.security.annotation.Inner; -import com.pig4cloud.pig.common.security.util.SecurityUtils; -import com.pig4cloud.plugin.excel.annotation.RequestExcel; -import com.pig4cloud.plugin.excel.annotation.ResponseExcel; +import com.rax.admin.api.dto.UserDTO; +import com.rax.admin.api.entity.SysUser; +import com.rax.admin.api.vo.UserExcelVO; +import com.rax.admin.service.SysUserService; +import com.rax.common.core.constant.CommonConstants; +import com.rax.common.core.exception.ErrorCodes; +import com.rax.common.core.util.MsgUtils; +import com.rax.common.core.util.R; +import com.rax.common.log.annotation.SysLog; +import com.rax.common.security.annotation.Inner; +import com.rax.common.security.util.SecurityUtils; +import com.rax.excel.annotation.RequestExcel; +import com.rax.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysDeptMapper.java b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysDeptMapper.java new file mode 100644 index 0000000..bd96b77 --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysDeptMapper.java @@ -0,0 +1,18 @@ +package com.rax.admin.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.rax.admin.api.entity.SysDept; +import org.apache.ibatis.annotations.Mapper; + +/** + *

    + * 部门管理 Mapper 接口 + *

    + * + * @author lengleng + * @since 2018-01-20 + */ +@Mapper +public interface SysDeptMapper extends BaseMapper { + +} diff --git a/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysDictItemMapper.java b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysDictItemMapper.java new file mode 100644 index 0000000..6479937 --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysDictItemMapper.java @@ -0,0 +1,16 @@ +package com.rax.admin.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.rax.admin.api.entity.SysDictItem; +import org.apache.ibatis.annotations.Mapper; + +/** + * 字典项 + * + * @author lengleng + * @date 2019/03/19 + */ +@Mapper +public interface SysDictItemMapper extends BaseMapper { + +} diff --git a/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysDictMapper.java b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysDictMapper.java new file mode 100644 index 0000000..be0690c --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysDictMapper.java @@ -0,0 +1,18 @@ +package com.rax.admin.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.rax.admin.api.entity.SysDict; +import org.apache.ibatis.annotations.Mapper; + +/** + *

    + * 字典表 Mapper 接口 + *

    + * + * @author lengleng + * @since 2017-11-19 + */ +@Mapper +public interface SysDictMapper extends BaseMapper { + +} diff --git a/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysFileMapper.java b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysFileMapper.java new file mode 100644 index 0000000..dd46eec --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysFileMapper.java @@ -0,0 +1,16 @@ +package com.rax.admin.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.rax.admin.api.entity.SysFile; +import org.apache.ibatis.annotations.Mapper; + +/** + * 文件管理 + * + * @author Luckly + * @date 2019-06-18 17:18:42 + */ +@Mapper +public interface SysFileMapper extends BaseMapper { + +} diff --git a/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysLogMapper.java b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysLogMapper.java new file mode 100644 index 0000000..6cda539 --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysLogMapper.java @@ -0,0 +1,18 @@ +package com.rax.admin.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.rax.admin.api.entity.SysLog; +import org.apache.ibatis.annotations.Mapper; + +/** + *

    + * 日志表 Mapper 接口 + *

    + * + * @author lengleng + * @since 2017-11-20 + */ +@Mapper +public interface SysLogMapper extends BaseMapper { + +} diff --git a/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysMenuMapper.java b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysMenuMapper.java new file mode 100644 index 0000000..cd0c8d5 --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysMenuMapper.java @@ -0,0 +1,27 @@ +package com.rax.admin.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.rax.admin.api.entity.SysMenu; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + *

    + * 菜单权限表 Mapper 接口 + *

    + * + * @author lengleng + * @since 2017-10-29 + */ +@Mapper +public interface SysMenuMapper extends BaseMapper { + + /** + * 通过角色编号查询菜单 + * @param roleId 角色ID + * @return + */ + List listMenusByRoleId(Long roleId); + +} diff --git a/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysOauthClientDetailsMapper.java b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysOauthClientDetailsMapper.java new file mode 100644 index 0000000..7f2df46 --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysOauthClientDetailsMapper.java @@ -0,0 +1,18 @@ +package com.rax.admin.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.rax.admin.api.entity.SysOauthClientDetails; +import org.apache.ibatis.annotations.Mapper; + +/** + *

    + * Mapper 接口 + *

    + * + * @author lengleng + * @since 2018-05-15 + */ +@Mapper +public interface SysOauthClientDetailsMapper extends BaseMapper { + +} diff --git a/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysPostMapper.java b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysPostMapper.java new file mode 100644 index 0000000..dc6ddaf --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysPostMapper.java @@ -0,0 +1,25 @@ +package com.rax.admin.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.rax.admin.api.entity.SysPost; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 岗位信息表 + * + * @author fxz + * @date 2022-03-26 12:50:43 + */ +@Mapper +public interface SysPostMapper extends BaseMapper { + + /** + * 通过用户ID，查询岗位信息 + * @param userId 用户id + * @return 岗位信息 + */ + List listPostsByUserId(Long userId); + +} diff --git a/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysPublicParamMapper.java b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysPublicParamMapper.java new file mode 100644 index 0000000..4aab092 --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysPublicParamMapper.java @@ -0,0 +1,16 @@ +package com.rax.admin.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.rax.admin.api.entity.SysPublicParam; +import org.apache.ibatis.annotations.Mapper; + +/** + * 公共参数配置 + * + * @author Lucky + * @date 2019-04-29 + */ +@Mapper +public interface SysPublicParamMapper extends BaseMapper { + +} diff --git a/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysRoleMapper.java b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysRoleMapper.java new file mode 100644 index 0000000..37856e4 --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysRoleMapper.java @@ -0,0 +1,27 @@ +package com.rax.admin.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.rax.admin.api.entity.SysRole; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + *

    + * Mapper 接口 + *

    + * + * @author lengleng + * @since 2017-10-29 + */ +@Mapper +public interface SysRoleMapper extends BaseMapper { + + /** + * 通过用户ID，查询角色信息 + * @param userId + * @return + */ + List listRolesByUserId(Long userId); + +} diff --git a/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysRoleMenuMapper.java b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysRoleMenuMapper.java new file mode 100644 index 0000000..cf02b46 --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysRoleMenuMapper.java @@ -0,0 +1,18 @@ +package com.rax.admin.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.rax.admin.api.entity.SysRoleMenu; +import org.apache.ibatis.annotations.Mapper; + +/** + *

    + * 角色菜单表 Mapper 接口 + *

    + * + * @author lengleng + * @since 2017-10-29 + */ +@Mapper +public interface SysRoleMenuMapper extends BaseMapper { + +} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserMapper.java b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysUserMapper.java similarity index 52% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserMapper.java rename to upms/upms-biz/src/main/java/com/rax/admin/mapper/SysUserMapper.java index 99b2066..60b2190 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserMapper.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysUserMapper.java @@ -1,30 +1,11 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.mapper; +package com.rax.admin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pig4cloud.pig.admin.api.dto.UserDTO; -import com.pig4cloud.pig.admin.api.entity.SysUser; -import com.pig4cloud.pig.admin.api.vo.UserVO; +import com.rax.admin.api.dto.UserDTO; +import com.rax.admin.api.entity.SysUser; +import com.rax.admin.api.vo.UserVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysUserPostMapper.java b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysUserPostMapper.java new file mode 100644 index 0000000..0eb4320 --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysUserPostMapper.java @@ -0,0 +1,18 @@ +package com.rax.admin.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.rax.admin.api.entity.SysUserPost; +import org.apache.ibatis.annotations.Mapper; + +/** + *

    + * 用户岗位 Mapper 接口 + *

    + * + * @author fxz + * @since 2022/3/19 + */ +@Mapper +public interface SysUserPostMapper extends BaseMapper { + +} diff --git a/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysUserRoleMapper.java b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysUserRoleMapper.java new file mode 100644 index 0000000..8ee8b17 --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysUserRoleMapper.java @@ -0,0 +1,18 @@ +package com.rax.admin.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.rax.admin.api.entity.SysUserRole; +import org.apache.ibatis.annotations.Mapper; + +/** + *

    + * 用户角色表 Mapper 接口 + *

    + * + * @author lengleng + * @since 2017-10-29 + */ +@Mapper +public interface SysUserRoleMapper extends BaseMapper { + +} diff --git a/upms/upms-biz/src/main/java/com/rax/admin/service/SysDeptService.java b/upms/upms-biz/src/main/java/com/rax/admin/service/SysDeptService.java new file mode 100644 index 0000000..9c2ee53 --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/SysDeptService.java @@ -0,0 +1,47 @@ +package com.rax.admin.service; + +import cn.hutool.core.lang.tree.Tree; +import com.baomidou.mybatisplus.extension.service.IService; +import com.rax.admin.api.entity.SysDept; +import com.rax.admin.api.vo.DeptExcelVo; +import com.rax.common.core.util.R; +import org.springframework.validation.BindingResult; + +import java.util.List; + +/** + *

    + * 部门管理 服务类 + *

    + * + * @author lengleng + * @since 2018-01-20 + */ +public interface SysDeptService extends IService { + + /** + * 查询部门树菜单 + * @param deptName 部门名称 + * @return 树 + */ + List> selectTree(String deptName); + + /** + * 删除部门 + * @param id 部门 ID + * @return 成功、失败 + */ + Boolean removeDeptById(Long id); + + List listExcelVo(); + + R importDept(List excelVOList, BindingResult bindingResult); + + /** + * 获取部门的所有后代部门列表 + * @param deptId 部门ID + * @return 后代部门列表 + */ + List listDescendant(Long deptId); + +} diff --git a/upms/upms-biz/src/main/java/com/rax/admin/service/SysDictItemService.java b/upms/upms-biz/src/main/java/com/rax/admin/service/SysDictItemService.java new file mode 100644 index 0000000..5a12638 --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/SysDictItemService.java @@ -0,0 +1,29 @@ +package com.rax.admin.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.rax.admin.api.entity.SysDictItem; +import com.rax.common.core.util.R; + +/** + * 字典项 + * + * @author lengleng + * @date 2019/03/19 + */ +public interface SysDictItemService extends IService { + + /** + * 删除字典项 + * @param id 字典项ID + * @return + */ + R removeDictItem(Long id); + + /** + * 更新字典项 + * @param item 字典项 + * @return + */ + R updateDictItem(SysDictItem item); + +} diff --git a/upms/upms-biz/src/main/java/com/rax/admin/service/SysDictService.java b/upms/upms-biz/src/main/java/com/rax/admin/service/SysDictService.java new file mode 100644 index 0000000..8755036 --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/SysDictService.java @@ -0,0 +1,35 @@ +package com.rax.admin.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.rax.admin.api.entity.SysDict; +import com.rax.common.core.util.R; + +/** + * 字典表 + * + * @author lengleng + * @date 2019/03/19 + */ +public interface SysDictService extends IService { + + /** + * 根据ID 删除字典 + * @param ids ID列表 + * @return + */ + R removeDictByIds(Long[] ids); + + /** + * 更新字典 + * @param sysDict 字典 + * @return + */ + R updateDict(SysDict sysDict); + + /** + * 同步缓存 （清空缓存） + * @return R + */ + R syncDictCache(); + +} diff --git a/upms/upms-biz/src/main/java/com/rax/admin/service/SysFileService.java b/upms/upms-biz/src/main/java/com/rax/admin/service/SysFileService.java new file mode 100644 index 0000000..a2b4331 --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/SysFileService.java @@ -0,0 +1,39 @@ +package com.rax.admin.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.rax.admin.api.entity.SysFile; +import com.rax.common.core.util.R; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.web.multipart.MultipartFile; + +/** + * 文件管理 + * + * @author Luckly + * @date 2019-06-18 17:18:42 + */ +public interface SysFileService extends IService { + + /** + * 上传文件 + * @param file + * @return + */ + R uploadFile(MultipartFile file); + + /** + * 读取文件 + * @param bucket 桶名称 + * @param fileName 文件名称 + * @param response 输出流 + */ + void getFile(String bucket, String fileName, HttpServletResponse response); + + /** + * 删除文件 + * @param id + * @return + */ + Boolean deleteFile(Long id); + +} diff --git a/upms/upms-biz/src/main/java/com/rax/admin/service/SysLogService.java b/upms/upms-biz/src/main/java/com/rax/admin/service/SysLogService.java new file mode 100644 index 0000000..b42cae7 --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/SysLogService.java @@ -0,0 +1,33 @@ +package com.rax.admin.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.rax.admin.api.dto.SysLogDTO; +import com.rax.admin.api.entity.SysLog; + +/** + *

    + * 日志表 服务类 + *

    + * + * @author lengleng + * @since 2017-11-20 + */ +public interface SysLogService extends IService { + + /** + * 分页查询日志 + * @param page + * @param sysLog + * @return + */ + Page getLogByPage(Page page, SysLogDTO sysLog); + + /** + * 插入日志 + * @param sysLog 日志对象 + * @return true/false + */ + Boolean saveLog(SysLog sysLog); + +} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysMenuService.java b/upms/upms-biz/src/main/java/com/rax/admin/service/SysMenuService.java similarity index 51% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysMenuService.java rename to upms/upms-biz/src/main/java/com/rax/admin/service/SysMenuService.java index c1594d8..1183ccd 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysMenuService.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/SysMenuService.java @@ -1,28 +1,9 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.service; +package com.rax.admin.service; import cn.hutool.core.lang.tree.Tree; import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pig.admin.api.entity.SysMenu; -import com.pig4cloud.pig.common.core.util.R; +import com.rax.admin.api.entity.SysMenu; +import com.rax.common.core.util.R; import java.util.List; import java.util.Set; diff --git a/upms/upms-biz/src/main/java/com/rax/admin/service/SysMobileService.java b/upms/upms-biz/src/main/java/com/rax/admin/service/SysMobileService.java new file mode 100644 index 0000000..1e8fa8a --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/SysMobileService.java @@ -0,0 +1,18 @@ +package com.rax.admin.service; + +import com.rax.common.core.util.R; + +/** + * @author lengleng + * @date 2018/11/14 + */ +public interface SysMobileService { + + /** + * 发送手机验证码 + * @param mobile mobile + * @return code + */ + R sendSmsCode(String mobile); + +} diff --git a/upms/upms-biz/src/main/java/com/rax/admin/service/SysOauthClientDetailsService.java b/upms/upms-biz/src/main/java/com/rax/admin/service/SysOauthClientDetailsService.java new file mode 100644 index 0000000..b07166d --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/SysOauthClientDetailsService.java @@ -0,0 +1,46 @@ +package com.rax.admin.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.rax.admin.api.entity.SysOauthClientDetails; +import com.rax.common.core.util.R; + +/** + *

    + * 服务类 + *

    + * + * @author lengleng + * @since 2018-05-15 + */ +public interface SysOauthClientDetailsService extends IService { + + /** + * 根据客户端信息 + * @param clientDetails + * @return + */ + Boolean updateClientById(SysOauthClientDetails clientDetails); + + /** + * 添加客户端 + * @param clientDetails + * @return + */ + Boolean saveClient(SysOauthClientDetails clientDetails); + + /** + * 分页查询客户端信息 + * @param page + * @param query + * @return + */ + Page queryPage(Page page, SysOauthClientDetails query); + + /** + * 同步缓存 （清空缓存） + * @return R + */ + R syncClientCache(); + +} diff --git a/upms/upms-biz/src/main/java/com/rax/admin/service/SysPostService.java b/upms/upms-biz/src/main/java/com/rax/admin/service/SysPostService.java new file mode 100644 index 0000000..04ac840 --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/SysPostService.java @@ -0,0 +1,33 @@ +package com.rax.admin.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.rax.admin.api.entity.SysPost; +import com.rax.admin.api.vo.PostExcelVO; +import com.rax.common.core.util.R; +import org.springframework.validation.BindingResult; + +import java.util.List; + +/** + * 岗位信息表 + * + * @author fxz + * @date 2022-03-26 12:50:43 + */ +public interface SysPostService extends IService { + + /** + * 导出excel 表格 + * @return + */ + List listPost(); + + /** + * 导入岗位 + * @param excelVOList 岗位列表 + * @param bindingResult 错误信息列表 + * @return ok fail + */ + R importPost(List excelVOList, BindingResult bindingResult); + +} diff --git a/upms/upms-biz/src/main/java/com/rax/admin/service/SysPublicParamService.java b/upms/upms-biz/src/main/java/com/rax/admin/service/SysPublicParamService.java new file mode 100644 index 0000000..394d4ea --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/SysPublicParamService.java @@ -0,0 +1,42 @@ +package com.rax.admin.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.rax.admin.api.entity.SysPublicParam; +import com.rax.common.core.util.R; + +/** + * 公共参数配置 + * + * @author Lucky + * @date 2019-04-29 + */ +public interface SysPublicParamService extends IService { + + /** + * 通过key查询公共参数指定值 + * @param publicKey + * @return + */ + String getSysPublicParamKeyToValue(String publicKey); + + /** + * 更新参数 + * @param sysPublicParam + * @return + */ + R updateParam(SysPublicParam sysPublicParam); + + /** + * 删除参数 + * @param publicIds 参数列表 + * @return + */ + R removeParamByIds(Long[] publicIds); + + /** + * 同步缓存 + * @return R + */ + R syncParamCache(); + +} diff --git a/upms/upms-biz/src/main/java/com/rax/admin/service/SysRoleMenuService.java b/upms/upms-biz/src/main/java/com/rax/admin/service/SysRoleMenuService.java new file mode 100644 index 0000000..8dea4c3 --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/SysRoleMenuService.java @@ -0,0 +1,24 @@ +package com.rax.admin.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.rax.admin.api.entity.SysRoleMenu; + +/** + *

    + * 角色菜单表 服务类 + *

    + * + * @author lengleng + * @since 2017-10-29 + */ +public interface SysRoleMenuService extends IService { + + /** + * 更新角色菜单 + * @param roleId 角色ID + * @param menuIds 菜单ID拼成的字符串，每个id之间根据逗号分隔 + * @return + */ + Boolean saveRoleMenus(Long roleId, String menuIds); + +} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysRoleService.java b/upms/upms-biz/src/main/java/com/rax/admin/service/SysRoleService.java similarity index 51% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysRoleService.java rename to upms/upms-biz/src/main/java/com/rax/admin/service/SysRoleService.java index cbd3e5c..b43c9c3 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysRoleService.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/SysRoleService.java @@ -1,29 +1,10 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.service; +package com.rax.admin.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pig.admin.api.entity.SysRole; -import com.pig4cloud.pig.admin.api.vo.RoleExcelVO; -import com.pig4cloud.pig.admin.api.vo.RoleVO; -import com.pig4cloud.pig.common.core.util.R; +import com.rax.admin.api.entity.SysRole; +import com.rax.admin.api.vo.RoleExcelVO; +import com.rax.admin.api.vo.RoleVO; +import com.rax.common.core.util.R; import org.springframework.validation.BindingResult; import java.util.List; diff --git a/upms/upms-biz/src/main/java/com/rax/admin/service/SysUserRoleService.java b/upms/upms-biz/src/main/java/com/rax/admin/service/SysUserRoleService.java new file mode 100644 index 0000000..4ea63c4 --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/SysUserRoleService.java @@ -0,0 +1,16 @@ +package com.rax.admin.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.rax.admin.api.entity.SysUserRole; + +/** + *

    + * 用户角色表 服务类 + *

    + * + * @author lengleng + * @since 2017-10-29 + */ +public interface SysUserRoleService extends IService { + +} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysUserService.java b/upms/upms-biz/src/main/java/com/rax/admin/service/SysUserService.java similarity index 64% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysUserService.java rename to upms/upms-biz/src/main/java/com/rax/admin/service/SysUserService.java index cfcdfa0..0f249b3 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysUserService.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/SysUserService.java @@ -1,33 +1,14 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.service; +package com.rax.admin.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.pig4cloud.pig.admin.api.dto.UserDTO; -import com.pig4cloud.pig.admin.api.dto.UserInfo; -import com.pig4cloud.pig.admin.api.entity.SysUser; -import com.pig4cloud.pig.admin.api.vo.UserExcelVO; -import com.pig4cloud.pig.admin.api.vo.UserVO; -import com.pig4cloud.pig.common.core.util.R; +import com.rax.admin.api.dto.UserDTO; +import com.rax.admin.api.dto.UserInfo; +import com.rax.admin.api.entity.SysUser; +import com.rax.admin.api.vo.UserExcelVO; +import com.rax.admin.api.vo.UserVO; +import com.rax.common.core.util.R; import org.springframework.validation.BindingResult; import java.util.List; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDeptServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysDeptServiceImpl.java similarity index 82% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDeptServiceImpl.java rename to upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysDeptServiceImpl.java index 31cd166..38894fa 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDeptServiceImpl.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysDeptServiceImpl.java @@ -1,23 +1,4 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.service.impl; +package com.rax.admin.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.tree.Tree; @@ -26,12 +7,12 @@ import cn.hutool.core.lang.tree.TreeUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pig.admin.api.entity.SysDept; -import com.pig4cloud.pig.admin.api.vo.DeptExcelVo; -import com.pig4cloud.pig.admin.mapper.SysDeptMapper; -import com.pig4cloud.pig.admin.service.SysDeptService; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.plugin.excel.vo.ErrorMessage; +import com.rax.admin.api.entity.SysDept; +import com.rax.admin.api.vo.DeptExcelVo; +import com.rax.admin.mapper.SysDeptMapper; +import com.rax.admin.service.SysDeptService; +import com.rax.common.core.util.R; +import com.rax.excel.vo.ErrorMessage; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictItemServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysDictItemServiceImpl.java similarity index 50% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictItemServiceImpl.java rename to upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysDictItemServiceImpl.java index b265c8c..845c8a7 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictItemServiceImpl.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysDictItemServiceImpl.java @@ -1,32 +1,16 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ -package com.pig4cloud.pig.admin.service.impl; +package com.rax.admin.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pig.admin.api.entity.SysDict; -import com.pig4cloud.pig.admin.api.entity.SysDictItem; -import com.pig4cloud.pig.admin.mapper.SysDictItemMapper; -import com.pig4cloud.pig.admin.service.SysDictItemService; -import com.pig4cloud.pig.admin.service.SysDictService; -import com.pig4cloud.pig.common.core.constant.CacheConstants; -import com.pig4cloud.pig.common.core.constant.enums.DictTypeEnum; -import com.pig4cloud.pig.common.core.exception.ErrorCodes; -import com.pig4cloud.pig.common.core.util.MsgUtils; -import com.pig4cloud.pig.common.core.util.R; +import com.rax.admin.api.entity.SysDict; +import com.rax.admin.api.entity.SysDictItem; +import com.rax.admin.mapper.SysDictItemMapper; +import com.rax.admin.service.SysDictItemService; +import com.rax.admin.service.SysDictService; +import com.rax.common.core.constant.CacheConstants; +import com.rax.common.core.constant.enums.DictTypeEnum; +import com.rax.common.core.exception.ErrorCodes; +import com.rax.common.core.util.MsgUtils; +import com.rax.common.core.util.R; import lombok.AllArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysDictServiceImpl.java similarity index 58% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictServiceImpl.java rename to upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysDictServiceImpl.java index 9289617..34feb2d 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictServiceImpl.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysDictServiceImpl.java @@ -1,34 +1,18 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ -package com.pig4cloud.pig.admin.service.impl; +package com.rax.admin.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pig.admin.api.entity.SysDict; -import com.pig4cloud.pig.admin.api.entity.SysDictItem; -import com.pig4cloud.pig.admin.mapper.SysDictItemMapper; -import com.pig4cloud.pig.admin.mapper.SysDictMapper; -import com.pig4cloud.pig.admin.service.SysDictService; -import com.pig4cloud.pig.common.core.constant.CacheConstants; -import com.pig4cloud.pig.common.core.constant.enums.DictTypeEnum; -import com.pig4cloud.pig.common.core.exception.ErrorCodes; -import com.pig4cloud.pig.common.core.util.MsgUtils; -import com.pig4cloud.pig.common.core.util.R; +import com.rax.admin.api.entity.SysDict; +import com.rax.admin.api.entity.SysDictItem; +import com.rax.admin.mapper.SysDictItemMapper; +import com.rax.admin.mapper.SysDictMapper; +import com.rax.admin.service.SysDictService; +import com.rax.common.core.constant.CacheConstants; +import com.rax.common.core.constant.enums.DictTypeEnum; +import com.rax.common.core.exception.ErrorCodes; +import com.rax.common.core.util.MsgUtils; +import com.rax.common.core.util.R; import lombok.AllArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysFileServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysFileServiceImpl.java similarity index 73% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysFileServiceImpl.java rename to upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysFileServiceImpl.java index 3a7ff84..8b22604 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysFileServiceImpl.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysFileServiceImpl.java @@ -1,20 +1,4 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ -package com.pig4cloud.pig.admin.service.impl; +package com.rax.admin.service.impl; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IoUtil; @@ -22,12 +6,12 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.amazonaws.services.s3.model.S3Object; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pig.admin.api.entity.SysFile; -import com.pig4cloud.pig.admin.mapper.SysFileMapper; -import com.pig4cloud.pig.admin.service.SysFileService; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.file.core.FileProperties; -import com.pig4cloud.pig.common.file.core.FileTemplate; +import com.rax.admin.api.entity.SysFile; +import com.rax.admin.mapper.SysFileMapper; +import com.rax.admin.service.SysFileService; +import com.rax.common.core.util.R; +import com.rax.common.file.core.FileProperties; +import com.rax.common.file.core.FileTemplate; import jakarta.servlet.http.HttpServletResponse; import lombok.AllArgsConstructor; import lombok.SneakyThrows; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysLogServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysLogServiceImpl.java similarity index 55% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysLogServiceImpl.java rename to upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysLogServiceImpl.java index f956a0a..547e82d 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysLogServiceImpl.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysLogServiceImpl.java @@ -1,23 +1,4 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.service.impl; +package com.rax.admin.service.impl; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; @@ -25,10 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pig.admin.api.dto.SysLogDTO; -import com.pig4cloud.pig.admin.api.entity.SysLog; -import com.pig4cloud.pig.admin.mapper.SysLogMapper; -import com.pig4cloud.pig.admin.service.SysLogService; +import com.rax.admin.api.dto.SysLogDTO; +import com.rax.admin.api.entity.SysLog; +import com.rax.admin.mapper.SysLogMapper; +import com.rax.admin.service.SysLogService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysMenuServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysMenuServiceImpl.java similarity index 78% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysMenuServiceImpl.java rename to upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysMenuServiceImpl.java index 1041e04..b7b535d 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysMenuServiceImpl.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysMenuServiceImpl.java @@ -1,23 +1,4 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.service.impl; +package com.rax.admin.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.tree.Tree; @@ -27,17 +8,17 @@ import cn.hutool.core.util.BooleanUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pig.admin.api.entity.SysMenu; -import com.pig4cloud.pig.admin.api.entity.SysRoleMenu; -import com.pig4cloud.pig.admin.mapper.SysMenuMapper; -import com.pig4cloud.pig.admin.mapper.SysRoleMenuMapper; -import com.pig4cloud.pig.admin.service.SysMenuService; -import com.pig4cloud.pig.common.core.constant.CacheConstants; -import com.pig4cloud.pig.common.core.constant.CommonConstants; -import com.pig4cloud.pig.common.core.constant.enums.MenuTypeEnum; -import com.pig4cloud.pig.common.core.exception.ErrorCodes; -import com.pig4cloud.pig.common.core.util.MsgUtils; -import com.pig4cloud.pig.common.core.util.R; +import com.rax.admin.api.entity.SysMenu; +import com.rax.admin.api.entity.SysRoleMenu; +import com.rax.admin.mapper.SysMenuMapper; +import com.rax.admin.mapper.SysRoleMenuMapper; +import com.rax.admin.service.SysMenuService; +import com.rax.common.core.constant.CacheConstants; +import com.rax.common.core.constant.CommonConstants; +import com.rax.common.core.constant.enums.MenuTypeEnum; +import com.rax.common.core.exception.ErrorCodes; +import com.rax.common.core.util.MsgUtils; +import com.rax.common.core.util.R; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysMobileServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysMobileServiceImpl.java similarity index 57% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysMobileServiceImpl.java rename to upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysMobileServiceImpl.java index 1487659..99b460a 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysMobileServiceImpl.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysMobileServiceImpl.java @@ -1,33 +1,16 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.admin.service.impl; +package com.rax.admin.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.RandomUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.pig4cloud.pig.admin.api.entity.SysUser; -import com.pig4cloud.pig.admin.mapper.SysUserMapper; -import com.pig4cloud.pig.admin.service.SysMobileService; -import com.pig4cloud.pig.common.core.constant.CacheConstants; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import com.pig4cloud.pig.common.core.exception.ErrorCodes; -import com.pig4cloud.pig.common.core.util.MsgUtils; -import com.pig4cloud.pig.common.core.util.R; +import com.rax.admin.api.entity.SysUser; +import com.rax.admin.mapper.SysUserMapper; +import com.rax.admin.service.SysMobileService; +import com.rax.common.core.constant.CacheConstants; +import com.rax.common.core.constant.SecurityConstants; +import com.rax.common.core.exception.ErrorCodes; +import com.rax.common.core.util.MsgUtils; +import com.rax.common.core.util.R; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysOauthClientDetailsServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysOauthClientDetailsServiceImpl.java similarity index 61% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysOauthClientDetailsServiceImpl.java rename to upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysOauthClientDetailsServiceImpl.java index 2e267c7..4d44d5b 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysOauthClientDetailsServiceImpl.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysOauthClientDetailsServiceImpl.java @@ -1,32 +1,13 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.service.impl; +package com.rax.admin.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pig.admin.api.entity.SysOauthClientDetails; -import com.pig4cloud.pig.admin.mapper.SysOauthClientDetailsMapper; -import com.pig4cloud.pig.admin.service.SysOauthClientDetailsService; -import com.pig4cloud.pig.common.core.constant.CacheConstants; -import com.pig4cloud.pig.common.core.util.R; +import com.rax.admin.api.entity.SysOauthClientDetails; +import com.rax.admin.mapper.SysOauthClientDetailsMapper; +import com.rax.admin.service.SysOauthClientDetailsService; +import com.rax.common.core.constant.CacheConstants; +import com.rax.common.core.util.R; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysPostServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysPostServiceImpl.java similarity index 65% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysPostServiceImpl.java rename to upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysPostServiceImpl.java index e9c2607..1c7ec3b 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysPostServiceImpl.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysPostServiceImpl.java @@ -1,33 +1,17 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ -package com.pig4cloud.pig.admin.service.impl; +package com.rax.admin.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pig.admin.api.entity.SysPost; -import com.pig4cloud.pig.admin.api.vo.PostExcelVO; -import com.pig4cloud.pig.admin.mapper.SysPostMapper; -import com.pig4cloud.pig.admin.service.SysPostService; -import com.pig4cloud.pig.common.core.exception.ErrorCodes; -import com.pig4cloud.pig.common.core.util.MsgUtils; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.plugin.excel.vo.ErrorMessage; +import com.rax.admin.api.entity.SysPost; +import com.rax.admin.api.vo.PostExcelVO; +import com.rax.admin.mapper.SysPostMapper; +import com.rax.admin.service.SysPostService; +import com.rax.common.core.exception.ErrorCodes; +import com.rax.common.core.util.MsgUtils; +import com.rax.common.core.util.R; +import com.rax.excel.vo.ErrorMessage; import org.springframework.stereotype.Service; import org.springframework.validation.BindingResult; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysPublicParamServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysPublicParamServiceImpl.java similarity index 63% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysPublicParamServiceImpl.java rename to upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysPublicParamServiceImpl.java index 2fff4c4..71e19bd 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysPublicParamServiceImpl.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysPublicParamServiceImpl.java @@ -1,33 +1,16 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pig.admin.service.impl; +package com.rax.admin.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pig.admin.api.entity.SysPublicParam; -import com.pig4cloud.pig.admin.mapper.SysPublicParamMapper; -import com.pig4cloud.pig.admin.service.SysPublicParamService; -import com.pig4cloud.pig.common.core.constant.CacheConstants; -import com.pig4cloud.pig.common.core.constant.enums.DictTypeEnum; -import com.pig4cloud.pig.common.core.exception.ErrorCodes; -import com.pig4cloud.pig.common.core.util.MsgUtils; -import com.pig4cloud.pig.common.core.util.R; +import com.rax.admin.api.entity.SysPublicParam; +import com.rax.admin.mapper.SysPublicParamMapper; +import com.rax.admin.service.SysPublicParamService; +import com.rax.common.core.constant.CacheConstants; +import com.rax.common.core.constant.enums.DictTypeEnum; +import com.rax.common.core.exception.ErrorCodes; +import com.rax.common.core.util.MsgUtils; +import com.rax.common.core.util.R; import lombok.AllArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysRoleMenuServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysRoleMenuServiceImpl.java similarity index 60% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysRoleMenuServiceImpl.java rename to upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysRoleMenuServiceImpl.java index afdd101..dacd652 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysRoleMenuServiceImpl.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysRoleMenuServiceImpl.java @@ -1,31 +1,12 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.service.impl; +package com.rax.admin.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pig.admin.api.entity.SysRoleMenu; -import com.pig4cloud.pig.admin.mapper.SysRoleMenuMapper; -import com.pig4cloud.pig.admin.service.SysRoleMenuService; -import com.pig4cloud.pig.common.core.constant.CacheConstants; +import com.rax.admin.api.entity.SysRoleMenu; +import com.rax.admin.mapper.SysRoleMenuMapper; +import com.rax.admin.service.SysRoleMenuService; +import com.rax.common.core.constant.CacheConstants; import lombok.AllArgsConstructor; import org.springframework.cache.CacheManager; import org.springframework.cache.annotation.CacheEvict; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysRoleServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysRoleServiceImpl.java similarity index 72% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysRoleServiceImpl.java rename to upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysRoleServiceImpl.java index 2655361..54358a2 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysRoleServiceImpl.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysRoleServiceImpl.java @@ -1,40 +1,21 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.service.impl; +package com.rax.admin.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pig.admin.api.entity.SysRole; -import com.pig4cloud.pig.admin.api.entity.SysRoleMenu; -import com.pig4cloud.pig.admin.api.vo.RoleExcelVO; -import com.pig4cloud.pig.admin.api.vo.RoleVO; -import com.pig4cloud.pig.admin.mapper.SysRoleMapper; -import com.pig4cloud.pig.admin.service.SysRoleMenuService; -import com.pig4cloud.pig.admin.service.SysRoleService; -import com.pig4cloud.pig.common.core.constant.CacheConstants; -import com.pig4cloud.pig.common.core.exception.ErrorCodes; -import com.pig4cloud.pig.common.core.util.MsgUtils; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.plugin.excel.vo.ErrorMessage; +import com.rax.admin.api.entity.SysRole; +import com.rax.admin.api.entity.SysRoleMenu; +import com.rax.admin.api.vo.RoleExcelVO; +import com.rax.admin.api.vo.RoleVO; +import com.rax.admin.mapper.SysRoleMapper; +import com.rax.admin.service.SysRoleMenuService; +import com.rax.admin.service.SysRoleService; +import com.rax.common.core.constant.CacheConstants; +import com.rax.common.core.exception.ErrorCodes; +import com.rax.common.core.util.MsgUtils; +import com.rax.common.core.util.R; +import com.rax.excel.vo.ErrorMessage; import lombok.AllArgsConstructor; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysUserRoleServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysUserRoleServiceImpl.java new file mode 100644 index 0000000..0bbbfb6 --- /dev/null +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysUserRoleServiceImpl.java @@ -0,0 +1,20 @@ +package com.rax.admin.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.rax.admin.api.entity.SysUserRole; +import com.rax.admin.mapper.SysUserRoleMapper; +import com.rax.admin.service.SysUserRoleService; +import org.springframework.stereotype.Service; + +/** + *

    + * 用户角色表 服务实现类 + *

    + * + * @author lengleng + * @since 2017-10-29 + */ +@Service +public class SysUserRoleServiceImpl extends ServiceImpl implements SysUserRoleService { + +} diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysUserServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysUserServiceImpl.java similarity index 88% rename from pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysUserServiceImpl.java rename to upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysUserServiceImpl.java index 445ad44..6540f7f 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysUserServiceImpl.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysUserServiceImpl.java @@ -1,50 +1,30 @@ -/* - * - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - * - */ - -package com.pig4cloud.pig.admin.service.impl; +package com.rax.admin.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pig.admin.api.dto.UserDTO; -import com.pig4cloud.pig.admin.api.dto.UserInfo; -import com.pig4cloud.pig.admin.api.entity.*; -import com.pig4cloud.pig.admin.api.util.ParamResolver; -import com.pig4cloud.pig.admin.api.vo.UserExcelVO; -import com.pig4cloud.pig.admin.api.vo.UserVO; -import com.pig4cloud.pig.admin.mapper.SysUserMapper; -import com.pig4cloud.pig.admin.mapper.SysUserPostMapper; -import com.pig4cloud.pig.admin.mapper.SysUserRoleMapper; -import com.pig4cloud.pig.admin.service.*; -import com.pig4cloud.pig.common.core.constant.CacheConstants; -import com.pig4cloud.pig.common.core.constant.CommonConstants; -import com.pig4cloud.pig.common.core.exception.ErrorCodes; -import com.pig4cloud.pig.common.core.util.MsgUtils; -import com.pig4cloud.pig.common.core.util.R; -import com.pig4cloud.pig.common.security.util.SecurityUtils; -import com.pig4cloud.plugin.excel.vo.ErrorMessage; +import com.rax.admin.api.dto.UserDTO; +import com.rax.admin.api.dto.UserInfo; +import com.rax.admin.api.entity.*; +import com.rax.admin.api.util.ParamResolver; +import com.rax.admin.api.vo.UserExcelVO; +import com.rax.admin.api.vo.UserVO; +import com.rax.admin.mapper.SysUserMapper; +import com.rax.admin.mapper.SysUserPostMapper; +import com.rax.admin.mapper.SysUserRoleMapper; +import com.rax.admin.service.*; +import com.rax.common.core.constant.CacheConstants; +import com.rax.common.core.constant.CommonConstants; +import com.rax.common.core.exception.ErrorCodes; +import com.rax.common.core.util.MsgUtils; +import com.rax.common.core.util.R; +import com.rax.common.security.util.SecurityUtils; +import com.rax.excel.vo.ErrorMessage; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -62,7 +42,6 @@ import java.util.*; import java.util.stream.Collectors; /** - * @author lengleng * @date 2017/10/31 */ @Slf4j @@ -355,7 +334,7 @@ public class SysUserServiceImpl extends ServiceImpl impl * 插入excel User */ private void insertExcelUser(UserExcelVO excel, Optional deptOptional, List roleCollList, - List postCollList) { + List postCollList) { UserDTO userDTO = new UserDTO(); userDTO.setUsername(excel.getUsername()); userDTO.setPhone(excel.getPhone()); diff --git a/pig-upms/pig-upms-biz/src/main/resources/application.yml b/upms/upms-biz/src/main/resources/application.yml similarity index 79% rename from pig-upms/pig-upms-biz/src/main/resources/application.yml rename to upms/upms-biz/src/main/resources/application.yml index 60ef64a..ffeb0fb 100644 --- a/pig-upms/pig-upms-biz/src/main/resources/application.yml +++ b/upms/upms-biz/src/main/resources/application.yml @@ -11,13 +11,18 @@ spring: type: redis data: redis: - host: 110.41.142.124 + host: localhost + mongodb: + host: localhost + password: root + username: root + authentication-database: admin # 数据库相关配置 datasource: driver-class-name: com.mysql.cj.jdbc.Driver username: root password: Xg137839 - url: jdbc:mysql://110.41.142.124:3306/backend?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://110.41.142.124:3306/rax_backend?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true # 定时任务属性配置 quartz: properties: @@ -53,7 +58,7 @@ gateway: # 前端密码登录解密密钥，和前端 .env 保存一致（16位） encodeKey: thanks,pig4cloud # 跳过验证码的客户端 clientId1,clientId2 - ignore-clients: test + ignore-clients: test,raxQiankun # 本地文件系统 file: @@ -76,7 +81,12 @@ security: - /error - /actuator/** - /code/** +# 临时白名单 - /static/** + - /rax/** + - /topic/** + - /front/** + - /medicine/** #--------------如下配置尽量不要变动------------- @@ -90,7 +100,7 @@ mybatis-plus: where-strategy: not_empty insert-strategy: not_empty update-strategy: not_null - type-handlers-package: com.pig4cloud.pig.common.mybatis.handler + type-handlers-package: com.rax.common.mybatis.handler configuration: jdbc-type-for-null: 'null' call-setters-on-nulls: true diff --git a/pig-upms/pig-upms-biz/src/main/resources/file/approle.xlsx b/upms/upms-biz/src/main/resources/file/approle.xlsx similarity index 100% rename from pig-upms/pig-upms-biz/src/main/resources/file/approle.xlsx rename to upms/upms-biz/src/main/resources/file/approle.xlsx diff --git a/pig-upms/pig-upms-biz/src/main/resources/file/dept.xlsx b/upms/upms-biz/src/main/resources/file/dept.xlsx similarity index 100% rename from pig-upms/pig-upms-biz/src/main/resources/file/dept.xlsx rename to upms/upms-biz/src/main/resources/file/dept.xlsx diff --git a/pig-upms/pig-upms-biz/src/main/resources/file/post.xlsx b/upms/upms-biz/src/main/resources/file/post.xlsx similarity index 100% rename from pig-upms/pig-upms-biz/src/main/resources/file/post.xlsx rename to upms/upms-biz/src/main/resources/file/post.xlsx diff --git a/pig-upms/pig-upms-biz/src/main/resources/file/role.xlsx b/upms/upms-biz/src/main/resources/file/role.xlsx similarity index 100% rename from pig-upms/pig-upms-biz/src/main/resources/file/role.xlsx rename to upms/upms-biz/src/main/resources/file/role.xlsx diff --git a/pig-upms/pig-upms-biz/src/main/resources/file/user.xlsx b/upms/upms-biz/src/main/resources/file/user.xlsx similarity index 100% rename from pig-upms/pig-upms-biz/src/main/resources/file/user.xlsx rename to upms/upms-biz/src/main/resources/file/user.xlsx diff --git a/pig-upms/pig-upms-biz/src/main/resources/logback-spring.xml b/upms/upms-biz/src/main/resources/logback-spring.xml similarity index 100% rename from pig-upms/pig-upms-biz/src/main/resources/logback-spring.xml rename to upms/upms-biz/src/main/resources/logback-spring.xml diff --git a/upms/upms-biz/src/main/resources/mapper/SysDeptMapper.xml b/upms/upms-biz/src/main/resources/mapper/SysDeptMapper.xml new file mode 100644 index 0000000..8a53f51 --- /dev/null +++ b/upms/upms-biz/src/main/resources/mapper/SysDeptMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysMenuMapper.xml b/upms/upms-biz/src/main/resources/mapper/SysMenuMapper.xml similarity index 66% rename from pig-upms/pig-upms-biz/src/main/resources/mapper/SysMenuMapper.xml rename to upms/upms-biz/src/main/resources/mapper/SysMenuMapper.xml index 57198f7..bf3d4a6 100644 --- a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysMenuMapper.xml +++ b/upms/upms-biz/src/main/resources/mapper/SysMenuMapper.xml @@ -1,27 +1,8 @@ - - - + - + diff --git a/upms/upms-biz/src/main/resources/mapper/SysPostMapper.xml b/upms/upms-biz/src/main/resources/mapper/SysPostMapper.xml new file mode 100644 index 0000000..2d0b768 --- /dev/null +++ b/upms/upms-biz/src/main/resources/mapper/SysPostMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysRoleMapper.xml b/upms/upms-biz/src/main/resources/mapper/SysRoleMapper.xml similarity index 50% rename from pig-upms/pig-upms-biz/src/main/resources/mapper/SysRoleMapper.xml rename to upms/upms-biz/src/main/resources/mapper/SysRoleMapper.xml index 900d60b..5cda7c9 100644 --- a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysRoleMapper.xml +++ b/upms/upms-biz/src/main/resources/mapper/SysRoleMapper.xml @@ -1,27 +1,8 @@ - - - + - + diff --git a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysUserMapper.xml b/upms/upms-biz/src/main/resources/mapper/SysUserMapper.xml similarity index 76% rename from pig-upms/pig-upms-biz/src/main/resources/mapper/SysUserMapper.xml rename to upms/upms-biz/src/main/resources/mapper/SysUserMapper.xml index a049997..8e420cc 100644 --- a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysUserMapper.xml +++ b/upms/upms-biz/src/main/resources/mapper/SysUserMapper.xml @@ -1,27 +1,8 @@ - - - + - + @@ -30,8 +11,6 @@ - - @@ -41,11 +20,11 @@ - + - + @@ -81,8 +60,6 @@ u.avatar, u.wx_openid, u.qq_openid, - u.gitee_login, - u.osc_id, u.del_flag, u.lock_flag, u.nickname, diff --git a/upms/upms-biz/src/main/resources/static/html/app.js b/upms/upms-biz/src/main/resources/static/html/app.js new file mode 100644 index 0000000..4ce845f --- /dev/null +++ b/upms/upms-biz/src/main/resources/static/html/app.js @@ -0,0 +1,77 @@ +const stompClient = new StompJs.Client({ + brokerURL: 'ws://localhost:9999/admin/rax/doctor-medicine' +}); +/*const testClient = new StompJs.Client({ + brokerURL: "ws://localhost:8080/test-guide" +})*/ + +stompClient.onConnect = (frame) => { + setConnected(true); + console.log('Connected: ' + frame); + stompClient.subscribe('/topic/doctorMedicine', (greeting) => { + showGreeting(greeting.body); + }); +}; + +/*testClient.onConnect = (data) => { + console.log('Connected: ' + data); + testClient.subscribe('/topic/test', (greeting) => { + console.log(JSON.parse(greeting.body).content); + }); +}*/ + +stompClient.onWebSocketError = (error) => { + console.error('Error with websocket', error); +}; + +stompClient.onStompError = (frame) => { + console.error('Broker reported error: ' + frame.headers['message']); + console.error('Additional details: ' + frame.body); +}; + +function setConnected(connected) { + $("#connect").prop("disabled", connected); + $("#disconnect").prop("disabled", !connected); + if (connected) { + $("#conversation").show(); + } + else { + $("#conversation").hide(); + } + $("#greetings").html(""); +} + +function connect() { + stompClient.activate(); + // testClient.activate(); +} + +function disconnect() { + stompClient.deactivate(); + // testClient.deactivate(); + setConnected(false); + console.log("Disconnected"); +} + +function sendName() { + stompClient.publish({ + destination: "/front/doctorMedicine", + body: $("#name").val() + }); + /*testClient.publish({ + destination: "/app/test-hello", + body: JSON.stringify({'name': "test-hello"}) + })*/ +} + +function showGreeting(message) { + $("#greetings").append("" + message + ""); +} + +$(function () { + $("form").on('submit', (e) => e.preventDefault()); + $( "#connect" ).click(() => connect()); + $( "#disconnect" ).click(() => disconnect()); + $( "#send" ).click(() => sendName()); +}); + diff --git a/upms/upms-biz/src/main/resources/static/html/index.html b/upms/upms-biz/src/main/resources/static/html/index.html new file mode 100644 index 0000000..5c2f072 --- /dev/null +++ b/upms/upms-biz/src/main/resources/static/html/index.html @@ -0,0 +1,52 @@ + + + + Hello WebSocket + + + + + + + + +
    +
    +
    +
    +
    + + + +
    +
    +
    +
    +
    +
    + + +
    + +
    +
    +
    +
    +
    + + + + + + + + +
    Greetings
    +
    +
    +
    + + diff --git a/upms/upms-biz/src/main/resources/static/html/main.css b/upms/upms-biz/src/main/resources/static/html/main.css new file mode 100644 index 0000000..8643b76 --- /dev/null +++ b/upms/upms-biz/src/main/resources/static/html/main.css @@ -0,0 +1,14 @@ +body { + background-color: #f5f5f5; +} + +#main-content { + max-width: 940px; + padding: 2em 3em; + margin: 0 auto 20px; + background-color: #fff; + border: 1px solid #e5e5e5; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; +} \ No newline at end of file diff --git a/pig-upms/pig-upms-biz/src/main/resources/static/images/SliderVerify/SliderVerify-0.jpg b/upms/upms-biz/src/main/resources/static/images/SliderVerify/SliderVerify-0.jpg similarity index 100% rename from pig-upms/pig-upms-biz/src/main/resources/static/images/SliderVerify/SliderVerify-0.jpg rename to upms/upms-biz/src/main/resources/static/images/SliderVerify/SliderVerify-0.jpg diff --git a/pig-upms/pig-upms-biz/src/main/resources/static/images/SliderVerify/SliderVerify-1.jpg b/upms/upms-biz/src/main/resources/static/images/SliderVerify/SliderVerify-1.jpg similarity index 100% rename from pig-upms/pig-upms-biz/src/main/resources/static/images/SliderVerify/SliderVerify-1.jpg rename to upms/upms-biz/src/main/resources/static/images/SliderVerify/SliderVerify-1.jpg diff --git a/pig-upms/pig-upms-biz/src/main/resources/static/images/SliderVerify/SliderVerify-2.jpg b/upms/upms-biz/src/main/resources/static/images/SliderVerify/SliderVerify-2.jpg similarity index 100% rename from pig-upms/pig-upms-biz/src/main/resources/static/images/SliderVerify/SliderVerify-2.jpg rename to upms/upms-biz/src/main/resources/static/images/SliderVerify/SliderVerify-2.jpg diff --git a/pig-upms/pig-upms-biz/src/main/resources/static/images/SliderVerify/SliderVerify-3.jpg b/upms/upms-biz/src/main/resources/static/images/SliderVerify/SliderVerify-3.jpg similarity index 100% rename from pig-upms/pig-upms-biz/src/main/resources/static/images/SliderVerify/SliderVerify-3.jpg rename to upms/upms-biz/src/main/resources/static/images/SliderVerify/SliderVerify-3.jpg diff --git a/pig-upms/pig-upms-biz/src/main/resources/static/images/SliderVerify/SliderVerify-4.jpg b/upms/upms-biz/src/main/resources/static/images/SliderVerify/SliderVerify-4.jpg similarity index 100% rename from pig-upms/pig-upms-biz/src/main/resources/static/images/SliderVerify/SliderVerify-4.jpg rename to upms/upms-biz/src/main/resources/static/images/SliderVerify/SliderVerify-4.jpg diff --git a/vital-signs/pom.xml b/vital-signs/pom.xml new file mode 100644 index 0000000..02ec988 --- /dev/null +++ b/vital-signs/pom.xml @@ -0,0 +1,45 @@ + + + + + com.rax + rax + 3.7.3 + + + 4.0.0 + + vital-signs + jar + + 病人生命特征和用药模块 + + + + + com.rax + common-swagger + + + com.rax + common-mybatis + + + com.rax + common-security + + + + com.rax + common-log + + + + org.springframework.boot + spring-boot-starter-websocket + + + + \ No newline at end of file diff --git a/vital-signs/src/main/java/com/rax/vital/config/WebSocketConfig.java b/vital-signs/src/main/java/com/rax/vital/config/WebSocketConfig.java new file mode 100644 index 0000000..4f97f54 --- /dev/null +++ b/vital-signs/src/main/java/com/rax/vital/config/WebSocketConfig.java @@ -0,0 +1,24 @@ +package com.rax.vital.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.messaging.simp.config.MessageBrokerRegistry; +import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; +import org.springframework.web.socket.config.annotation.StompEndpointRegistry; +import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; + +@Configuration +@EnableWebSocketMessageBroker +public class WebSocketConfig implements WebSocketMessageBrokerConfigurer { + + @Override + public void registerStompEndpoints(StompEndpointRegistry registry) { + registry.addEndpoint("/rax/chat", "/rax/ai-medicine", "/rax/doctor-medicine", "/rax/vital-signs"); + } + + @Override + public void configureMessageBroker(MessageBrokerRegistry registry) { + registry.enableSimpleBroker("/topic"); + registry.setApplicationDestinationPrefixes("/front"); + } + +} diff --git a/vital-signs/src/main/java/com/rax/vital/medicine/controller/MedicineController.java b/vital-signs/src/main/java/com/rax/vital/medicine/controller/MedicineController.java new file mode 100644 index 0000000..c8caeb5 --- /dev/null +++ b/vital-signs/src/main/java/com/rax/vital/medicine/controller/MedicineController.java @@ -0,0 +1,42 @@ +package com.rax.vital.medicine.controller; + +import com.rax.common.core.util.R; +import com.rax.vital.medicine.service.AIMedicineService; +import com.rax.vital.medicine.service.DoctorMedicineService; +import com.rax.vital.medicine.vo.MedicineVO; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpHeaders; +import org.springframework.messaging.handler.annotation.MessageMapping; +import org.springframework.messaging.handler.annotation.SendTo; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 用药 + * @date 2024.2.19 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/medicine") +@Tag(description = "medicine", name = "人工和AI用药管理") +@SecurityRequirement(name = HttpHeaders.AUTHORIZATION) +public class MedicineController { + + private final AIMedicineService aiMedicineService; + + private final DoctorMedicineService doctorMedicineService; + + @MessageMapping("/doctorMedicine") + @SendTo("/topic/doctorMedicine") + public String doctorMedicine(String msg) { + return msg; + } + +/* @MessageMapping("/getMedicineFlag") + @SendTo("/topic/medicineFlag") + public R getMedicineFlag(String id, String name) { + + }*/ +} diff --git a/vital-signs/src/main/java/com/rax/vital/medicine/dto/MedicineDTO.java b/vital-signs/src/main/java/com/rax/vital/medicine/dto/MedicineDTO.java new file mode 100644 index 0000000..d6ab964 --- /dev/null +++ b/vital-signs/src/main/java/com/rax/vital/medicine/dto/MedicineDTO.java @@ -0,0 +1,4 @@ +package com.rax.vital.medicine.dto; + +public class MedicineDTO { +} diff --git a/vital-signs/src/main/java/com/rax/vital/medicine/entity/AIMedicine.java b/vital-signs/src/main/java/com/rax/vital/medicine/entity/AIMedicine.java new file mode 100644 index 0000000..f3a7127 --- /dev/null +++ b/vital-signs/src/main/java/com/rax/vital/medicine/entity/AIMedicine.java @@ -0,0 +1,50 @@ +package com.rax.vital.medicine.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; +import java.sql.Timestamp; + +@Data +@Schema(description = "AI给药") +public class AIMedicine implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.ASSIGN_ID) + @Schema(description = "id") + private Long id; + + @Schema(description = "phase") + private Long phase; + + @Schema(description = "丙泊酚") + private Double 丙泊酚; + + @Schema(description = "舒芬太尼") + private Double 舒芬太尼; + + @Schema(description = "瑞芬太尼") + private Double 瑞芬太尼; + + @Schema(description = "顺阿曲库胺") + private Double 顺阿曲库胺; + + @Schema(description = "尼卡地平") + private Double 尼卡地平; + + @Schema(description = "艾司洛尔") + private Double 艾司洛尔; + + @Schema(description = "麻黄素") + private Double 麻黄素; + + @Schema(description = "阿托品") + private Double 阿托品; + + @Schema(description = "创建时间") + private Timestamp time; + +} diff --git a/vital-signs/src/main/java/com/rax/vital/medicine/entity/DoctorMedicine.java b/vital-signs/src/main/java/com/rax/vital/medicine/entity/DoctorMedicine.java new file mode 100644 index 0000000..d4a1239 --- /dev/null +++ b/vital-signs/src/main/java/com/rax/vital/medicine/entity/DoctorMedicine.java @@ -0,0 +1,49 @@ +package com.rax.vital.medicine.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; +import java.sql.Timestamp; + +@Data +@Schema(description = "医生给药") +public class DoctorMedicine implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.ASSIGN_ID) + @Schema(description = "id") + private Long id; + + @Schema(description = "phase") + private Long phase; + + @Schema(description = "丙泊酚") + private Double 丙泊酚; + + @Schema(description = "舒芬太尼") + private Double 舒芬太尼; + + @Schema(description = "瑞芬太尼") + private Double 瑞芬太尼; + + @Schema(description = "顺阿曲库胺") + private Double 顺阿曲库胺; + + @Schema(description = "尼卡地平") + private Double 尼卡地平; + + @Schema(description = "艾司洛尔") + private Double 艾司洛尔; + + @Schema(description = "麻黄素") + private Double 麻黄素; + + @Schema(description = "阿托品") + private Double 阿托品; + + @Schema(description = "创建时间") + private Timestamp time; +} diff --git a/vital-signs/src/main/java/com/rax/vital/medicine/entity/Revulsion.java b/vital-signs/src/main/java/com/rax/vital/medicine/entity/Revulsion.java new file mode 100644 index 0000000..a181c59 --- /dev/null +++ b/vital-signs/src/main/java/com/rax/vital/medicine/entity/Revulsion.java @@ -0,0 +1,49 @@ +package com.rax.vital.medicine.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; +import java.sql.Timestamp; + +@Data +@Schema(description = "诱导期给药") +public class Revulsion implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.ASSIGN_ID) + @Schema(description = "id") + private Long id; + + @Schema(description = "phase") + private Long phase; + + @Schema(description = "丙泊酚") + private Double 丙泊酚; + + @Schema(description = "舒芬太尼") + private Double 舒芬太尼; + + @Schema(description = "瑞芬太尼") + private Double 瑞芬太尼; + + @Schema(description = "顺阿曲库胺") + private Double 顺阿曲库胺; + + @Schema(description = "尼卡地平") + private Double 尼卡地平; + + @Schema(description = "艾司洛尔") + private Double 艾司洛尔; + + @Schema(description = "麻黄素") + private Double 麻黄素; + + @Schema(description = "阿托品") + private Double 阿托品; + + @Schema(description = "创建时间") + private Timestamp time; +} diff --git a/vital-signs/src/main/java/com/rax/vital/medicine/mapper/AIMedicineMapper.java b/vital-signs/src/main/java/com/rax/vital/medicine/mapper/AIMedicineMapper.java new file mode 100644 index 0000000..c62d587 --- /dev/null +++ b/vital-signs/src/main/java/com/rax/vital/medicine/mapper/AIMedicineMapper.java @@ -0,0 +1,9 @@ +package com.rax.vital.medicine.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.rax.vital.medicine.entity.AIMedicine; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface AIMedicineMapper extends BaseMapper { +} diff --git a/vital-signs/src/main/java/com/rax/vital/medicine/mapper/DoctorMedicineMapper.java b/vital-signs/src/main/java/com/rax/vital/medicine/mapper/DoctorMedicineMapper.java new file mode 100644 index 0000000..e54f427 --- /dev/null +++ b/vital-signs/src/main/java/com/rax/vital/medicine/mapper/DoctorMedicineMapper.java @@ -0,0 +1,9 @@ +package com.rax.vital.medicine.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.rax.vital.medicine.entity.DoctorMedicine; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface DoctorMedicineMapper extends BaseMapper { +} diff --git a/vital-signs/src/main/java/com/rax/vital/medicine/service/AIMedicineService.java b/vital-signs/src/main/java/com/rax/vital/medicine/service/AIMedicineService.java new file mode 100644 index 0000000..6f44ed2 --- /dev/null +++ b/vital-signs/src/main/java/com/rax/vital/medicine/service/AIMedicineService.java @@ -0,0 +1,7 @@ +package com.rax.vital.medicine.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.rax.vital.medicine.entity.AIMedicine; + +public interface AIMedicineService extends IService { +} diff --git a/vital-signs/src/main/java/com/rax/vital/medicine/service/DoctorMedicineService.java b/vital-signs/src/main/java/com/rax/vital/medicine/service/DoctorMedicineService.java new file mode 100644 index 0000000..c3a87e3 --- /dev/null +++ b/vital-signs/src/main/java/com/rax/vital/medicine/service/DoctorMedicineService.java @@ -0,0 +1,7 @@ +package com.rax.vital.medicine.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.rax.vital.medicine.entity.DoctorMedicine; + +public interface DoctorMedicineService extends IService { +} diff --git a/vital-signs/src/main/java/com/rax/vital/medicine/service/RevulsionService.java b/vital-signs/src/main/java/com/rax/vital/medicine/service/RevulsionService.java new file mode 100644 index 0000000..e02532d --- /dev/null +++ b/vital-signs/src/main/java/com/rax/vital/medicine/service/RevulsionService.java @@ -0,0 +1,4 @@ +package com.rax.vital.medicine.service; + +public interface RevulsionService { +} diff --git a/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/AIMedicineServiceImpl.java b/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/AIMedicineServiceImpl.java new file mode 100644 index 0000000..2310765 --- /dev/null +++ b/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/AIMedicineServiceImpl.java @@ -0,0 +1,15 @@ +package com.rax.vital.medicine.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.rax.vital.medicine.entity.AIMedicine; +import com.rax.vital.medicine.mapper.AIMedicineMapper; +import com.rax.vital.medicine.service.AIMedicineService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +@AllArgsConstructor +public class AIMedicineServiceImpl extends ServiceImpl implements AIMedicineService { +} diff --git a/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/DoctorMedicineServiceImpl.java b/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/DoctorMedicineServiceImpl.java new file mode 100644 index 0000000..b763da6 --- /dev/null +++ b/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/DoctorMedicineServiceImpl.java @@ -0,0 +1,15 @@ +package com.rax.vital.medicine.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.rax.vital.medicine.entity.DoctorMedicine; +import com.rax.vital.medicine.mapper.DoctorMedicineMapper; +import com.rax.vital.medicine.service.DoctorMedicineService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +@AllArgsConstructor +public class DoctorMedicineServiceImpl extends ServiceImpl implements DoctorMedicineService { +} diff --git a/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/RevulsionServiceImpl.java b/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/RevulsionServiceImpl.java new file mode 100644 index 0000000..7f87a92 --- /dev/null +++ b/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/RevulsionServiceImpl.java @@ -0,0 +1,4 @@ +package com.rax.vital.medicine.service.impl; + +public class RevulsionServiceImpl { +} diff --git a/vital-signs/src/main/java/com/rax/vital/medicine/vo/MedicineVO.java b/vital-signs/src/main/java/com/rax/vital/medicine/vo/MedicineVO.java new file mode 100644 index 0000000..16c0f7c --- /dev/null +++ b/vital-signs/src/main/java/com/rax/vital/medicine/vo/MedicineVO.java @@ -0,0 +1,4 @@ +package com.rax.vital.medicine.vo; + +public class MedicineVO { +}