diff --git a/pom.xml b/pom.xml index 900b61b..90d14e3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,13 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.dromara - ruoyi-vue-plus + com.pusong + pusong-vue-plus ${revision} - RuoYi-Vue-Plus + PuSong-Vue-Plus https://gitee.com/dromara/RuoYi-Vue-Plus - RuoYi-Vue-Plus多租户管理系统 + PuSong-Vue-Plus多租户管理系统 5.2.0 @@ -130,8 +130,8 @@ - org.dromara - ruoyi-common-bom + com.pusong + pusong-common-bom ${revision} pom import @@ -340,33 +340,33 @@ - org.dromara - ruoyi-system + com.pusong + pusong-system ${revision} - org.dromara - ruoyi-job + com.pusong + pusong-job ${revision} - org.dromara - ruoyi-generator + com.pusong + pusong-generator ${revision} - org.dromara - ruoyi-demo + com.pusong + pusong-demo ${revision} - org.dromara - ruoyi-workflow + com.pusong + pusong-workflow ${revision} @@ -374,10 +374,10 @@ - ruoyi-admin - ruoyi-common - ruoyi-extend - ruoyi-modules + pusong-admin + pusong-common + pusong-extend + pusong-modules pom diff --git a/ruoyi-admin/Dockerfile b/pusong-admin/Dockerfile similarity index 100% rename from ruoyi-admin/Dockerfile rename to pusong-admin/Dockerfile diff --git a/ruoyi-admin/pom.xml b/pusong-admin/pom.xml similarity index 79% rename from ruoyi-admin/pom.xml rename to pusong-admin/pom.xml index 610e9d7..3efb682 100644 --- a/ruoyi-admin/pom.xml +++ b/pusong-admin/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-vue-plus - org.dromara + pusong-vue-plus + com.pusong ${revision} 4.0.0 jar - ruoyi-admin + pusong-admin web服务入口 @@ -39,51 +39,51 @@ - org.dromara - ruoyi-common-doc + com.pusong + pusong-common-doc - org.dromara - ruoyi-common-social + com.pusong + pusong-common-social - org.dromara - ruoyi-common-ratelimiter + com.pusong + pusong-common-ratelimiter - org.dromara - ruoyi-common-mail + com.pusong + pusong-common-mail - org.dromara - ruoyi-system + com.pusong + pusong-system - org.dromara - ruoyi-job + com.pusong + pusong-job - org.dromara - ruoyi-generator + com.pusong + pusong-generator - org.dromara - ruoyi-demo + com.pusong + pusong-demo - org.dromara - ruoyi-workflow + com.pusong + pusong-workflow diff --git a/ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java b/pusong-admin/src/main/java/com/pusong/DromaraApplication.java similarity index 82% rename from ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java rename to pusong-admin/src/main/java/com/pusong/DromaraApplication.java index 8ef33fe..767d57c 100644 --- a/ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java +++ b/pusong-admin/src/main/java/com/pusong/DromaraApplication.java @@ -1,4 +1,4 @@ -package org.dromara; +package com.pusong; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -17,7 +17,7 @@ public class DromaraApplication { SpringApplication application = new SpringApplication(DromaraApplication.class); application.setApplicationStartup(new BufferingApplicationStartup(2048)); application.run(args); - System.out.println("(♥◠‿◠)ﾉﾞ RuoYi-Vue-Plus启动成功 ლ(´ڡ`ლ)ﾞ"); + System.out.println("(♥◠‿◠)ﾉﾞ pusong-vue-plus启动成功 ლ(´ڡ`ლ)ﾞ"); } } diff --git a/ruoyi-admin/src/main/java/org/dromara/DromaraServletInitializer.java b/pusong-admin/src/main/java/com/pusong/DromaraServletInitializer.java similarity index 95% rename from ruoyi-admin/src/main/java/org/dromara/DromaraServletInitializer.java rename to pusong-admin/src/main/java/com/pusong/DromaraServletInitializer.java index 066a683..0ee7048 100644 --- a/ruoyi-admin/src/main/java/org/dromara/DromaraServletInitializer.java +++ b/pusong-admin/src/main/java/com/pusong/DromaraServletInitializer.java @@ -1,4 +1,4 @@ -package org.dromara; +package com.pusong; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/pusong-admin/src/main/java/com/pusong/web/controller/AuthController.java similarity index 80% rename from ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java rename to pusong-admin/src/main/java/com/pusong/web/controller/AuthController.java index d99af5b..3569ce4 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java +++ b/pusong-admin/src/main/java/com/pusong/web/controller/AuthController.java @@ -1,9 +1,12 @@ -package org.dromara.web.controller; +package com.pusong.web.controller; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.codec.Base64; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; +import com.pusong.common.core.utils.*; +import com.pusong.web.service.IAuthStrategy; +import com.pusong.web.service.SysRegisterService; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -11,34 +14,33 @@ import me.zhyd.oauth.model.AuthResponse; import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.request.AuthRequest; import me.zhyd.oauth.utils.AuthStateUtils; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.domain.model.LoginBody; -import org.dromara.common.core.domain.model.RegisterBody; -import org.dromara.common.core.domain.model.SocialLoginBody; -import org.dromara.common.core.utils.*; -import org.dromara.common.encrypt.annotation.ApiEncrypt; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.social.config.properties.SocialLoginConfigProperties; -import org.dromara.common.social.config.properties.SocialProperties; -import org.dromara.common.social.utils.SocialUtils; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.common.websocket.dto.WebSocketMessageDto; -import org.dromara.common.websocket.utils.WebSocketUtils; -import org.dromara.system.domain.bo.SysTenantBo; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.vo.SysTenantVo; -import org.dromara.system.service.ISysClientService; -import org.dromara.system.service.ISysConfigService; -import org.dromara.system.service.ISysSocialService; -import org.dromara.system.service.ISysTenantService; -import org.dromara.web.domain.vo.LoginTenantVo; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.domain.vo.TenantListVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; -import org.dromara.web.service.SysRegisterService; +import com.pusong.common.core.constant.UserConstants; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.domain.model.LoginBody; +import com.pusong.common.core.domain.model.RegisterBody; +import com.pusong.common.core.domain.model.SocialLoginBody; +import com.pusong.common.core.utils.*; +import com.pusong.common.encrypt.annotation.ApiEncrypt; +import com.pusong.common.json.utils.JsonUtils; +import com.pusong.common.satoken.utils.LoginHelper; +import com.pusong.common.social.config.properties.SocialLoginConfigProperties; +import com.pusong.common.social.config.properties.SocialProperties; +import com.pusong.common.social.utils.SocialUtils; +import com.pusong.common.tenant.helper.TenantHelper; +import com.pusong.common.websocket.dto.WebSocketMessageDto; +import com.pusong.common.websocket.utils.WebSocketUtils; +import com.pusong.system.domain.bo.SysTenantBo; +import com.pusong.system.domain.vo.SysClientVo; +import com.pusong.system.domain.vo.SysTenantVo; +import com.pusong.system.service.ISysClientService; +import com.pusong.system.service.ISysConfigService; +import com.pusong.system.service.ISysSocialService; +import com.pusong.system.service.ISysTenantService; +import com.pusong.web.domain.vo.LoginTenantVo; +import com.pusong.web.domain.vo.LoginVo; +import com.pusong.web.domain.vo.TenantListVo; +import com.pusong.web.service.SysLoginService; +import com.pusong.common.core.utils.*; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -102,7 +104,7 @@ public class AuthController { Long userId = LoginHelper.getUserId(); scheduledExecutorService.schedule(() -> { WebSocketMessageDto dto = new WebSocketMessageDto(); - dto.setMessage("欢迎登录RuoYi-Vue-Plus后台管理系统"); + dto.setMessage("欢迎登录pusong-vue-plus后台管理系统"); dto.setSessionKeys(List.of(userId)); WebSocketUtils.publishMessage(dto); }, 3, TimeUnit.SECONDS); diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java b/pusong-admin/src/main/java/com/pusong/web/controller/CaptchaController.java similarity index 86% rename from ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java rename to pusong-admin/src/main/java/com/pusong/web/controller/CaptchaController.java index 1a476a9..ab8431a 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java +++ b/pusong-admin/src/main/java/com/pusong/web/controller/CaptchaController.java @@ -1,4 +1,4 @@ -package org.dromara.web.controller; +package com.pusong.web.controller; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.captcha.AbstractCaptcha; @@ -8,23 +8,23 @@ import cn.hutool.core.util.RandomUtil; import jakarta.validation.constraints.NotBlank; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.reflect.ReflectUtils; -import org.dromara.common.mail.config.properties.MailProperties; -import org.dromara.common.mail.utils.MailUtils; -import org.dromara.common.ratelimiter.annotation.RateLimiter; -import org.dromara.common.ratelimiter.enums.LimitType; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.web.config.properties.CaptchaProperties; -import org.dromara.common.web.enums.CaptchaType; +import com.pusong.common.core.constant.Constants; +import com.pusong.common.core.constant.GlobalConstants; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.core.utils.reflect.ReflectUtils; +import com.pusong.common.mail.config.properties.MailProperties; +import com.pusong.common.mail.utils.MailUtils; +import com.pusong.common.ratelimiter.annotation.RateLimiter; +import com.pusong.common.ratelimiter.enums.LimitType; +import com.pusong.common.redis.utils.RedisUtils; +import com.pusong.common.web.config.properties.CaptchaProperties; +import com.pusong.common.web.enums.CaptchaType; import org.dromara.sms4j.api.SmsBlend; import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.core.factory.SmsFactory; -import org.dromara.web.domain.vo.CaptchaVo; +import com.pusong.web.domain.vo.CaptchaVo; import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.standard.SpelExpressionParser; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java b/pusong-admin/src/main/java/com/pusong/web/controller/IndexController.java similarity index 83% rename from ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java rename to pusong-admin/src/main/java/com/pusong/web/controller/IndexController.java index c444f28..d064207 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java +++ b/pusong-admin/src/main/java/com/pusong/web/controller/IndexController.java @@ -1,8 +1,8 @@ -package org.dromara.web.controller; +package com.pusong.web.controller; import cn.dev33.satoken.annotation.SaIgnore; -import org.dromara.common.core.config.RuoYiConfig; -import org.dromara.common.core.utils.StringUtils; +import com.pusong.common.core.config.RuoYiConfig; +import com.pusong.common.core.utils.StringUtils; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java b/pusong-admin/src/main/java/com/pusong/web/domain/vo/CaptchaVo.java similarity index 89% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java rename to pusong-admin/src/main/java/com/pusong/web/domain/vo/CaptchaVo.java index 664df1e..01ee747 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java +++ b/pusong-admin/src/main/java/com/pusong/web/domain/vo/CaptchaVo.java @@ -1,4 +1,4 @@ -package org.dromara.web.domain.vo; +package com.pusong.web.domain.vo; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java b/pusong-admin/src/main/java/com/pusong/web/domain/vo/LoginTenantVo.java similarity index 89% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java rename to pusong-admin/src/main/java/com/pusong/web/domain/vo/LoginTenantVo.java index 0a83ace..620aff6 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java +++ b/pusong-admin/src/main/java/com/pusong/web/domain/vo/LoginTenantVo.java @@ -1,4 +1,4 @@ -package org.dromara.web.domain.vo; +package com.pusong.web.domain.vo; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java b/pusong-admin/src/main/java/com/pusong/web/domain/vo/LoginVo.java similarity index 96% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java rename to pusong-admin/src/main/java/com/pusong/web/domain/vo/LoginVo.java index 834afe5..48348dc 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java +++ b/pusong-admin/src/main/java/com/pusong/web/domain/vo/LoginVo.java @@ -1,4 +1,4 @@ -package org.dromara.web.domain.vo; +package com.pusong.web.domain.vo; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java b/pusong-admin/src/main/java/com/pusong/web/domain/vo/TenantListVo.java similarity index 82% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java rename to pusong-admin/src/main/java/com/pusong/web/domain/vo/TenantListVo.java index db9c271..78df0ed 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java +++ b/pusong-admin/src/main/java/com/pusong/web/domain/vo/TenantListVo.java @@ -1,6 +1,6 @@ -package org.dromara.web.domain.vo; +package com.pusong.web.domain.vo; -import org.dromara.system.domain.vo.SysTenantVo; +import com.pusong.system.domain.vo.SysTenantVo; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java b/pusong-admin/src/main/java/com/pusong/web/listener/UserActionListener.java similarity index 87% rename from ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java rename to pusong-admin/src/main/java/com/pusong/web/listener/UserActionListener.java index a472404..5d379d0 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java +++ b/pusong-admin/src/main/java/com/pusong/web/listener/UserActionListener.java @@ -1,24 +1,24 @@ -package org.dromara.web.listener; +package com.pusong.web.listener; import cn.dev33.satoken.config.SaTokenConfig; import cn.dev33.satoken.listener.SaTokenListener; import cn.dev33.satoken.stp.SaLoginModel; import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgentUtil; +import com.pusong.web.service.SysLoginService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.CacheConstants; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.domain.dto.UserOnlineDTO; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.ip.AddressUtils; -import org.dromara.common.log.event.LogininforEvent; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.web.service.SysLoginService; +import com.pusong.common.core.constant.CacheConstants; +import com.pusong.common.core.constant.Constants; +import com.pusong.common.core.domain.dto.UserOnlineDTO; +import com.pusong.common.core.utils.MessageUtils; +import com.pusong.common.core.utils.ServletUtils; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.ip.AddressUtils; +import com.pusong.common.log.event.LogininforEvent; +import com.pusong.common.redis.utils.RedisUtils; +import com.pusong.common.satoken.utils.LoginHelper; +import com.pusong.common.tenant.helper.TenantHelper; import org.springframework.stereotype.Component; import java.time.Duration; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java b/pusong-admin/src/main/java/com/pusong/web/service/IAuthStrategy.java similarity index 77% rename from ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java rename to pusong-admin/src/main/java/com/pusong/web/service/IAuthStrategy.java index a75b913..1fbd2c6 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java +++ b/pusong-admin/src/main/java/com/pusong/web/service/IAuthStrategy.java @@ -1,11 +1,10 @@ -package org.dromara.web.service; +package com.pusong.web.service; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.system.domain.SysClient; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.web.domain.vo.LoginVo; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.system.domain.vo.SysClientVo; +import com.pusong.web.domain.vo.LoginVo; /** * 授权策略 diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java b/pusong-admin/src/main/java/com/pusong/web/service/SysLoginService.java similarity index 87% rename from ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java rename to pusong-admin/src/main/java/com/pusong/web/service/SysLoginService.java index af6e7f5..ceeeb94 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java +++ b/pusong-admin/src/main/java/com/pusong/web/service/SysLoginService.java @@ -1,4 +1,4 @@ -package org.dromara.web.service; +package com.pusong.web.service; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.stp.StpUtil; @@ -6,30 +6,33 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.lock.annotation.Lock4j; +import com.pusong.common.core.utils.*; +import com.pusong.system.domain.vo.*; +import com.pusong.system.service.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.zhyd.oauth.model.AuthUser; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.domain.dto.RoleDTO; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.enums.LoginType; -import org.dromara.common.core.enums.TenantStatus; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.exception.user.UserException; -import org.dromara.common.core.utils.*; -import org.dromara.common.log.event.LogininforEvent; -import org.dromara.common.mybatis.helper.DataPermissionHelper; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.tenant.exception.TenantException; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.bo.SysSocialBo; -import org.dromara.system.domain.vo.*; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.system.service.*; +import com.pusong.common.core.constant.Constants; +import com.pusong.common.core.constant.GlobalConstants; +import com.pusong.common.core.constant.TenantConstants; +import com.pusong.common.core.domain.dto.RoleDTO; +import com.pusong.common.core.domain.model.LoginUser; +import com.pusong.common.core.enums.LoginType; +import com.pusong.common.core.enums.TenantStatus; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.exception.user.UserException; +import com.pusong.common.core.utils.*; +import com.pusong.common.log.event.LogininforEvent; +import com.pusong.common.mybatis.helper.DataPermissionHelper; +import com.pusong.common.redis.utils.RedisUtils; +import com.pusong.common.satoken.utils.LoginHelper; +import com.pusong.common.tenant.exception.TenantException; +import com.pusong.common.tenant.helper.TenantHelper; +import com.pusong.system.domain.SysUser; +import com.pusong.system.domain.bo.SysSocialBo; +import com.pusong.system.mapper.SysUserMapper; +import com.pusong.system.service.*; +import com.pusong.common.core.utils.*; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java b/pusong-admin/src/main/java/com/pusong/web/service/SysRegisterService.java similarity index 76% rename from ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java rename to pusong-admin/src/main/java/com/pusong/web/service/SysRegisterService.java index ddab279..eae08b1 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java +++ b/pusong-admin/src/main/java/com/pusong/web/service/SysRegisterService.java @@ -1,27 +1,27 @@ -package org.dromara.web.service; +package com.pusong.web.service; import cn.dev33.satoken.secure.BCrypt; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.domain.model.RegisterBody; -import org.dromara.common.core.enums.UserType; -import org.dromara.common.core.exception.user.CaptchaException; -import org.dromara.common.core.exception.user.CaptchaExpireException; -import org.dromara.common.core.exception.user.UserException; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.log.event.LogininforEvent; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.common.web.config.properties.CaptchaProperties; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.system.service.ISysUserService; +import com.pusong.common.core.constant.Constants; +import com.pusong.common.core.constant.GlobalConstants; +import com.pusong.common.core.domain.model.RegisterBody; +import com.pusong.common.core.enums.UserType; +import com.pusong.common.core.exception.user.CaptchaException; +import com.pusong.common.core.exception.user.CaptchaExpireException; +import com.pusong.common.core.exception.user.UserException; +import com.pusong.common.core.utils.MessageUtils; +import com.pusong.common.core.utils.ServletUtils; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.log.event.LogininforEvent; +import com.pusong.common.redis.utils.RedisUtils; +import com.pusong.common.tenant.helper.TenantHelper; +import com.pusong.common.web.config.properties.CaptchaProperties; +import com.pusong.system.domain.SysUser; +import com.pusong.system.domain.bo.SysUserBo; +import com.pusong.system.mapper.SysUserMapper; +import com.pusong.system.service.ISysUserService; import org.springframework.stereotype.Service; /** diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java b/pusong-admin/src/main/java/com/pusong/web/service/impl/EmailAuthStrategy.java similarity index 73% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java rename to pusong-admin/src/main/java/com/pusong/web/service/impl/EmailAuthStrategy.java index 38fdc44..f2eaf2a 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java +++ b/pusong-admin/src/main/java/com/pusong/web/service/impl/EmailAuthStrategy.java @@ -1,34 +1,33 @@ -package org.dromara.web.service.impl; +package com.pusong.web.service.impl; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.pusong.web.service.IAuthStrategy; +import com.pusong.web.service.SysLoginService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.domain.model.EmailLoginBody; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.enums.LoginType; -import org.dromara.common.core.enums.UserStatus; -import org.dromara.common.core.exception.user.CaptchaExpireException; -import org.dromara.common.core.exception.user.UserException; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.domain.SysClient; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; +import com.pusong.common.core.constant.Constants; +import com.pusong.common.core.constant.GlobalConstants; +import com.pusong.common.core.domain.model.EmailLoginBody; +import com.pusong.common.core.domain.model.LoginUser; +import com.pusong.common.core.enums.LoginType; +import com.pusong.common.core.enums.UserStatus; +import com.pusong.common.core.exception.user.CaptchaExpireException; +import com.pusong.common.core.exception.user.UserException; +import com.pusong.common.core.utils.MessageUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.core.utils.ValidatorUtils; +import com.pusong.common.json.utils.JsonUtils; +import com.pusong.common.redis.utils.RedisUtils; +import com.pusong.common.satoken.utils.LoginHelper; +import com.pusong.common.tenant.helper.TenantHelper; +import com.pusong.system.domain.SysUser; +import com.pusong.system.domain.vo.SysClientVo; +import com.pusong.system.domain.vo.SysUserVo; +import com.pusong.system.mapper.SysUserMapper; +import com.pusong.web.domain.vo.LoginVo; import org.springframework.stereotype.Service; /** diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java b/pusong-admin/src/main/java/com/pusong/web/service/impl/PasswordAuthStrategy.java similarity index 75% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java rename to pusong-admin/src/main/java/com/pusong/web/service/impl/PasswordAuthStrategy.java index cd33ea4..f244de5 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java +++ b/pusong-admin/src/main/java/com/pusong/web/service/impl/PasswordAuthStrategy.java @@ -1,37 +1,36 @@ -package org.dromara.web.service.impl; +package com.pusong.web.service.impl; import cn.dev33.satoken.secure.BCrypt; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.pusong.web.service.IAuthStrategy; +import com.pusong.web.service.SysLoginService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.domain.model.PasswordLoginBody; -import org.dromara.common.core.enums.LoginType; -import org.dromara.common.core.enums.UserStatus; -import org.dromara.common.core.exception.user.CaptchaException; -import org.dromara.common.core.exception.user.CaptchaExpireException; -import org.dromara.common.core.exception.user.UserException; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.common.web.config.properties.CaptchaProperties; -import org.dromara.system.domain.SysClient; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; +import com.pusong.common.core.constant.Constants; +import com.pusong.common.core.constant.GlobalConstants; +import com.pusong.common.core.domain.model.LoginUser; +import com.pusong.common.core.domain.model.PasswordLoginBody; +import com.pusong.common.core.enums.LoginType; +import com.pusong.common.core.enums.UserStatus; +import com.pusong.common.core.exception.user.CaptchaException; +import com.pusong.common.core.exception.user.CaptchaExpireException; +import com.pusong.common.core.exception.user.UserException; +import com.pusong.common.core.utils.MessageUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.core.utils.ValidatorUtils; +import com.pusong.common.json.utils.JsonUtils; +import com.pusong.common.redis.utils.RedisUtils; +import com.pusong.common.satoken.utils.LoginHelper; +import com.pusong.common.tenant.helper.TenantHelper; +import com.pusong.common.web.config.properties.CaptchaProperties; +import com.pusong.system.domain.SysUser; +import com.pusong.system.domain.vo.SysClientVo; +import com.pusong.system.domain.vo.SysUserVo; +import com.pusong.system.mapper.SysUserMapper; +import com.pusong.web.domain.vo.LoginVo; import org.springframework.stereotype.Service; /** diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java b/pusong-admin/src/main/java/com/pusong/web/service/impl/SmsAuthStrategy.java similarity index 74% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java rename to pusong-admin/src/main/java/com/pusong/web/service/impl/SmsAuthStrategy.java index f883632..ec50c51 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java +++ b/pusong-admin/src/main/java/com/pusong/web/service/impl/SmsAuthStrategy.java @@ -1,34 +1,33 @@ -package org.dromara.web.service.impl; +package com.pusong.web.service.impl; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.pusong.web.service.IAuthStrategy; +import com.pusong.web.service.SysLoginService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.domain.model.SmsLoginBody; -import org.dromara.common.core.enums.LoginType; -import org.dromara.common.core.enums.UserStatus; -import org.dromara.common.core.exception.user.CaptchaExpireException; -import org.dromara.common.core.exception.user.UserException; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.domain.SysClient; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; +import com.pusong.common.core.constant.Constants; +import com.pusong.common.core.constant.GlobalConstants; +import com.pusong.common.core.domain.model.LoginUser; +import com.pusong.common.core.domain.model.SmsLoginBody; +import com.pusong.common.core.enums.LoginType; +import com.pusong.common.core.enums.UserStatus; +import com.pusong.common.core.exception.user.CaptchaExpireException; +import com.pusong.common.core.exception.user.UserException; +import com.pusong.common.core.utils.MessageUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.core.utils.ValidatorUtils; +import com.pusong.common.json.utils.JsonUtils; +import com.pusong.common.redis.utils.RedisUtils; +import com.pusong.common.satoken.utils.LoginHelper; +import com.pusong.common.tenant.helper.TenantHelper; +import com.pusong.system.domain.SysUser; +import com.pusong.system.domain.vo.SysClientVo; +import com.pusong.system.domain.vo.SysUserVo; +import com.pusong.system.mapper.SysUserMapper; +import com.pusong.web.domain.vo.LoginVo; import org.springframework.stereotype.Service; /** diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java b/pusong-admin/src/main/java/com/pusong/web/service/impl/SocialAuthStrategy.java similarity index 81% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java rename to pusong-admin/src/main/java/com/pusong/web/service/impl/SocialAuthStrategy.java index 6694165..60a38b9 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java +++ b/pusong-admin/src/main/java/com/pusong/web/service/impl/SocialAuthStrategy.java @@ -1,4 +1,4 @@ -package org.dromara.web.service.impl; +package com.pusong.web.service.impl; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; @@ -7,29 +7,29 @@ import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpUtil; import cn.hutool.http.Method; +import com.pusong.web.service.IAuthStrategy; +import com.pusong.web.service.SysLoginService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.zhyd.oauth.model.AuthResponse; import me.zhyd.oauth.model.AuthUser; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.domain.model.SocialLoginBody; -import org.dromara.common.core.enums.UserStatus; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.exception.user.UserException; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.social.config.properties.SocialProperties; -import org.dromara.common.social.utils.SocialUtils; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.vo.SysSocialVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.system.service.ISysSocialService; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; +import com.pusong.common.core.domain.model.LoginUser; +import com.pusong.common.core.domain.model.SocialLoginBody; +import com.pusong.common.core.enums.UserStatus; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.exception.user.UserException; +import com.pusong.common.core.utils.ValidatorUtils; +import com.pusong.common.json.utils.JsonUtils; +import com.pusong.common.satoken.utils.LoginHelper; +import com.pusong.common.social.config.properties.SocialProperties; +import com.pusong.common.social.utils.SocialUtils; +import com.pusong.common.tenant.helper.TenantHelper; +import com.pusong.system.domain.vo.SysClientVo; +import com.pusong.system.domain.vo.SysSocialVo; +import com.pusong.system.domain.vo.SysUserVo; +import com.pusong.system.mapper.SysUserMapper; +import com.pusong.system.service.ISysSocialService; +import com.pusong.web.domain.vo.LoginVo; import org.springframework.stereotype.Service; import java.util.List; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java b/pusong-admin/src/main/java/com/pusong/web/service/impl/XcxAuthStrategy.java similarity index 83% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java rename to pusong-admin/src/main/java/com/pusong/web/service/impl/XcxAuthStrategy.java index aa8be73..82858cd 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java +++ b/pusong-admin/src/main/java/com/pusong/web/service/impl/XcxAuthStrategy.java @@ -1,22 +1,21 @@ -package org.dromara.web.service.impl; +package com.pusong.web.service.impl; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.util.ObjectUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.model.XcxLoginBody; -import org.dromara.common.core.domain.model.XcxLoginUser; -import org.dromara.common.core.enums.UserStatus; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysClient; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; +import com.pusong.common.core.domain.model.XcxLoginBody; +import com.pusong.common.core.domain.model.XcxLoginUser; +import com.pusong.common.core.enums.UserStatus; +import com.pusong.common.core.utils.ValidatorUtils; +import com.pusong.common.json.utils.JsonUtils; +import com.pusong.common.satoken.utils.LoginHelper; +import com.pusong.system.domain.vo.SysClientVo; +import com.pusong.system.domain.vo.SysUserVo; +import com.pusong.web.domain.vo.LoginVo; +import com.pusong.web.service.IAuthStrategy; +import com.pusong.web.service.SysLoginService; import org.springframework.stereotype.Service; /** diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/pusong-admin/src/main/resources/application-dev.yml similarity index 89% rename from ruoyi-admin/src/main/resources/application-dev.yml rename to pusong-admin/src/main/resources/application-dev.yml index 3a0a6dc..2b8b76e 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/pusong-admin/src/main/resources/application-dev.yml @@ -9,19 +9,19 @@ spring.boot.admin.client: password: 123456 --- # snail-job 配置 -snail-job: - enabled: true - # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务 - group: "ruoyi_group" - # SnailJob 接入验证令牌 详见 script/sql/snail_job.sql `sj_group_config` 表 - token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT" - server: - host: 127.0.0.1 - port: 1788 - # 详见 script/sql/snail_job.sql `sj_namespace` 表 - namespace: ${spring.profiles.active} - # 随主应用端口飘逸 - port: 2${server.port} +#snail-job: +# enabled: true +# # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务 +# group: "ruoyi_group" +# # SnailJob 接入验证令牌 详见 script/sql/snail_job.sql `sj_group_config` 表 +# token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT" +# server: +# host: 127.0.0.1 +# port: 1788 +# # 详见 script/sql/snail_job.sql `sj_namespace` 表 +# namespace: ${spring.profiles.active} +# # 随主应用端口飘逸 +# port: 2${server.port} --- # 数据源配置 spring: @@ -46,13 +46,13 @@ spring: username: root password: Ps123456@ # 从库数据源 - slave: - lazy: true - type: ${spring.datasource.type} - driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.18.119:3307/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true - username: root - password: Ps123456@ +# slave: +# lazy: true +# type: ${spring.datasource.type} +# driverClassName: com.mysql.cj.jdbc.Driver +# url: jdbc:mysql://192.168.18.119:3307/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true +# username: root +# password: Ps123456@ # oracle: # type: ${spring.datasource.type} # driverClassName: oracle.jdbc.OracleDriver @@ -95,7 +95,7 @@ spring.data: # 端口，默认为6379 port: 6378 # 数据库索引 - database: 0 + database: 1 # 密码(如没有密码请注释掉) password: 12345 # 连接超时时间 @@ -159,7 +159,7 @@ sms: minute-max: 1 # 短信拦截限制单手机号每日最大发送量，只对开启了拦截的配置有效 account-max: 30 - # 以下配置来自于 com.pusong.sms4j.provider.config.BaseConfig类中 + # 以下配置来自于 org.dromara.sms4j.provider.config.BaseConfig类中 blends: # 唯一ID 用于发送短信寻找具体配置 随便定义别用中文即可 # 可以同时存在两个相同厂商 例如: ali1 ali2 两个不同的阿里短信账号 也可用于区分租户 diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/pusong-admin/src/main/resources/application-prod.yml similarity index 100% rename from ruoyi-admin/src/main/resources/application-prod.yml rename to pusong-admin/src/main/resources/application-prod.yml diff --git a/ruoyi-admin/src/main/resources/application.yml b/pusong-admin/src/main/resources/application.yml similarity index 96% rename from ruoyi-admin/src/main/resources/application.yml rename to pusong-admin/src/main/resources/application.yml index fec885e..2beabba 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/pusong-admin/src/main/resources/application.yml @@ -1,7 +1,7 @@ # 项目相关配置 ruoyi: # 名称 - name: RuoYi-Vue-Plus + name: PuSong-Vue-Plus # 版本 version: ${revision} # 版权年份 @@ -144,12 +144,12 @@ tenant: # MyBatisPlus配置 # https://baomidou.com/config/ mybatis-plus: - # 多包名使用 例如 org.dromara.**.mapper,org.xxx.**.mapper - mapperPackage: org.dromara.**.mapper + # 多包名使用 例如 com.pusong.**.mapper,org.xxx.**.mapper + mapperPackage: com.pusong.**.mapper # 对应的 XML 文件位置 mapperLocations: classpath*:mapper/**/*Mapper.xml # 实体扫描，多个package用逗号或者分号分隔 - typeAliasesPackage: org.dromara.**.domain + typeAliasesPackage: com.pusong.**.domain global-config: dbConfig: # 主键类型 @@ -213,13 +213,13 @@ springdoc: #这里定义了两个分组，可定义多个，也可以不定义 group-configs: - group: 1.演示模块 - packages-to-scan: org.dromara.demo + packages-to-scan: com.pusong.demo - group: 2.通用模块 - packages-to-scan: org.dromara.web + packages-to-scan: com.pusong.web - group: 3.系统模块 - packages-to-scan: org.dromara.system + packages-to-scan: com.pusong.system - group: 4.代码生成模块 - packages-to-scan: org.dromara.generator + packages-to-scan: com.pusong.generator # 防止XSS攻击 xss: diff --git a/ruoyi-admin/src/main/resources/banner.txt b/pusong-admin/src/main/resources/banner.txt similarity index 100% rename from ruoyi-admin/src/main/resources/banner.txt rename to pusong-admin/src/main/resources/banner.txt diff --git a/ruoyi-admin/src/main/resources/i18n/messages.properties b/pusong-admin/src/main/resources/i18n/messages.properties similarity index 100% rename from ruoyi-admin/src/main/resources/i18n/messages.properties rename to pusong-admin/src/main/resources/i18n/messages.properties diff --git a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties b/pusong-admin/src/main/resources/i18n/messages_en_US.properties similarity index 100% rename from ruoyi-admin/src/main/resources/i18n/messages_en_US.properties rename to pusong-admin/src/main/resources/i18n/messages_en_US.properties diff --git a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties b/pusong-admin/src/main/resources/i18n/messages_zh_CN.properties similarity index 100% rename from ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties rename to pusong-admin/src/main/resources/i18n/messages_zh_CN.properties diff --git a/ruoyi-admin/src/main/resources/ip2region.xdb b/pusong-admin/src/main/resources/ip2region.xdb similarity index 100% rename from ruoyi-admin/src/main/resources/ip2region.xdb rename to pusong-admin/src/main/resources/ip2region.xdb diff --git a/ruoyi-admin/src/main/resources/logback-plus.xml b/pusong-admin/src/main/resources/logback-plus.xml similarity index 100% rename from ruoyi-admin/src/main/resources/logback-plus.xml rename to pusong-admin/src/main/resources/logback-plus.xml diff --git a/ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java b/pusong-admin/src/test/java/com/pusong/test/AssertUnitTest.java similarity index 97% rename from ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java rename to pusong-admin/src/test/java/com/pusong/test/AssertUnitTest.java index dba2323..45ab6d9 100644 --- a/ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java +++ b/pusong-admin/src/test/java/com/pusong/test/AssertUnitTest.java @@ -1,4 +1,4 @@ -package org.dromara.test; +package com.pusong.test; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; diff --git a/ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java b/pusong-admin/src/test/java/com/pusong/test/DemoUnitTest.java similarity index 95% rename from ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java rename to pusong-admin/src/test/java/com/pusong/test/DemoUnitTest.java index 5b3dfdc..5073687 100644 --- a/ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java +++ b/pusong-admin/src/test/java/com/pusong/test/DemoUnitTest.java @@ -1,6 +1,6 @@ -package org.dromara.test; +package com.pusong.test; -import org.dromara.common.core.config.RuoYiConfig; +import com.pusong.common.core.config.RuoYiConfig; import org.junit.jupiter.api.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java b/pusong-admin/src/test/java/com/pusong/test/ParamUnitTest.java similarity index 96% rename from ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java rename to pusong-admin/src/test/java/com/pusong/test/ParamUnitTest.java index 1db51df..02052e3 100644 --- a/ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java +++ b/pusong-admin/src/test/java/com/pusong/test/ParamUnitTest.java @@ -1,6 +1,6 @@ -package org.dromara.test; +package com.pusong.test; -import org.dromara.common.core.enums.UserType; +import com.pusong.common.core.enums.UserType; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java b/pusong-admin/src/test/java/com/pusong/test/TagUnitTest.java similarity index 97% rename from ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java rename to pusong-admin/src/test/java/com/pusong/test/TagUnitTest.java index b50afa6..c18202d 100644 --- a/ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java +++ b/pusong-admin/src/test/java/com/pusong/test/TagUnitTest.java @@ -1,4 +1,4 @@ -package org.dromara.test; +package com.pusong.test; import org.junit.jupiter.api.*; import org.springframework.boot.test.context.SpringBootTest; diff --git a/pusong-common/pom.xml b/pusong-common/pom.xml new file mode 100644 index 0000000..a559481 --- /dev/null +++ b/pusong-common/pom.xml @@ -0,0 +1,45 @@ + + + + pusong-vue-plus + com.pusong + ${revision} + + 4.0.0 + + + pusong-common-bom + pusong-common-social + pusong-common-core + pusong-common-doc + pusong-common-excel + pusong-common-idempotent + pusong-common-job + pusong-common-log + pusong-common-mail + pusong-common-mybatis + pusong-common-oss + pusong-common-ratelimiter + pusong-common-redis + pusong-common-satoken + pusong-common-security + pusong-common-sms + pusong-common-web + pusong-common-translation + pusong-common-sensitive + pusong-common-json + pusong-common-encrypt + pusong-common-tenant + pusong-common-websocket + + + pusong-common + pom + + + common 通用模块 + + + diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/pusong-common/pusong-common-bom/pom.xml similarity index 58% rename from ruoyi-common/ruoyi-common-bom/pom.xml rename to pusong-common/pusong-common-bom/pom.xml index d546275..a8b562d 100644 --- a/ruoyi-common/ruoyi-common-bom/pom.xml +++ b/pusong-common/pusong-common-bom/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.dromara - ruoyi-common-bom + com.pusong + pusong-common-bom ${revision} pom @@ -21,154 +21,154 @@ - org.dromara - ruoyi-common-core + com.pusong + pusong-common-core ${revision} - org.dromara - ruoyi-common-doc + com.pusong + pusong-common-doc ${revision} - org.dromara - ruoyi-common-excel + com.pusong + pusong-common-excel ${revision} - org.dromara - ruoyi-common-idempotent + com.pusong + pusong-common-idempotent ${revision} - org.dromara - ruoyi-common-job + com.pusong + pusong-common-job ${revision} - org.dromara - ruoyi-common-log + com.pusong + pusong-common-log ${revision} - org.dromara - ruoyi-common-mail + com.pusong + pusong-common-mail ${revision} - org.dromara - ruoyi-common-mybatis + com.pusong + pusong-common-mybatis ${revision} - org.dromara - ruoyi-common-oss + com.pusong + pusong-common-oss ${revision} - org.dromara - ruoyi-common-ratelimiter + com.pusong + pusong-common-ratelimiter ${revision} - org.dromara - ruoyi-common-redis + com.pusong + pusong-common-redis ${revision} - org.dromara - ruoyi-common-satoken + com.pusong + pusong-common-satoken ${revision} - org.dromara - ruoyi-common-security + com.pusong + pusong-common-security ${revision} - org.dromara - ruoyi-common-sms + com.pusong + pusong-common-sms ${revision} - org.dromara - ruoyi-common-social + com.pusong + pusong-common-social ${revision} - org.dromara - ruoyi-common-web + com.pusong + pusong-common-web ${revision} - org.dromara - ruoyi-common-translation + com.pusong + pusong-common-translation ${revision} - org.dromara - ruoyi-common-sensitive + com.pusong + pusong-common-sensitive ${revision} - org.dromara - ruoyi-common-json + com.pusong + pusong-common-json ${revision} - org.dromara - ruoyi-common-encrypt + com.pusong + pusong-common-encrypt ${revision} - org.dromara - ruoyi-common-tenant + com.pusong + pusong-common-tenant ${revision} - org.dromara - ruoyi-common-websocket + com.pusong + pusong-common-websocket ${revision} diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/pusong-common/pusong-common-core/pom.xml similarity index 95% rename from ruoyi-common/ruoyi-common-core/pom.xml rename to pusong-common/pusong-common-core/pom.xml index 5925c9b..f731029 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/pusong-common/pusong-common-core/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.pusong + pusong-common ${revision} 4.0.0 - ruoyi-common-core + pusong-common-core ruoyi-common-core 核心模块 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/config/ApplicationConfig.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/config/ApplicationConfig.java index d9f70e4..09c63c4 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/config/ApplicationConfig.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.config; +package com.pusong.common.core.config; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.EnableAspectJAutoProxy; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/config/AsyncConfig.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/config/AsyncConfig.java index cd01e33..0d9939e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/config/AsyncConfig.java @@ -1,8 +1,8 @@ -package org.dromara.common.core.config; +package com.pusong.common.core.config; import cn.hutool.core.util.ArrayUtil; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.utils.SpringUtils; import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.core.task.VirtualThreadTaskExecutor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/RuoYiConfig.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/config/RuoYiConfig.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/RuoYiConfig.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/config/RuoYiConfig.java index cc0d2df..9c27745 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/RuoYiConfig.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/config/RuoYiConfig.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.config; +package com.pusong.common.core.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/config/ThreadPoolConfig.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/config/ThreadPoolConfig.java index b4d4528..52392ee 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/config/ThreadPoolConfig.java @@ -1,10 +1,10 @@ -package org.dromara.common.core.config; +package com.pusong.common.core.config; import jakarta.annotation.PreDestroy; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.concurrent.BasicThreadFactory; -import org.dromara.common.core.config.properties.ThreadPoolProperties; -import org.dromara.common.core.utils.Threads; +import com.pusong.common.core.config.properties.ThreadPoolProperties; +import com.pusong.common.core.utils.Threads; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/config/ValidatorConfig.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/config/ValidatorConfig.java index 45c5bd1..a1ddd3d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/config/ValidatorConfig.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.config; +package com.pusong.common.core.config; import jakarta.validation.Validator; import org.hibernate.validator.HibernateValidator; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/config/properties/ThreadPoolProperties.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/config/properties/ThreadPoolProperties.java index 820564f..58a1109 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/config/properties/ThreadPoolProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.config.properties; +package com.pusong.common.core.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/CacheConstants.java similarity index 89% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/CacheConstants.java index 67bc8e4..109a866 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/CacheConstants.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package com.pusong.common.core.constant; /** * 缓存的key 常量 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/CacheNames.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/CacheNames.java index 28ba177..cb805f9 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/CacheNames.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package com.pusong.common.core.constant; /** * 缓存组名称常量 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/Constants.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/Constants.java index cdbda89..c44df01 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/Constants.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package com.pusong.common.core.constant; /** * 通用常量信息 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/GlobalConstants.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/GlobalConstants.java index ae9bc2e..8f670c9 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/GlobalConstants.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package com.pusong.common.core.constant; /** * 全局的key常量 (业务无关的key) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/HttpStatus.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/HttpStatus.java index 85566e8..35df0b9 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/HttpStatus.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package com.pusong.common.core.constant; /** * 返回状态码 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/RegexConstants.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/RegexConstants.java index 77eed8c..aec61e4 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/RegexConstants.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package com.pusong.common.core.constant; import cn.hutool.core.lang.RegexPool; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/TenantConstants.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/TenantConstants.java index 86b63c9..d077a02 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/TenantConstants.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package com.pusong.common.core.constant; /** * 租户常量信息 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/UserConstants.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/UserConstants.java index 6f3b0b9..0614cc3 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/UserConstants.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package com.pusong.common.core.constant; /** * 用户常量信息 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/R.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/R.java index be85805..ba9bfdc 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/R.java @@ -1,6 +1,6 @@ -package org.dromara.common.core.domain; +package com.pusong.common.core.domain; -import org.dromara.common.core.constant.HttpStatus; +import com.pusong.common.core.constant.HttpStatus; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/dto/OssDTO.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/dto/OssDTO.java index 463821c..3ee29c0 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/dto/OssDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.pusong.common.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/dto/RoleDTO.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/dto/RoleDTO.java index aea8e7a..bb51be3 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/dto/RoleDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.pusong.common.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/dto/UserDTO.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/dto/UserDTO.java index cb5def9..102f291 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/dto/UserDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.pusong.common.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/dto/UserOnlineDTO.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/dto/UserOnlineDTO.java index 43d8c3c..55a6f62 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/dto/UserOnlineDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.pusong.common.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/event/ProcessEvent.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/event/ProcessEvent.java index 61c7efc..b8aa2f0 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/event/ProcessEvent.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.event; +package com.pusong.common.core.domain.event; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/event/ProcessTaskEvent.java similarity index 91% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/event/ProcessTaskEvent.java index 019ca82..fe0547d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/event/ProcessTaskEvent.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.event; +package com.pusong.common.core.domain.event; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/EmailLoginBody.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/EmailLoginBody.java index ffde8c6..57a3150 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/EmailLoginBody.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package com.pusong.common.core.domain.model; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/LoginBody.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/LoginBody.java index 63bee0d..9062093 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/LoginBody.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package com.pusong.common.core.domain.model; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/LoginUser.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/LoginUser.java index c723e76..d9a98fe 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/LoginUser.java @@ -1,6 +1,6 @@ -package org.dromara.common.core.domain.model; +package com.pusong.common.core.domain.model; -import org.dromara.common.core.domain.dto.RoleDTO; +import com.pusong.common.core.domain.dto.RoleDTO; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/PasswordLoginBody.java similarity index 59% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/PasswordLoginBody.java index 22de8f2..48b6eca 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/PasswordLoginBody.java @@ -1,12 +1,11 @@ -package org.dromara.common.core.domain.model; +package com.pusong.common.core.domain.model; +import com.pusong.common.core.constant.UserConstants; import jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.validator.constraints.Length; -import static org.dromara.common.core.constant.UserConstants.*; - /** * 密码登录对象 * @@ -20,14 +19,14 @@ public class PasswordLoginBody extends LoginBody { * 用户名 */ @NotBlank(message = "{user.username.not.blank}") - @Length(min = USERNAME_MIN_LENGTH, max = USERNAME_MAX_LENGTH, message = "{user.username.length.valid}") + @Length(min = UserConstants.USERNAME_MIN_LENGTH, max = UserConstants.USERNAME_MAX_LENGTH, message = "{user.username.length.valid}") private String username; /** * 用户密码 */ @NotBlank(message = "{user.password.not.blank}") - @Length(min = PASSWORD_MIN_LENGTH, max = PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}") + @Length(min = UserConstants.PASSWORD_MIN_LENGTH, max = UserConstants.PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}") private String password; } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/RegisterBody.java similarity index 60% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/RegisterBody.java index 440422b..a011a07 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/RegisterBody.java @@ -1,12 +1,11 @@ -package org.dromara.common.core.domain.model; +package com.pusong.common.core.domain.model; +import com.pusong.common.core.constant.UserConstants; import jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.validator.constraints.Length; -import static org.dromara.common.core.constant.UserConstants.*; - /** * 用户注册对象 * @@ -20,14 +19,14 @@ public class RegisterBody extends LoginBody { * 用户名 */ @NotBlank(message = "{user.username.not.blank}") - @Length(min = USERNAME_MIN_LENGTH, max = USERNAME_MAX_LENGTH, message = "{user.username.length.valid}") + @Length(min = UserConstants.USERNAME_MIN_LENGTH, max = UserConstants.USERNAME_MAX_LENGTH, message = "{user.username.length.valid}") private String username; /** * 用户密码 */ @NotBlank(message = "{user.password.not.blank}") - @Length(min = PASSWORD_MIN_LENGTH, max = PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}") + @Length(min = UserConstants.PASSWORD_MIN_LENGTH, max = UserConstants.PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}") private String password; private String userType; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/SmsLoginBody.java similarity index 91% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/SmsLoginBody.java index a878348..7474178 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/SmsLoginBody.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package com.pusong.common.core.domain.model; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/SocialLoginBody.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/SocialLoginBody.java index 0d1b121..f1b1c37 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/SocialLoginBody.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package com.pusong.common.core.domain.model; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/XcxLoginBody.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/XcxLoginBody.java index 518fe2e..3269a90 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/XcxLoginBody.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package com.pusong.common.core.domain.model; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/XcxLoginUser.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/XcxLoginUser.java index e5f3d6c..b5625f4 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/XcxLoginUser.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package com.pusong.common.core.domain.model; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/enums/BusinessStatusEnum.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/enums/BusinessStatusEnum.java index 0af943a..d585f9b 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/enums/BusinessStatusEnum.java @@ -1,10 +1,10 @@ -package org.dromara.common.core.enums; +package com.pusong.common.core.enums; import cn.hutool.core.util.StrUtil; +import com.pusong.common.core.utils.StringUtils; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StringUtils; +import com.pusong.common.core.exception.ServiceException; import java.util.Arrays; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/enums/DeviceType.java similarity index 91% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/enums/DeviceType.java index dbadfc2..cbb4ac5 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/enums/DeviceType.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.enums; +package com.pusong.common.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/enums/LoginType.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/enums/LoginType.java index f9cac66..16ef458 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/enums/LoginType.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.enums; +package com.pusong.common.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/TenantStatus.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/enums/TenantStatus.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/TenantStatus.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/enums/TenantStatus.java index 400a399..7421c68 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/TenantStatus.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/enums/TenantStatus.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.enums; +package com.pusong.common.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/enums/UserStatus.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/enums/UserStatus.java index be7e44d..8d873fa 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/enums/UserStatus.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.enums; +package com.pusong.common.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/enums/UserType.java similarity index 87% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/enums/UserType.java index 69e4753..7bfb64e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/enums/UserType.java @@ -1,6 +1,6 @@ -package org.dromara.common.core.enums; +package com.pusong.common.core.enums; -import org.dromara.common.core.utils.StringUtils; +import com.pusong.common.core.utils.StringUtils; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/ServiceException.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/ServiceException.java index e9dc6ec..7a28eb3 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/ServiceException.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.exception; +package com.pusong.common.core.exception; import lombok.*; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/base/BaseException.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/base/BaseException.java index 40ce01b..757b93c 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/base/BaseException.java @@ -1,8 +1,8 @@ -package org.dromara.common.core.exception.base; +package com.pusong.common.core.exception.base; +import com.pusong.common.core.utils.MessageUtils; +import com.pusong.common.core.utils.StringUtils; import lombok.AllArgsConstructor; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.StringUtils; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/file/FileException.java similarity index 73% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/file/FileException.java index d374fc0..ce2b466 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/file/FileException.java @@ -1,6 +1,6 @@ -package org.dromara.common.core.exception.file; +package com.pusong.common.core.exception.file; -import org.dromara.common.core.exception.base.BaseException; +import com.pusong.common.core.exception.base.BaseException; import java.io.Serial; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/file/FileNameLengthLimitExceededException.java similarity index 89% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/file/FileNameLengthLimitExceededException.java index af98124..eb114d3 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/file/FileNameLengthLimitExceededException.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.exception.file; +package com.pusong.common.core.exception.file; import java.io.Serial; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/file/FileSizeLimitExceededException.java similarity index 88% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/file/FileSizeLimitExceededException.java index 1eb8d40..5991011 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/file/FileSizeLimitExceededException.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.exception.file; +package com.pusong.common.core.exception.file; import java.io.Serial; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/user/CaptchaException.java similarity index 85% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/user/CaptchaException.java index 43824e0..3af1db7 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/user/CaptchaException.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.exception.user; +package com.pusong.common.core.exception.user; import java.io.Serial; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/user/CaptchaExpireException.java similarity index 85% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/user/CaptchaExpireException.java index f4b8cac..c235c5e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/user/CaptchaExpireException.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.exception.user; +package com.pusong.common.core.exception.user; import java.io.Serial; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/user/UserException.java similarity index 73% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/user/UserException.java index 024fed6..db29ca7 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/user/UserException.java @@ -1,6 +1,6 @@ -package org.dromara.common.core.exception.user; +package com.pusong.common.core.exception.user; -import org.dromara.common.core.exception.base.BaseException; +import com.pusong.common.core.exception.base.BaseException; import java.io.Serial; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/factory/RegexPatternPoolFactory.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/factory/RegexPatternPoolFactory.java index fd907d2..f244416 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/factory/RegexPatternPoolFactory.java @@ -1,7 +1,7 @@ -package org.dromara.common.core.factory; +package com.pusong.common.core.factory; import cn.hutool.core.lang.PatternPool; -import org.dromara.common.core.constant.RegexConstants; +import com.pusong.common.core.constant.RegexConstants; import java.util.regex.Pattern; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/factory/YmlPropertySourceFactory.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/factory/YmlPropertySourceFactory.java index af61b90..9587d75 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/factory/YmlPropertySourceFactory.java @@ -1,6 +1,6 @@ -package org.dromara.common.core.factory; +package com.pusong.common.core.factory; -import org.dromara.common.core.utils.StringUtils; +import com.pusong.common.core.utils.StringUtils; import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; import org.springframework.core.env.PropertiesPropertySource; import org.springframework.core.env.PropertySource; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/ConfigService.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/service/ConfigService.java similarity index 86% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/ConfigService.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/service/ConfigService.java index 7328c69..c59b286 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/ConfigService.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/service/ConfigService.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.service; +package com.pusong.common.core.service; /** * 通用 参数配置服务 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/service/DeptService.java similarity index 87% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/service/DeptService.java index db9463e..e2ceb66 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/service/DeptService.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.service; +package com.pusong.common.core.service; /** * 通用 部门服务 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/service/DictService.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/service/DictService.java index b78a7f2..8f8c595 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/service/DictService.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.service; +package com.pusong.common.core.service; import java.util.Map; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/OssService.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/service/OssService.java similarity index 83% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/OssService.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/service/OssService.java index 1a52de0..bdf7c17 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/OssService.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/service/OssService.java @@ -1,6 +1,6 @@ -package org.dromara.common.core.service; +package com.pusong.common.core.service; -import org.dromara.common.core.domain.dto.OssDTO; +import com.pusong.common.core.domain.dto.OssDTO; import java.util.List; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/service/UserService.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/service/UserService.java index 0f2878d..943399e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/service/UserService.java @@ -1,6 +1,6 @@ -package org.dromara.common.core.service; +package com.pusong.common.core.service; -import org.dromara.common.core.domain.dto.UserDTO; +import com.pusong.common.core.domain.dto.UserDTO; import java.util.List; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/service/WorkflowService.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/service/WorkflowService.java index 4e556c9..a9bbdf2 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/service/WorkflowService.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.service; +package com.pusong.common.core.service; import java.util.List; import java.util.Map; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/DateUtils.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/DateUtils.java index 72178a7..ba1f05d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/DateUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.pusong.common.core.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/MapstructUtils.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/MapstructUtils.java index b6acff7..61c40e1 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/MapstructUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.pusong.common.core.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.map.MapUtil; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/MessageUtils.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/MessageUtils.java index 48dfc08..8a9449e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/MessageUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.pusong.common.core.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/ServletUtils.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/ServletUtils.java index a1316eb..bb8c820 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/ServletUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.pusong.common.core.utils; import cn.hutool.core.convert.Convert; import cn.hutool.extra.servlet.JakartaServletUtil; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/SpringUtils.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/SpringUtils.java index 169c6e2..5e0da73 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/SpringUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.pusong.common.core.utils; import cn.hutool.extra.spring.SpringUtil; import org.springframework.beans.factory.NoSuchBeanDefinitionException; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/StreamUtils.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/StreamUtils.java index 967612e..05a90bf 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/StreamUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.pusong.common.core.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.map.MapUtil; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/StringUtils.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/StringUtils.java index dd6ebb1..4c4e9db 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/StringUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.pusong.common.core.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/Threads.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/Threads.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/Threads.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/Threads.java index ae6cfa3..82d31df 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/Threads.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/Threads.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.pusong.common.core.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/TreeBuildUtils.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/TreeBuildUtils.java index d0163e6..bfe0585 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/TreeBuildUtils.java @@ -1,11 +1,11 @@ -package org.dromara.common.core.utils; +package com.pusong.common.core.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.TreeNodeConfig; import cn.hutool.core.lang.tree.TreeUtil; import cn.hutool.core.lang.tree.parser.NodeParser; -import org.dromara.common.core.utils.reflect.ReflectUtils; +import com.pusong.common.core.utils.reflect.ReflectUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/ValidatorUtils.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/ValidatorUtils.java index 06b8fd6..7f93a6a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/ValidatorUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.pusong.common.core.utils; import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolationException; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/file/FileUtils.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/file/FileUtils.java index 573b207..f2cd817 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/file/FileUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils.file; +package com.pusong.common.core.utils.file; import cn.hutool.core.io.FileUtil; import jakarta.servlet.http.HttpServletResponse; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/file/MimeTypeUtils.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/file/MimeTypeUtils.java index 23fa2cf..a23d1df 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/file/MimeTypeUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils.file; +package com.pusong.common.core.utils.file; /** * 媒体类型工具类 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/ip/AddressUtils.java similarity index 89% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/ip/AddressUtils.java index 3f7cd57..04db93a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/ip/AddressUtils.java @@ -1,8 +1,8 @@ -package org.dromara.common.core.utils.ip; +package com.pusong.common.core.utils.ip; import cn.hutool.core.net.NetUtil; import cn.hutool.http.HtmlUtil; -import org.dromara.common.core.utils.StringUtils; +import com.pusong.common.core.utils.StringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/ip/RegionUtils.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/ip/RegionUtils.java index 6e2a44e..8ecabf7 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/ip/RegionUtils.java @@ -1,10 +1,10 @@ -package org.dromara.common.core.utils.ip; +package com.pusong.common.core.utils.ip; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.resource.ClassPathResource; import cn.hutool.core.util.ObjectUtil; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.file.FileUtils; +import com.pusong.common.core.utils.file.FileUtils; +import com.pusong.common.core.exception.ServiceException; import lombok.extern.slf4j.Slf4j; import org.lionsoul.ip2region.xdb.Searcher; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/reflect/ReflectUtils.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/reflect/ReflectUtils.java index 367e8c9..cef0487 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/reflect/ReflectUtils.java @@ -1,7 +1,7 @@ -package org.dromara.common.core.utils.reflect; +package com.pusong.common.core.utils.reflect; import cn.hutool.core.util.ReflectUtil; -import org.dromara.common.core.utils.StringUtils; +import com.pusong.common.core.utils.StringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/regex/RegexUtils.java similarity index 89% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/regex/RegexUtils.java index b8b12d4..b3e86d4 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/regex/RegexUtils.java @@ -1,8 +1,8 @@ -package org.dromara.common.core.utils.regex; +package com.pusong.common.core.utils.regex; import cn.hutool.core.util.ReUtil; -import org.dromara.common.core.constant.RegexConstants; +import com.pusong.common.core.constant.RegexConstants; /** * 正则相关工具类 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/regex/RegexValidator.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/regex/RegexValidator.java index c0dda20..fb561af 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/regex/RegexValidator.java @@ -1,8 +1,8 @@ -package org.dromara.common.core.utils.regex; +package com.pusong.common.core.utils.regex; import cn.hutool.core.exceptions.ValidateException; import cn.hutool.core.lang.Validator; -import org.dromara.common.core.factory.RegexPatternPoolFactory; +import com.pusong.common.core.factory.RegexPatternPoolFactory; import java.util.regex.Pattern; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/sql/SqlUtil.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/sql/SqlUtil.java index 3e109b2..69e80d0 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/sql/SqlUtil.java @@ -1,8 +1,8 @@ -package org.dromara.common.core.utils.sql; +package com.pusong.common.core.utils.sql; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.StringUtils; +import com.pusong.common.core.utils.StringUtils; /** * sql操作工具类 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/validate/AddGroup.java similarity index 65% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/validate/AddGroup.java index 0275899..cfda05c 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/validate/AddGroup.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.validate; +package com.pusong.common.core.validate; /** * 校验分组 add diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/validate/EditGroup.java similarity index 66% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/validate/EditGroup.java index 77c5040..16f00a9 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/validate/EditGroup.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.validate; +package com.pusong.common.core.validate; /** * 校验分组 edit diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/validate/QueryGroup.java similarity index 66% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/validate/QueryGroup.java index 02a0ac2..35751a2 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/validate/QueryGroup.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.validate; +package com.pusong.common.core.validate; /** * 校验分组 query diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/xss/Xss.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/xss/Xss.java index eed495f..e7c6952 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/xss/Xss.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.xss; +package com.pusong.common.core.xss; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/xss/XssValidator.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java rename to pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/xss/XssValidator.java index 9c32563..54e2673 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java +++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/xss/XssValidator.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.xss; +package com.pusong.common.core.xss; import cn.hutool.core.util.ReUtil; import cn.hutool.http.HtmlUtil; diff --git a/pusong-common/pusong-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pusong-common/pusong-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..2e8f6ef --- /dev/null +++ b/pusong-common/pusong-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,6 @@ +com.pusong.common.core.config.ApplicationConfig +com.pusong.common.core.config.AsyncConfig +com.pusong.common.core.config.RuoYiConfig +com.pusong.common.core.config.ThreadPoolConfig +com.pusong.common.core.config.ValidatorConfig +com.pusong.common.core.utils.SpringUtils diff --git a/ruoyi-common/ruoyi-common-doc/pom.xml b/pusong-common/pusong-common-doc/pom.xml similarity index 81% rename from ruoyi-common/ruoyi-common-doc/pom.xml rename to pusong-common/pusong-common-doc/pom.xml index c6199a1..f0f3b75 100644 --- a/ruoyi-common/ruoyi-common-doc/pom.xml +++ b/pusong-common/pusong-common-doc/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.pusong + pusong-common ${revision} 4.0.0 - ruoyi-common-doc + pusong-common-doc ruoyi-common-doc 系统接口 @@ -17,8 +17,8 @@ - org.dromara - ruoyi-common-core + com.pusong + pusong-common-core diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java b/pusong-common/pusong-common-doc/src/main/java/com/pusong/common/doc/config/SpringDocConfig.java similarity index 95% rename from ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java rename to pusong-common/pusong-common-doc/src/main/java/com/pusong/common/doc/config/SpringDocConfig.java index 069ef9a..bc161f0 100644 --- a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java +++ b/pusong-common/pusong-common-doc/src/main/java/com/pusong/common/doc/config/SpringDocConfig.java @@ -1,13 +1,13 @@ -package org.dromara.common.doc.config; +package com.pusong.common.doc.config; +import com.pusong.common.doc.config.properties.SpringDocProperties; +import com.pusong.common.doc.handler.OpenApiHandler; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Paths; import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.security.SecurityRequirement; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.doc.config.properties.SpringDocProperties; -import org.dromara.common.doc.handler.OpenApiHandler; +import com.pusong.common.core.utils.StringUtils; import org.springdoc.core.configuration.SpringDocConfiguration; import org.springdoc.core.customizers.OpenApiBuilderCustomizer; import org.springdoc.core.customizers.OpenApiCustomizer; diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java b/pusong-common/pusong-common-doc/src/main/java/com/pusong/common/doc/config/properties/SpringDocProperties.java similarity index 97% rename from ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java rename to pusong-common/pusong-common-doc/src/main/java/com/pusong/common/doc/config/properties/SpringDocProperties.java index eae3b4c..8ab6d41 100644 --- a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java +++ b/pusong-common/pusong-common-doc/src/main/java/com/pusong/common/doc/config/properties/SpringDocProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.doc.config.properties; +package com.pusong.common.doc.config.properties; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.ExternalDocumentation; diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java b/pusong-common/pusong-common-doc/src/main/java/com/pusong/common/doc/handler/OpenApiHandler.java similarity index 99% rename from ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java rename to pusong-common/pusong-common-doc/src/main/java/com/pusong/common/doc/handler/OpenApiHandler.java index a35cc64..24c5690 100644 --- a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java +++ b/pusong-common/pusong-common-doc/src/main/java/com/pusong/common/doc/handler/OpenApiHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.doc.handler; +package com.pusong.common.doc.handler; import cn.hutool.core.io.IoUtil; import io.swagger.v3.core.jackson.TypeNameResolver; diff --git a/pusong-common/pusong-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pusong-common/pusong-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..b7f3dd6 --- /dev/null +++ b/pusong-common/pusong-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.pusong.common.doc.config.SpringDocConfig diff --git a/ruoyi-common/ruoyi-common-encrypt/pom.xml b/pusong-common/pusong-common-encrypt/pom.xml similarity index 85% rename from ruoyi-common/ruoyi-common-encrypt/pom.xml rename to pusong-common/pusong-common-encrypt/pom.xml index ed4910e..eaf2b76 100644 --- a/ruoyi-common/ruoyi-common-encrypt/pom.xml +++ b/pusong-common/pusong-common-encrypt/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.pusong + pusong-common ${revision} 4.0.0 - ruoyi-common-encrypt + pusong-common-encrypt ruoyi-common-encrypt 数据加解密模块 @@ -18,8 +18,8 @@ - org.dromara - ruoyi-common-core + com.pusong + pusong-common-core diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/annotation/ApiEncrypt.java similarity index 87% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java rename to pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/annotation/ApiEncrypt.java index 7f52de8..9717442 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java +++ b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/annotation/ApiEncrypt.java @@ -1,4 +1,4 @@ -package org.dromara.common.encrypt.annotation; +package com.pusong.common.encrypt.annotation; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/annotation/EncryptField.java similarity index 81% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java rename to pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/annotation/EncryptField.java index d357d72..6f7af07 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java +++ b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/annotation/EncryptField.java @@ -1,7 +1,7 @@ -package org.dromara.common.encrypt.annotation; +package com.pusong.common.encrypt.annotation; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; +import com.pusong.common.encrypt.enumd.AlgorithmType; +import com.pusong.common.encrypt.enumd.EncodeType; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/config/ApiDecryptAutoConfiguration.java similarity index 87% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java rename to pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/config/ApiDecryptAutoConfiguration.java index 098f6bc..691948d 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java +++ b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/config/ApiDecryptAutoConfiguration.java @@ -1,8 +1,8 @@ -package org.dromara.common.encrypt.config; +package com.pusong.common.encrypt.config; +import com.pusong.common.encrypt.filter.CryptoFilter; import jakarta.servlet.DispatcherType; -import org.dromara.common.encrypt.filter.CryptoFilter; -import org.dromara.common.encrypt.properties.ApiDecryptProperties; +import com.pusong.common.encrypt.properties.ApiDecryptProperties; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/config/EncryptorAutoConfiguration.java similarity index 82% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java rename to pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/config/EncryptorAutoConfiguration.java index fbc4e52..dbb9c10 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java +++ b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/config/EncryptorAutoConfiguration.java @@ -1,12 +1,12 @@ -package org.dromara.common.encrypt.config; +package com.pusong.common.encrypt.config; import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration; import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.encrypt.core.EncryptorManager; -import org.dromara.common.encrypt.interceptor.MybatisDecryptInterceptor; -import org.dromara.common.encrypt.interceptor.MybatisEncryptInterceptor; -import org.dromara.common.encrypt.properties.EncryptorProperties; +import com.pusong.common.encrypt.core.EncryptorManager; +import com.pusong.common.encrypt.interceptor.MybatisDecryptInterceptor; +import com.pusong.common.encrypt.interceptor.MybatisEncryptInterceptor; +import com.pusong.common.encrypt.properties.EncryptorProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/EncryptContext.java similarity index 77% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java rename to pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/EncryptContext.java index 2f02eaf..17a6154 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java +++ b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/EncryptContext.java @@ -1,7 +1,7 @@ -package org.dromara.common.encrypt.core; +package com.pusong.common.encrypt.core; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; +import com.pusong.common.encrypt.enumd.AlgorithmType; +import com.pusong.common.encrypt.enumd.EncodeType; import lombok.Data; /** diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/EncryptorManager.java similarity index 97% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java rename to pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/EncryptorManager.java index a6d3cf9..18fafcd 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java +++ b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/EncryptorManager.java @@ -1,4 +1,4 @@ -package org.dromara.common.encrypt.core; +package com.pusong.common.encrypt.core; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -6,8 +6,8 @@ import cn.hutool.core.util.ReflectUtil; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.io.Resources; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.annotation.EncryptField; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.encrypt.annotation.EncryptField; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/IEncryptor.java similarity index 78% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java rename to pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/IEncryptor.java index dbc4420..852eede 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java +++ b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/IEncryptor.java @@ -1,7 +1,7 @@ -package org.dromara.common.encrypt.core; +package com.pusong.common.encrypt.core; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; +import com.pusong.common.encrypt.enumd.AlgorithmType; +import com.pusong.common.encrypt.enumd.EncodeType; /** * 加解者 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/encryptor/AbstractEncryptor.java similarity index 62% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java rename to pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/encryptor/AbstractEncryptor.java index 858d229..a9987c2 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java +++ b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/encryptor/AbstractEncryptor.java @@ -1,7 +1,7 @@ -package org.dromara.common.encrypt.core.encryptor; +package com.pusong.common.encrypt.core.encryptor; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.core.IEncryptor; +import com.pusong.common.encrypt.core.EncryptContext; +import com.pusong.common.encrypt.core.IEncryptor; /** * 所有加密执行者的基类 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/encryptor/AesEncryptor.java similarity index 80% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java rename to pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/encryptor/AesEncryptor.java index e4dc597..bb05167 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java +++ b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/encryptor/AesEncryptor.java @@ -1,9 +1,9 @@ -package org.dromara.common.encrypt.core.encryptor; +package com.pusong.common.encrypt.core.encryptor; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.utils.EncryptUtils; +import com.pusong.common.encrypt.enumd.AlgorithmType; +import com.pusong.common.encrypt.enumd.EncodeType; +import com.pusong.common.encrypt.utils.EncryptUtils; +import com.pusong.common.encrypt.core.EncryptContext; /** * AES算法实现 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/encryptor/Base64Encryptor.java similarity index 75% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java rename to pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/encryptor/Base64Encryptor.java index 0028548..fc209a8 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java +++ b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/encryptor/Base64Encryptor.java @@ -1,9 +1,9 @@ -package org.dromara.common.encrypt.core.encryptor; +package com.pusong.common.encrypt.core.encryptor; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.utils.EncryptUtils; +import com.pusong.common.encrypt.enumd.AlgorithmType; +import com.pusong.common.encrypt.enumd.EncodeType; +import com.pusong.common.encrypt.utils.EncryptUtils; +import com.pusong.common.encrypt.core.EncryptContext; /** * Base64算法实现 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/encryptor/RsaEncryptor.java similarity index 81% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java rename to pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/encryptor/RsaEncryptor.java index 5f03a4b..25f0daa 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java +++ b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/encryptor/RsaEncryptor.java @@ -1,10 +1,10 @@ -package org.dromara.common.encrypt.core.encryptor; +package com.pusong.common.encrypt.core.encryptor; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.utils.EncryptUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.encrypt.enumd.AlgorithmType; +import com.pusong.common.encrypt.enumd.EncodeType; +import com.pusong.common.encrypt.utils.EncryptUtils; +import com.pusong.common.encrypt.core.EncryptContext; /** diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/encryptor/Sm2Encryptor.java similarity index 81% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java rename to pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/encryptor/Sm2Encryptor.java index aec5d82..f21cbb3 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java +++ b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/encryptor/Sm2Encryptor.java @@ -1,10 +1,10 @@ -package org.dromara.common.encrypt.core.encryptor; +package com.pusong.common.encrypt.core.encryptor; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.utils.EncryptUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.encrypt.enumd.AlgorithmType; +import com.pusong.common.encrypt.enumd.EncodeType; +import com.pusong.common.encrypt.utils.EncryptUtils; +import com.pusong.common.encrypt.core.EncryptContext; /** * sm2算法实现 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/encryptor/Sm4Encryptor.java similarity index 80% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java rename to pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/encryptor/Sm4Encryptor.java index adaf674..82064bc 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java +++ b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/core/encryptor/Sm4Encryptor.java @@ -1,9 +1,9 @@ -package org.dromara.common.encrypt.core.encryptor; +package com.pusong.common.encrypt.core.encryptor; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.utils.EncryptUtils; +import com.pusong.common.encrypt.enumd.AlgorithmType; +import com.pusong.common.encrypt.enumd.EncodeType; +import com.pusong.common.encrypt.utils.EncryptUtils; +import com.pusong.common.encrypt.core.EncryptContext; /** * sm4算法实现 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/enumd/AlgorithmType.java similarity index 80% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java rename to pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/enumd/AlgorithmType.java index 26ee1ee..e786368 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java +++ b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/enumd/AlgorithmType.java @@ -1,8 +1,9 @@ -package org.dromara.common.encrypt.enumd; +package com.pusong.common.encrypt.enumd; +import com.pusong.common.encrypt.core.encryptor.*; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.common.encrypt.core.encryptor.*; +import com.pusong.common.encrypt.core.encryptor.*; /** * 算法名称 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/enumd/EncodeType.java similarity index 85% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java rename to pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/enumd/EncodeType.java index f471221..f7fa027 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java +++ b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/enumd/EncodeType.java @@ -1,4 +1,4 @@ -package org.dromara.common.encrypt.enumd; +package com.pusong.common.encrypt.enumd; /** * 编码类型 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/filter/CryptoFilter.java similarity index 91% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java rename to pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/filter/CryptoFilter.java index 9835132..2894cc6 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java +++ b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/filter/CryptoFilter.java @@ -1,15 +1,15 @@ -package org.dromara.common.encrypt.filter; +package com.pusong.common.encrypt.filter; import cn.hutool.core.util.ObjectUtil; import jakarta.servlet.*; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.dromara.common.core.constant.HttpStatus; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.annotation.ApiEncrypt; -import org.dromara.common.encrypt.properties.ApiDecryptProperties; +import com.pusong.common.core.constant.HttpStatus; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.encrypt.annotation.ApiEncrypt; +import com.pusong.common.encrypt.properties.ApiDecryptProperties; import org.springframework.http.HttpMethod; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerExceptionResolver; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/filter/DecryptRequestBodyWrapper.java similarity index 94% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java rename to pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/filter/DecryptRequestBodyWrapper.java index 98f4bc7..f85d615 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java +++ b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/filter/DecryptRequestBodyWrapper.java @@ -1,12 +1,12 @@ -package org.dromara.common.encrypt.filter; +package com.pusong.common.encrypt.filter; import cn.hutool.core.io.IoUtil; +import com.pusong.common.encrypt.utils.EncryptUtils; import jakarta.servlet.ReadListener; import jakarta.servlet.ServletInputStream; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequestWrapper; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.encrypt.utils.EncryptUtils; +import com.pusong.common.core.constant.Constants; import org.springframework.http.MediaType; import java.io.BufferedReader; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/filter/EncryptResponseBodyWrapper.java similarity index 97% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java rename to pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/filter/EncryptResponseBodyWrapper.java index c0af232..3e1c203 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java +++ b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/filter/EncryptResponseBodyWrapper.java @@ -1,11 +1,11 @@ -package org.dromara.common.encrypt.filter; +package com.pusong.common.encrypt.filter; import cn.hutool.core.util.RandomUtil; +import com.pusong.common.encrypt.utils.EncryptUtils; import jakarta.servlet.ServletOutputStream; import jakarta.servlet.WriteListener; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponseWrapper; -import org.dromara.common.encrypt.utils.EncryptUtils; import java.io.*; import java.nio.charset.StandardCharsets; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/interceptor/MybatisDecryptInterceptor.java similarity index 89% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java rename to pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/interceptor/MybatisDecryptInterceptor.java index 460aa36..7efd00a 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java +++ b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/interceptor/MybatisDecryptInterceptor.java @@ -1,19 +1,19 @@ -package org.dromara.common.encrypt.interceptor; +package com.pusong.common.encrypt.interceptor; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; +import com.pusong.common.encrypt.annotation.EncryptField; +import com.pusong.common.encrypt.core.EncryptContext; +import com.pusong.common.encrypt.core.EncryptorManager; +import com.pusong.common.encrypt.enumd.AlgorithmType; +import com.pusong.common.encrypt.enumd.EncodeType; +import com.pusong.common.encrypt.properties.EncryptorProperties; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.executor.resultset.ResultSetHandler; import org.apache.ibatis.plugin.*; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.annotation.EncryptField; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.core.EncryptorManager; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.properties.EncryptorProperties; +import com.pusong.common.core.utils.StringUtils; import java.lang.reflect.Field; import java.sql.Statement; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/interceptor/MybatisEncryptInterceptor.java similarity index 90% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java rename to pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/interceptor/MybatisEncryptInterceptor.java index bcc2f4c..bd76b5b 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java +++ b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/interceptor/MybatisEncryptInterceptor.java @@ -1,8 +1,14 @@ -package org.dromara.common.encrypt.interceptor; +package com.pusong.common.encrypt.interceptor; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; +import com.pusong.common.encrypt.annotation.EncryptField; +import com.pusong.common.encrypt.core.EncryptContext; +import com.pusong.common.encrypt.core.EncryptorManager; +import com.pusong.common.encrypt.enumd.AlgorithmType; +import com.pusong.common.encrypt.enumd.EncodeType; +import com.pusong.common.encrypt.properties.EncryptorProperties; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.executor.parameter.ParameterHandler; @@ -10,13 +16,7 @@ import org.apache.ibatis.plugin.Interceptor; import org.apache.ibatis.plugin.Intercepts; import org.apache.ibatis.plugin.Invocation; import org.apache.ibatis.plugin.Signature; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.annotation.EncryptField; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.core.EncryptorManager; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.properties.EncryptorProperties; +import com.pusong.common.core.utils.StringUtils; import java.lang.reflect.Field; import java.sql.PreparedStatement; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/properties/ApiDecryptProperties.java similarity index 91% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java rename to pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/properties/ApiDecryptProperties.java index 6aadb3e..a769827 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java +++ b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/properties/ApiDecryptProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.encrypt.properties; +package com.pusong.common.encrypt.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/properties/EncryptorProperties.java similarity index 81% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java rename to pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/properties/EncryptorProperties.java index ba445c1..38d2fdf 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java +++ b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/properties/EncryptorProperties.java @@ -1,7 +1,7 @@ -package org.dromara.common.encrypt.properties; +package com.pusong.common.encrypt.properties; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; +import com.pusong.common.encrypt.enumd.AlgorithmType; +import com.pusong.common.encrypt.enumd.EncodeType; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/utils/EncryptUtils.java similarity index 99% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java rename to pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/utils/EncryptUtils.java index 8e34843..d36ca03 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java +++ b/pusong-common/pusong-common-encrypt/src/main/java/com/pusong/common/encrypt/utils/EncryptUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.encrypt.utils; +package com.pusong.common.encrypt.utils; import cn.hutool.core.codec.Base64; import cn.hutool.core.util.ArrayUtil; diff --git a/pusong-common/pusong-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pusong-common/pusong-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..3e5cde9 --- /dev/null +++ b/pusong-common/pusong-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,3 @@ +com.pusong.common.encrypt.config.EncryptorAutoConfiguration +com.pusong.common.encrypt.config.ApiDecryptAutoConfiguration + diff --git a/ruoyi-common/ruoyi-common-excel/pom.xml b/pusong-common/pusong-common-excel/pom.xml similarity index 74% rename from ruoyi-common/ruoyi-common-excel/pom.xml rename to pusong-common/pusong-common-excel/pom.xml index dd4a5ee..6bcf346 100644 --- a/ruoyi-common/ruoyi-common-excel/pom.xml +++ b/pusong-common/pusong-common-excel/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.pusong + pusong-common ${revision} 4.0.0 - ruoyi-common-excel + pusong-common-excel ruoyi-common-excel @@ -17,8 +17,8 @@ - org.dromara - ruoyi-common-json + com.pusong + pusong-common-json diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/annotation/CellMerge.java similarity index 80% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java rename to pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/annotation/CellMerge.java index 6b9211b..6e710ca 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java +++ b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/annotation/CellMerge.java @@ -1,6 +1,6 @@ -package org.dromara.common.excel.annotation; +package com.pusong.common.excel.annotation; -import org.dromara.common.excel.core.CellMergeStrategy; +import com.pusong.common.excel.core.CellMergeStrategy; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/annotation/ExcelDictFormat.java similarity index 85% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java rename to pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/annotation/ExcelDictFormat.java index 5c51842..70f0cd1 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java +++ b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/annotation/ExcelDictFormat.java @@ -1,6 +1,6 @@ -package org.dromara.common.excel.annotation; +package com.pusong.common.excel.annotation; -import org.dromara.common.core.utils.StringUtils; +import com.pusong.common.core.utils.StringUtils; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/annotation/ExcelEnumFormat.java similarity index 92% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java rename to pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/annotation/ExcelEnumFormat.java index 290379d..cab6224 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java +++ b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/annotation/ExcelEnumFormat.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.annotation; +package com.pusong.common.excel.annotation; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/convert/ExcelBigNumberConvert.java similarity index 97% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java rename to pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/convert/ExcelBigNumberConvert.java index 07cc4c4..9ce146d 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java +++ b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/convert/ExcelBigNumberConvert.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.convert; +package com.pusong.common.excel.convert; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/convert/ExcelDictConvert.java similarity index 88% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java rename to pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/convert/ExcelDictConvert.java index 61eeabf..570454e 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java +++ b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/convert/ExcelDictConvert.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.convert; +package com.pusong.common.excel.convert; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.convert.Convert; @@ -9,11 +9,11 @@ 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 org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.core.service.DictService; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.excel.utils.ExcelUtil; +import com.pusong.common.excel.annotation.ExcelDictFormat; +import com.pusong.common.core.service.DictService; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.excel.utils.ExcelUtil; import lombok.extern.slf4j.Slf4j; import java.lang.reflect.Field; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/convert/ExcelEnumConvert.java similarity index 95% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java rename to pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/convert/ExcelEnumConvert.java index b948ea7..4c212f3 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java +++ b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/convert/ExcelEnumConvert.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.convert; +package com.pusong.common.excel.convert; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.convert.Convert; @@ -9,8 +9,8 @@ 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 org.dromara.common.core.utils.reflect.ReflectUtils; -import org.dromara.common.excel.annotation.ExcelEnumFormat; +import com.pusong.common.core.utils.reflect.ReflectUtils; +import com.pusong.common.excel.annotation.ExcelEnumFormat; import lombok.extern.slf4j.Slf4j; import java.lang.reflect.Field; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/core/CellMergeStrategy.java similarity index 97% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java rename to pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/core/CellMergeStrategy.java index 7c0a48b..87051d1 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java +++ b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/core/CellMergeStrategy.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.core; +package com.pusong.common.excel.core; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ReflectUtil; @@ -8,6 +8,7 @@ import com.alibaba.excel.metadata.Head; import com.alibaba.excel.write.handler.WorkbookWriteHandler; import com.alibaba.excel.write.handler.context.WorkbookWriteHandlerContext; import com.alibaba.excel.write.merge.AbstractMergeStrategy; +import com.pusong.common.excel.annotation.CellMerge; import lombok.AllArgsConstructor; import lombok.Data; import lombok.SneakyThrows; @@ -15,8 +16,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.util.CellRangeAddress; -import org.dromara.common.core.utils.reflect.ReflectUtils; -import org.dromara.common.excel.annotation.CellMerge; +import com.pusong.common.core.utils.reflect.ReflectUtils; import java.lang.reflect.Field; import java.util.*; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/core/DefaultExcelListener.java similarity index 94% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java rename to pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/core/DefaultExcelListener.java index b6fa0b4..25aa4ac 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java +++ b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/core/DefaultExcelListener.java @@ -1,13 +1,13 @@ -package org.dromara.common.excel.core; +package com.pusong.common.excel.core; import cn.hutool.core.util.StrUtil; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; import com.alibaba.excel.exception.ExcelAnalysisException; import com.alibaba.excel.exception.ExcelDataConvertException; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.json.utils.JsonUtils; +import com.pusong.common.core.utils.StreamUtils; +import com.pusong.common.core.utils.ValidatorUtils; +import com.pusong.common.json.utils.JsonUtils; import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolationException; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/core/DefaultExcelResult.java similarity index 97% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java rename to pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/core/DefaultExcelResult.java index 7373e12..e71107a 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java +++ b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/core/DefaultExcelResult.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.core; +package com.pusong.common.excel.core; import cn.hutool.core.util.StrUtil; import lombok.Setter; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/core/DropDownOptions.java similarity index 98% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java rename to pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/core/DropDownOptions.java index 8b53a0c..f506d9b 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java +++ b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/core/DropDownOptions.java @@ -1,10 +1,10 @@ -package org.dromara.common.excel.core; +package com.pusong.common.excel.core; import cn.hutool.core.util.StrUtil; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.common.core.exception.ServiceException; +import com.pusong.common.core.exception.ServiceException; import java.util.ArrayList; import java.util.HashMap; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/core/ExcelDownHandler.java similarity index 97% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java rename to pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/core/ExcelDownHandler.java index b3f68ed..dc4dffd 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java +++ b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/core/ExcelDownHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.core; +package com.pusong.common.excel.core; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ArrayUtil; @@ -11,18 +11,18 @@ import com.alibaba.excel.util.ClassUtils; import com.alibaba.excel.write.handler.SheetWriteHandler; import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; +import com.pusong.common.excel.annotation.ExcelDictFormat; +import com.pusong.common.excel.annotation.ExcelEnumFormat; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddressList; import org.apache.poi.ss.util.WorkbookUtil; import org.apache.poi.xssf.usermodel.XSSFDataValidation; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.DictService; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.annotation.ExcelEnumFormat; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.service.DictService; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.StreamUtils; +import com.pusong.common.core.utils.StringUtils; import java.lang.reflect.Field; import java.util.*; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelListener.java b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/core/ExcelListener.java similarity index 84% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelListener.java rename to pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/core/ExcelListener.java index 2d0340f..119e3b2 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelListener.java +++ b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/core/ExcelListener.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.core; +package com.pusong.common.excel.core; import com.alibaba.excel.read.listener.ReadListener; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelResult.java b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/core/ExcelResult.java similarity index 88% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelResult.java rename to pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/core/ExcelResult.java index 0c2a418..6e4ad29 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelResult.java +++ b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/core/ExcelResult.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.core; +package com.pusong.common.excel.core; import java.util.List; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/utils/ExcelUtil.java similarity index 98% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java rename to pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/utils/ExcelUtil.java index a6c14ad..418f5b3 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java +++ b/pusong-common/pusong-common-excel/src/main/java/com/pusong/common/excel/utils/ExcelUtil.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.utils; +package com.pusong.common.excel.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.resource.ClassPathResource; @@ -10,14 +10,15 @@ import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.metadata.fill.FillConfig; import com.alibaba.excel.write.metadata.fill.FillWrapper; import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; +import com.pusong.common.excel.core.*; import jakarta.servlet.ServletOutputStream; import jakarta.servlet.http.HttpServletResponse; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.file.FileUtils; -import org.dromara.common.excel.convert.ExcelBigNumberConvert; -import org.dromara.common.excel.core.*; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.core.utils.file.FileUtils; +import com.pusong.common.excel.convert.ExcelBigNumberConvert; +import com.pusong.common.excel.core.*; import java.io.IOException; import java.io.InputStream; diff --git a/ruoyi-common/ruoyi-common-idempotent/pom.xml b/pusong-common/pusong-common-idempotent/pom.xml similarity index 71% rename from ruoyi-common/ruoyi-common-idempotent/pom.xml rename to pusong-common/pusong-common-idempotent/pom.xml index 64418b4..d37f462 100644 --- a/ruoyi-common/ruoyi-common-idempotent/pom.xml +++ b/pusong-common/pusong-common-idempotent/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.pusong + pusong-common ${revision} 4.0.0 - ruoyi-common-idempotent + pusong-common-idempotent ruoyi-common-idempotent 幂等功能 @@ -17,13 +17,13 @@ - org.dromara - ruoyi-common-json + com.pusong + pusong-common-json - org.dromara - ruoyi-common-redis + com.pusong + pusong-common-redis diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java b/pusong-common/pusong-common-idempotent/src/main/java/com/pusong/common/idempotent/annotation/RepeatSubmit.java similarity index 91% rename from ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java rename to pusong-common/pusong-common-idempotent/src/main/java/com/pusong/common/idempotent/annotation/RepeatSubmit.java index 42ae802..c20cee9 100644 --- a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java +++ b/pusong-common/pusong-common-idempotent/src/main/java/com/pusong/common/idempotent/annotation/RepeatSubmit.java @@ -1,4 +1,4 @@ -package org.dromara.common.idempotent.annotation; +package com.pusong.common.idempotent.annotation; import java.lang.annotation.*; import java.util.concurrent.TimeUnit; diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java b/pusong-common/pusong-common-idempotent/src/main/java/com/pusong/common/idempotent/aspectj/RepeatSubmitAspect.java similarity index 90% rename from ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java rename to pusong-common/pusong-common-idempotent/src/main/java/com/pusong/common/idempotent/aspectj/RepeatSubmitAspect.java index 5a27e91..a07b712 100644 --- a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java +++ b/pusong-common/pusong-common-idempotent/src/main/java/com/pusong/common/idempotent/aspectj/RepeatSubmitAspect.java @@ -1,9 +1,10 @@ -package org.dromara.common.idempotent.aspectj; +package com.pusong.common.idempotent.aspectj; import cn.dev33.satoken.SaManager; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.crypto.SecureUtil; +import com.pusong.common.idempotent.annotation.RepeatSubmit; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.aspectj.lang.JoinPoint; @@ -11,15 +12,14 @@ import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.AfterThrowing; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.redis.utils.RedisUtils; +import com.pusong.common.core.constant.GlobalConstants; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.utils.MessageUtils; +import com.pusong.common.core.utils.ServletUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.json.utils.JsonUtils; +import com.pusong.common.redis.utils.RedisUtils; import org.springframework.validation.BindingResult; import org.springframework.web.multipart.MultipartFile; diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentConfig.java b/pusong-common/pusong-common-idempotent/src/main/java/com/pusong/common/idempotent/config/IdempotentConfig.java similarity index 79% rename from ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentConfig.java rename to pusong-common/pusong-common-idempotent/src/main/java/com/pusong/common/idempotent/config/IdempotentConfig.java index fcb9d03..51893f3 100644 --- a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentConfig.java +++ b/pusong-common/pusong-common-idempotent/src/main/java/com/pusong/common/idempotent/config/IdempotentConfig.java @@ -1,6 +1,6 @@ -package org.dromara.common.idempotent.config; +package com.pusong.common.idempotent.config; -import org.dromara.common.idempotent.aspectj.RepeatSubmitAspect; +import com.pusong.common.idempotent.aspectj.RepeatSubmitAspect; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.data.redis.connection.RedisConfiguration; diff --git a/pusong-common/pusong-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pusong-common/pusong-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..8a58bd4 --- /dev/null +++ b/pusong-common/pusong-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.pusong.common.idempotent.config.IdempotentConfig diff --git a/ruoyi-common/ruoyi-common-job/pom.xml b/pusong-common/pusong-common-job/pom.xml similarity index 83% rename from ruoyi-common/ruoyi-common-job/pom.xml rename to pusong-common/pusong-common-job/pom.xml index 3a4a0cb..2df7bb4 100644 --- a/ruoyi-common/ruoyi-common-job/pom.xml +++ b/pusong-common/pusong-common-job/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"> - org.dromara - ruoyi-common + com.pusong + pusong-common ${revision} 4.0.0 - ruoyi-common-job + pusong-common-job ruoyi-common-job 定时任务 @@ -38,8 +38,8 @@ - org.dromara - ruoyi-common-core + com.pusong + pusong-common-core diff --git a/ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java b/pusong-common/pusong-common-job/src/main/java/com/pusong/common/job/config/SnailJobConfig.java similarity index 97% rename from ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java rename to pusong-common/pusong-common-job/src/main/java/com/pusong/common/job/config/SnailJobConfig.java index cba3753..bd61483 100644 --- a/ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java +++ b/pusong-common/pusong-common-job/src/main/java/com/pusong/common/job/config/SnailJobConfig.java @@ -1,4 +1,4 @@ -package org.dromara.common.job.config; +package com.pusong.common.job.config; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; diff --git a/pusong-common/pusong-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pusong-common/pusong-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..253c253 --- /dev/null +++ b/pusong-common/pusong-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.pusong.common.job.config.SnailJobConfig diff --git a/ruoyi-common/ruoyi-common-json/pom.xml b/pusong-common/pusong-common-json/pom.xml similarity index 79% rename from ruoyi-common/ruoyi-common-json/pom.xml rename to pusong-common/pusong-common-json/pom.xml index 870df5c..dbdd0b1 100644 --- a/ruoyi-common/ruoyi-common-json/pom.xml +++ b/pusong-common/pusong-common-json/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.pusong + pusong-common ${revision} 4.0.0 - ruoyi-common-json + pusong-common-json ruoyi-common-json 序列化模块 @@ -17,8 +17,8 @@ - org.dromara - ruoyi-common-core + com.pusong + pusong-common-core diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java b/pusong-common/pusong-common-json/src/main/java/com/pusong/common/json/config/JacksonConfig.java similarity index 95% rename from ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java rename to pusong-common/pusong-common-json/src/main/java/com/pusong/common/json/config/JacksonConfig.java index 8f5a45d..799cab1 100644 --- a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java +++ b/pusong-common/pusong-common-json/src/main/java/com/pusong/common/json/config/JacksonConfig.java @@ -1,10 +1,10 @@ -package org.dromara.common.json.config; +package com.pusong.common.json.config; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; -import org.dromara.common.json.handler.BigNumberSerializer; +import com.pusong.common.json.handler.BigNumberSerializer; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java b/pusong-common/pusong-common-json/src/main/java/com/pusong/common/json/handler/BigNumberSerializer.java similarity index 96% rename from ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java rename to pusong-common/pusong-common-json/src/main/java/com/pusong/common/json/handler/BigNumberSerializer.java index f2a7c2d..0913d0b 100644 --- a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java +++ b/pusong-common/pusong-common-json/src/main/java/com/pusong/common/json/handler/BigNumberSerializer.java @@ -1,4 +1,4 @@ -package org.dromara.common.json.handler; +package com.pusong.common.json.handler; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/utils/JsonUtils.java b/pusong-common/pusong-common-json/src/main/java/com/pusong/common/json/utils/JsonUtils.java similarity index 97% rename from ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/utils/JsonUtils.java rename to pusong-common/pusong-common-json/src/main/java/com/pusong/common/json/utils/JsonUtils.java index 65c2faa..a620048 100644 --- a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/utils/JsonUtils.java +++ b/pusong-common/pusong-common-json/src/main/java/com/pusong/common/json/utils/JsonUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.json.utils; +package com.pusong.common.json.utils; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ArrayUtil; @@ -9,8 +9,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.exc.MismatchedInputException; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.StringUtils; import java.io.IOException; import java.util.ArrayList; diff --git a/pusong-common/pusong-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pusong-common/pusong-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..e0a9e2c --- /dev/null +++ b/pusong-common/pusong-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.pusong.common.json.config.JacksonConfig diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/pusong-common/pusong-common-log/pom.xml similarity index 63% rename from ruoyi-common/ruoyi-common-log/pom.xml rename to pusong-common/pusong-common-log/pom.xml index 1e2b33b..644271d 100644 --- a/ruoyi-common/ruoyi-common-log/pom.xml +++ b/pusong-common/pusong-common-log/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.pusong + pusong-common ${revision} 4.0.0 - ruoyi-common-log + pusong-common-log ruoyi-common-log 日志记录 @@ -18,13 +18,13 @@ - org.dromara - ruoyi-common-satoken + com.pusong + pusong-common-satoken - org.dromara - ruoyi-common-json + com.pusong + pusong-common-json diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/annotation/Log.java b/pusong-common/pusong-common-log/src/main/java/com/pusong/common/log/annotation/Log.java similarity index 84% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/annotation/Log.java rename to pusong-common/pusong-common-log/src/main/java/com/pusong/common/log/annotation/Log.java index 2dced97..84479e0 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/annotation/Log.java +++ b/pusong-common/pusong-common-log/src/main/java/com/pusong/common/log/annotation/Log.java @@ -1,7 +1,7 @@ -package org.dromara.common.log.annotation; +package com.pusong.common.log.annotation; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.log.enums.OperatorType; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.common.log.enums.OperatorType; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java b/pusong-common/pusong-common-log/src/main/java/com/pusong/common/log/aspect/LogAspect.java similarity index 94% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java rename to pusong-common/pusong-common-log/src/main/java/com/pusong/common/log/aspect/LogAspect.java index cdbd00f..70d7c01 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java +++ b/pusong-common/pusong-common-log/src/main/java/com/pusong/common/log/aspect/LogAspect.java @@ -1,9 +1,10 @@ -package org.dromara.common.log.aspect; +package com.pusong.common.log.aspect; import cn.hutool.core.lang.Dict; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; +import com.pusong.common.log.annotation.Log; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; @@ -13,15 +14,14 @@ import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.AfterThrowing; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessStatus; -import org.dromara.common.log.event.OperLogEvent; -import org.dromara.common.satoken.utils.LoginHelper; +import com.pusong.common.core.domain.model.LoginUser; +import com.pusong.common.core.utils.ServletUtils; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.json.utils.JsonUtils; +import com.pusong.common.log.enums.BusinessStatus; +import com.pusong.common.log.event.OperLogEvent; +import com.pusong.common.satoken.utils.LoginHelper; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.http.HttpMethod; import org.springframework.validation.BindingResult; diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessStatus.java b/pusong-common/pusong-common-log/src/main/java/com/pusong/common/log/enums/BusinessStatus.java similarity index 80% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessStatus.java rename to pusong-common/pusong-common-log/src/main/java/com/pusong/common/log/enums/BusinessStatus.java index d303dc3..44f9ea1 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessStatus.java +++ b/pusong-common/pusong-common-log/src/main/java/com/pusong/common/log/enums/BusinessStatus.java @@ -1,4 +1,4 @@ -package org.dromara.common.log.enums; +package com.pusong.common.log.enums; /** * 操作状态 diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java b/pusong-common/pusong-common-log/src/main/java/com/pusong/common/log/enums/BusinessType.java similarity index 93% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java rename to pusong-common/pusong-common-log/src/main/java/com/pusong/common/log/enums/BusinessType.java index 2d25ebb..be0f192 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java +++ b/pusong-common/pusong-common-log/src/main/java/com/pusong/common/log/enums/BusinessType.java @@ -1,4 +1,4 @@ -package org.dromara.common.log.enums; +package com.pusong.common.log.enums; /** * 业务操作类型 diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/OperatorType.java b/pusong-common/pusong-common-log/src/main/java/com/pusong/common/log/enums/OperatorType.java similarity index 85% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/OperatorType.java rename to pusong-common/pusong-common-log/src/main/java/com/pusong/common/log/enums/OperatorType.java index de9328b..4037f2a 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/OperatorType.java +++ b/pusong-common/pusong-common-log/src/main/java/com/pusong/common/log/enums/OperatorType.java @@ -1,4 +1,4 @@ -package org.dromara.common.log.enums; +package com.pusong.common.log.enums; /** * 操作人类别 diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java b/pusong-common/pusong-common-log/src/main/java/com/pusong/common/log/event/LogininforEvent.java similarity index 94% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java rename to pusong-common/pusong-common-log/src/main/java/com/pusong/common/log/event/LogininforEvent.java index 938eaad..de38a68 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java +++ b/pusong-common/pusong-common-log/src/main/java/com/pusong/common/log/event/LogininforEvent.java @@ -1,4 +1,4 @@ -package org.dromara.common.log.event; +package com.pusong.common.log.event; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java b/pusong-common/pusong-common-log/src/main/java/com/pusong/common/log/event/OperLogEvent.java similarity index 97% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java rename to pusong-common/pusong-common-log/src/main/java/com/pusong/common/log/event/OperLogEvent.java index 0386192..b442cce 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java +++ b/pusong-common/pusong-common-log/src/main/java/com/pusong/common/log/event/OperLogEvent.java @@ -1,4 +1,4 @@ -package org.dromara.common.log.event; +package com.pusong.common.log.event; import lombok.Data; diff --git a/pusong-common/pusong-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pusong-common/pusong-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..9cf9153 --- /dev/null +++ b/pusong-common/pusong-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.pusong.common.log.aspect.LogAspect diff --git a/ruoyi-common/ruoyi-common-mail/pom.xml b/pusong-common/pusong-common-mail/pom.xml similarity index 78% rename from ruoyi-common/ruoyi-common-mail/pom.xml rename to pusong-common/pusong-common-mail/pom.xml index c0e1b2e..ea3685c 100644 --- a/ruoyi-common/ruoyi-common-mail/pom.xml +++ b/pusong-common/pusong-common-mail/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.pusong + pusong-common ${revision} 4.0.0 - ruoyi-common-mail + pusong-common-mail ruoyi-common-mail 邮件模块 @@ -17,8 +17,8 @@ - org.dromara - ruoyi-common-core + com.pusong + pusong-common-core diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/MailConfig.java b/pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/config/MailConfig.java similarity index 89% rename from ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/MailConfig.java rename to pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/config/MailConfig.java index 1b51c27..014a014 100644 --- a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/MailConfig.java +++ b/pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/config/MailConfig.java @@ -1,7 +1,7 @@ -package org.dromara.common.mail.config; +package com.pusong.common.mail.config; -import org.dromara.common.mail.config.properties.MailProperties; -import org.dromara.common.mail.utils.MailAccount; +import com.pusong.common.mail.config.properties.MailProperties; +import com.pusong.common.mail.utils.MailAccount; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java b/pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/config/properties/MailProperties.java similarity index 96% rename from ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java rename to pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/config/properties/MailProperties.java index d0e78a2..fa17552 100644 --- a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java +++ b/pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/config/properties/MailProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.mail.config.properties; +package com.pusong.common.mail.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/GlobalMailAccount.java b/pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/utils/GlobalMailAccount.java similarity index 95% rename from ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/GlobalMailAccount.java rename to pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/utils/GlobalMailAccount.java index fdae869..03ec207 100644 --- a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/GlobalMailAccount.java +++ b/pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/utils/GlobalMailAccount.java @@ -1,4 +1,4 @@ -package org.dromara.common.mail.utils; +package com.pusong.common.mail.utils; import cn.hutool.core.io.IORuntimeException; diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/InternalMailUtil.java b/pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/utils/InternalMailUtil.java similarity index 98% rename from ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/InternalMailUtil.java rename to pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/utils/InternalMailUtil.java index b755e73..9c23909 100644 --- a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/InternalMailUtil.java +++ b/pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/utils/InternalMailUtil.java @@ -1,4 +1,4 @@ -package org.dromara.common.mail.utils; +package com.pusong.common.mail.utils; import cn.hutool.core.util.ArrayUtil; import jakarta.mail.internet.AddressException; diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/Mail.java b/pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/utils/Mail.java similarity index 99% rename from ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/Mail.java rename to pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/utils/Mail.java index 6ca4b69..a7fccbc 100644 --- a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/Mail.java +++ b/pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/utils/Mail.java @@ -1,4 +1,4 @@ -package org.dromara.common.mail.utils; +package com.pusong.common.mail.utils; import cn.hutool.core.builder.Builder; import cn.hutool.core.io.FileUtil; diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailAccount.java b/pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/utils/MailAccount.java similarity index 99% rename from ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailAccount.java rename to pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/utils/MailAccount.java index 2a732a1..5b836a4 100644 --- a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailAccount.java +++ b/pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/utils/MailAccount.java @@ -1,4 +1,4 @@ -package org.dromara.common.mail.utils; +package com.pusong.common.mail.utils; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.ObjectUtil; diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailException.java b/pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/utils/MailException.java similarity index 96% rename from ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailException.java rename to pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/utils/MailException.java index cc199d4..54cfe32 100644 --- a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailException.java +++ b/pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/utils/MailException.java @@ -1,4 +1,4 @@ -package org.dromara.common.mail.utils; +package com.pusong.common.mail.utils; import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.util.StrUtil; diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java b/pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/utils/MailUtils.java similarity index 99% rename from ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java rename to pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/utils/MailUtils.java index 040cc57..12cc032 100644 --- a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java +++ b/pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/utils/MailUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.mail.utils; +package com.pusong.common.mail.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.IoUtil; @@ -9,8 +9,8 @@ import jakarta.mail.Authenticator; import jakarta.mail.Session; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.StringUtils; import java.io.File; import java.io.InputStream; diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/UserPassAuthenticator.java b/pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/utils/UserPassAuthenticator.java similarity index 94% rename from ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/UserPassAuthenticator.java rename to pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/utils/UserPassAuthenticator.java index fbbe5e3..f0f5e20 100644 --- a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/UserPassAuthenticator.java +++ b/pusong-common/pusong-common-mail/src/main/java/com/pusong/common/mail/utils/UserPassAuthenticator.java @@ -1,4 +1,4 @@ -package org.dromara.common.mail.utils; +package com.pusong.common.mail.utils; import jakarta.mail.Authenticator; import jakarta.mail.PasswordAuthentication; diff --git a/pusong-common/pusong-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pusong-common/pusong-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..fd78a66 --- /dev/null +++ b/pusong-common/pusong-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.pusong.common.mail.config.MailConfig diff --git a/ruoyi-common/ruoyi-common-mybatis/pom.xml b/pusong-common/pusong-common-mybatis/pom.xml similarity index 77% rename from ruoyi-common/ruoyi-common-mybatis/pom.xml rename to pusong-common/pusong-common-mybatis/pom.xml index a58064a..b73c4a3 100644 --- a/ruoyi-common/ruoyi-common-mybatis/pom.xml +++ b/pusong-common/pusong-common-mybatis/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.pusong + pusong-common ${revision} 4.0.0 - ruoyi-common-mybatis + pusong-common-mybatis ruoyi-common-mybatis 数据库服务 @@ -17,13 +17,13 @@ - org.dromara - ruoyi-common-core + com.pusong + pusong-common-core - org.dromara - ruoyi-common-satoken + com.pusong + pusong-common-satoken diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/annotation/DataColumn.java similarity index 89% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java rename to pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/annotation/DataColumn.java index aca470f..df6e2bc 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java +++ b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/annotation/DataColumn.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.annotation; +package com.pusong.common.mybatis.annotation; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/annotation/DataPermission.java similarity index 84% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java rename to pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/annotation/DataPermission.java index f4351e3..280b130 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java +++ b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/annotation/DataPermission.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.annotation; +package com.pusong.common.mybatis.annotation; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/config/MybatisPlusConfig.java similarity index 91% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java rename to pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/config/MybatisPlusConfig.java index 0bc5b66..96208ef 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java +++ b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.config; +package com.pusong.common.mybatis.config; import cn.hutool.core.net.NetUtil; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; @@ -8,11 +8,11 @@ import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; -import org.dromara.common.core.factory.YmlPropertySourceFactory; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.mybatis.handler.InjectionMetaObjectHandler; -import org.dromara.common.mybatis.handler.MybatisExceptionHandler; -import org.dromara.common.mybatis.interceptor.PlusDataPermissionInterceptor; +import com.pusong.common.core.factory.YmlPropertySourceFactory; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.mybatis.interceptor.PlusDataPermissionInterceptor; +import com.pusong.common.mybatis.handler.InjectionMetaObjectHandler; +import com.pusong.common.mybatis.handler.MybatisExceptionHandler; import org.mybatis.spring.annotation.MapperScan; import org.springframework.beans.BeansException; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/core/domain/BaseEntity.java similarity index 96% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java rename to pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/core/domain/BaseEntity.java index 820b49a..bab2a60 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java +++ b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/core/domain/BaseEntity.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.core.domain; +package com.pusong.common.mybatis.core.domain; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/core/mapper/BaseMapperPlus.java similarity index 98% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java rename to pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/core/mapper/BaseMapperPlus.java index 3889250..2292a29 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java +++ b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/core/mapper/BaseMapperPlus.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.core.mapper; +package com.pusong.common.mybatis.core.mapper; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.toolkit.Db; import org.apache.ibatis.logging.Log; import org.apache.ibatis.logging.LogFactory; -import org.dromara.common.core.utils.MapstructUtils; +import com.pusong.common.core.utils.MapstructUtils; import java.io.Serializable; import java.util.Collection; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/core/page/PageQuery.java similarity index 94% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java rename to pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/core/page/PageQuery.java index 40b7530..89b330f 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java +++ b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/core/page/PageQuery.java @@ -1,12 +1,12 @@ -package org.dromara.common.mybatis.core.page; +package com.pusong.common.mybatis.core.page; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.sql.SqlUtil; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.core.utils.sql.SqlUtil; import lombok.Data; import java.io.Serial; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/core/page/TableDataInfo.java similarity index 97% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java rename to pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/core/page/TableDataInfo.java index a4b6799..3cfc02b 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java +++ b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/core/page/TableDataInfo.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.core.page; +package com.pusong.common.mybatis.core.page; import cn.hutool.http.HttpStatus; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/enums/DataBaseType.java similarity index 89% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java rename to pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/enums/DataBaseType.java index 93487e9..a3968fa 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java +++ b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/enums/DataBaseType.java @@ -1,6 +1,6 @@ -package org.dromara.common.mybatis.enums; +package com.pusong.common.mybatis.enums; -import org.dromara.common.core.utils.StringUtils; +import com.pusong.common.core.utils.StringUtils; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/enums/DataScopeType.java similarity index 91% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java rename to pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/enums/DataScopeType.java index 9ea66b0..a3753af 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java +++ b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/enums/DataScopeType.java @@ -1,9 +1,9 @@ -package org.dromara.common.mybatis.enums; +package com.pusong.common.mybatis.enums; -import org.dromara.common.core.utils.StringUtils; +import com.pusong.common.core.utils.StringUtils; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.common.mybatis.helper.DataPermissionHelper; +import com.pusong.common.mybatis.helper.DataPermissionHelper; /** * 数据权限类型 diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/handler/InjectionMetaObjectHandler.java similarity index 91% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java rename to pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/handler/InjectionMetaObjectHandler.java index a66908f..2ef0624 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java +++ b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/handler/InjectionMetaObjectHandler.java @@ -1,12 +1,12 @@ -package org.dromara.common.mybatis.handler; +package com.pusong.common.mybatis.handler; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpStatus; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.satoken.utils.LoginHelper; +import com.pusong.common.core.domain.model.LoginUser; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.mybatis.core.domain.BaseEntity; +import com.pusong.common.satoken.utils.LoginHelper; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/handler/MybatisExceptionHandler.java similarity index 92% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java rename to pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/handler/MybatisExceptionHandler.java index ec3ee0d..e8878f6 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java +++ b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/handler/MybatisExceptionHandler.java @@ -1,8 +1,8 @@ -package org.dromara.common.mybatis.handler; +package com.pusong.common.mybatis.handler; -import org.dromara.common.core.domain.R; +import com.pusong.common.core.domain.R; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.utils.StringUtils; +import com.pusong.common.core.utils.StringUtils; import org.mybatis.spring.MyBatisSystemException; import org.springframework.dao.DuplicateKeyException; import org.springframework.web.bind.annotation.ExceptionHandler; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/handler/PlusDataPermissionHandler.java similarity index 93% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java rename to pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/handler/PlusDataPermissionHandler.java index 7d7fd84..9d4eafa 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java +++ b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/handler/PlusDataPermissionHandler.java @@ -1,8 +1,10 @@ -package org.dromara.common.mybatis.handler; +package com.pusong.common.mybatis.handler; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; +import com.pusong.common.mybatis.annotation.DataColumn; +import com.pusong.common.mybatis.annotation.DataPermission; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.JSQLParserException; import net.sf.jsqlparser.expression.Expression; @@ -10,17 +12,15 @@ import net.sf.jsqlparser.expression.Parenthesis; import net.sf.jsqlparser.expression.operators.conditional.AndExpression; import net.sf.jsqlparser.parser.CCJSqlParserUtil; import org.apache.ibatis.io.Resources; -import org.dromara.common.core.domain.dto.RoleDTO; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.enums.DataScopeType; -import org.dromara.common.mybatis.helper.DataPermissionHelper; -import org.dromara.common.satoken.utils.LoginHelper; +import com.pusong.common.core.domain.dto.RoleDTO; +import com.pusong.common.core.domain.model.LoginUser; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.StreamUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.mybatis.enums.DataScopeType; +import com.pusong.common.mybatis.helper.DataPermissionHelper; +import com.pusong.common.satoken.utils.LoginHelper; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.expression.BeanFactoryResolver; import org.springframework.core.io.Resource; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/helper/DataBaseHelper.java similarity index 91% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java rename to pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/helper/DataBaseHelper.java index bb20f4b..c24db24 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java +++ b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/helper/DataBaseHelper.java @@ -1,10 +1,10 @@ -package org.dromara.common.mybatis.helper; +package com.pusong.common.mybatis.helper; import cn.hutool.core.convert.Convert; import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.mybatis.enums.DataBaseType; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.mybatis.enums.DataBaseType; import lombok.AccessLevel; import lombok.NoArgsConstructor; @@ -14,7 +14,6 @@ import java.sql.DatabaseMetaData; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import java.util.Set; /** * 数据库助手 diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/helper/DataPermissionHelper.java similarity index 98% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java rename to pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/helper/DataPermissionHelper.java index 7f6ab1f..1d34cd5 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java +++ b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/helper/DataPermissionHelper.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.helper; +package com.pusong.common.mybatis.helper; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.context.model.SaStorage; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/interceptor/PlusDataPermissionInterceptor.java similarity index 97% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java rename to pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/interceptor/PlusDataPermissionInterceptor.java index 6eed8f7..8fd1c0e 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java +++ b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/interceptor/PlusDataPermissionInterceptor.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.interceptor; +package com.pusong.common.mybatis.interceptor; import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper; import com.baomidou.mybatisplus.core.toolkit.PluginUtils; @@ -20,7 +20,7 @@ import org.apache.ibatis.mapping.MappedStatement; import org.apache.ibatis.mapping.SqlCommandType; import org.apache.ibatis.session.ResultHandler; import org.apache.ibatis.session.RowBounds; -import org.dromara.common.mybatis.handler.PlusDataPermissionHandler; +import com.pusong.common.mybatis.handler.PlusDataPermissionHandler; import java.sql.Connection; import java.sql.SQLException; diff --git a/pusong-common/pusong-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pusong-common/pusong-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..ec6d684 --- /dev/null +++ b/pusong-common/pusong-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.pusong.common.mybatis.config.MybatisPlusConfig diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/resources/common-mybatis.yml b/pusong-common/pusong-common-mybatis/src/main/resources/common-mybatis.yml similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/resources/common-mybatis.yml rename to pusong-common/pusong-common-mybatis/src/main/resources/common-mybatis.yml diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/resources/spy.properties b/pusong-common/pusong-common-mybatis/src/main/resources/spy.properties similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/resources/spy.properties rename to pusong-common/pusong-common-mybatis/src/main/resources/spy.properties diff --git a/ruoyi-common/ruoyi-common-oss/pom.xml b/pusong-common/pusong-common-oss/pom.xml similarity index 87% rename from ruoyi-common/ruoyi-common-oss/pom.xml rename to pusong-common/pusong-common-oss/pom.xml index 18d004f..b3e435b 100644 --- a/ruoyi-common/ruoyi-common-oss/pom.xml +++ b/pusong-common/pusong-common-oss/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.pusong + pusong-common ${revision} 4.0.0 - ruoyi-common-oss + pusong-common-oss ruoyi-common-oss oss服务 @@ -17,13 +17,13 @@ - org.dromara - ruoyi-common-json + com.pusong + pusong-common-json - org.dromara - ruoyi-common-redis + com.pusong + pusong-common-redis diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/constant/OssConstant.java b/pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/constant/OssConstant.java similarity index 87% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/constant/OssConstant.java rename to pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/constant/OssConstant.java index 9d8db93..3ead6b9 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/constant/OssConstant.java +++ b/pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/constant/OssConstant.java @@ -1,6 +1,6 @@ -package org.dromara.common.oss.constant; +package com.pusong.common.oss.constant; -import org.dromara.common.core.constant.GlobalConstants; +import com.pusong.common.core.constant.GlobalConstants; import java.util.Arrays; import java.util.List; diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java b/pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/core/OssClient.java similarity index 97% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java rename to pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/core/OssClient.java index 86668aa..8ea14c4 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java +++ b/pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/core/OssClient.java @@ -1,17 +1,17 @@ -package org.dromara.common.oss.core; +package com.pusong.common.oss.core; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.IdUtil; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.utils.DateUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.file.FileUtils; -import org.dromara.common.oss.constant.OssConstant; -import org.dromara.common.oss.entity.UploadResult; -import org.dromara.common.oss.enumd.AccessPolicyType; -import org.dromara.common.oss.enumd.PolicyType; -import org.dromara.common.oss.exception.OssException; -import org.dromara.common.oss.properties.OssProperties; +import com.pusong.common.core.constant.Constants; +import com.pusong.common.core.utils.DateUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.core.utils.file.FileUtils; +import com.pusong.common.oss.enumd.AccessPolicyType; +import com.pusong.common.oss.enumd.PolicyType; +import com.pusong.common.oss.properties.OssProperties; +import com.pusong.common.oss.constant.OssConstant; +import com.pusong.common.oss.entity.UploadResult; +import com.pusong.common.oss.exception.OssException; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.core.ResponseInputStream; diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/UploadResult.java b/pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/entity/UploadResult.java similarity index 90% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/UploadResult.java rename to pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/entity/UploadResult.java index 81a18e6..fa56ae1 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/UploadResult.java +++ b/pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/entity/UploadResult.java @@ -1,4 +1,4 @@ -package org.dromara.common.oss.entity; +package com.pusong.common.oss.entity; import lombok.Builder; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enumd/AccessPolicyType.java b/pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/enumd/AccessPolicyType.java similarity index 97% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enumd/AccessPolicyType.java rename to pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/enumd/AccessPolicyType.java index 6d39133..4831f99 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enumd/AccessPolicyType.java +++ b/pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/enumd/AccessPolicyType.java @@ -1,4 +1,4 @@ -package org.dromara.common.oss.enumd; +package com.pusong.common.oss.enumd; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enumd/PolicyType.java b/pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/enumd/PolicyType.java similarity index 91% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enumd/PolicyType.java rename to pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/enumd/PolicyType.java index fe96341..8e91130 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enumd/PolicyType.java +++ b/pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/enumd/PolicyType.java @@ -1,4 +1,4 @@ -package org.dromara.common.oss.enumd; +package com.pusong.common.oss.enumd; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/exception/OssException.java b/pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/exception/OssException.java similarity index 86% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/exception/OssException.java rename to pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/exception/OssException.java index 52e9623..af302d4 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/exception/OssException.java +++ b/pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/exception/OssException.java @@ -1,4 +1,4 @@ -package org.dromara.common.oss.exception; +package com.pusong.common.oss.exception; import java.io.Serial; diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java b/pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/factory/OssFactory.java similarity index 80% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java rename to pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/factory/OssFactory.java index 3da1ba5..d5f6fde 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java +++ b/pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/factory/OssFactory.java @@ -1,15 +1,15 @@ -package org.dromara.common.oss.factory; +package com.pusong.common.oss.factory; +import com.pusong.common.oss.constant.OssConstant; +import com.pusong.common.oss.core.OssClient; +import com.pusong.common.oss.exception.OssException; +import com.pusong.common.oss.properties.OssProperties; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.oss.constant.OssConstant; -import org.dromara.common.oss.core.OssClient; -import org.dromara.common.oss.exception.OssException; -import org.dromara.common.oss.properties.OssProperties; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.common.redis.utils.RedisUtils; +import com.pusong.common.core.constant.CacheNames; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.json.utils.JsonUtils; +import com.pusong.common.redis.utils.CacheUtils; +import com.pusong.common.redis.utils.RedisUtils; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java b/pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/properties/OssProperties.java similarity index 95% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java rename to pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/properties/OssProperties.java index cb37206..6c51023 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java +++ b/pusong-common/pusong-common-oss/src/main/java/com/pusong/common/oss/properties/OssProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.oss.properties; +package com.pusong.common.oss.properties; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-ratelimiter/pom.xml b/pusong-common/pusong-common-ratelimiter/pom.xml similarity index 63% rename from ruoyi-common/ruoyi-common-ratelimiter/pom.xml rename to pusong-common/pusong-common-ratelimiter/pom.xml index bbde940..f5852e5 100644 --- a/ruoyi-common/ruoyi-common-ratelimiter/pom.xml +++ b/pusong-common/pusong-common-ratelimiter/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.pusong + pusong-common ${revision} 4.0.0 - ruoyi-common-ratelimiter + pusong-common-ratelimiter ruoyi-common-ratelimiter 限流功能 @@ -17,13 +17,13 @@ - org.dromara - ruoyi-common-core + com.pusong + pusong-common-core - org.dromara - ruoyi-common-redis + com.pusong + pusong-common-redis diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/annotation/RateLimiter.java b/pusong-common/pusong-common-ratelimiter/src/main/java/com/pusong/common/ratelimiter/annotation/RateLimiter.java similarity index 87% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/annotation/RateLimiter.java rename to pusong-common/pusong-common-ratelimiter/src/main/java/com/pusong/common/ratelimiter/annotation/RateLimiter.java index de09752..4fa6f88 100644 --- a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/annotation/RateLimiter.java +++ b/pusong-common/pusong-common-ratelimiter/src/main/java/com/pusong/common/ratelimiter/annotation/RateLimiter.java @@ -1,6 +1,6 @@ -package org.dromara.common.ratelimiter.annotation; +package com.pusong.common.ratelimiter.annotation; -import org.dromara.common.ratelimiter.enums.LimitType; +import com.pusong.common.ratelimiter.enums.LimitType; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java b/pusong-common/pusong-common-ratelimiter/src/main/java/com/pusong/common/ratelimiter/aspectj/RateLimiterAspect.java similarity index 88% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java rename to pusong-common/pusong-common-ratelimiter/src/main/java/com/pusong/common/ratelimiter/aspectj/RateLimiterAspect.java index 02735b0..82acfbb 100644 --- a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java +++ b/pusong-common/pusong-common-ratelimiter/src/main/java/com/pusong/common/ratelimiter/aspectj/RateLimiterAspect.java @@ -1,19 +1,19 @@ -package org.dromara.common.ratelimiter.aspectj; +package com.pusong.common.ratelimiter.aspectj; +import com.pusong.common.ratelimiter.annotation.RateLimiter; import lombok.extern.slf4j.Slf4j; 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.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.ratelimiter.annotation.RateLimiter; -import org.dromara.common.ratelimiter.enums.LimitType; -import org.dromara.common.redis.utils.RedisUtils; +import com.pusong.common.core.constant.GlobalConstants; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.utils.MessageUtils; +import com.pusong.common.core.utils.ServletUtils; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.ratelimiter.enums.LimitType; +import com.pusong.common.redis.utils.RedisUtils; import org.redisson.api.RateType; import org.springframework.context.expression.BeanFactoryResolver; import org.springframework.context.expression.MethodBasedEvaluationContext; diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/config/RateLimiterConfig.java b/pusong-common/pusong-common-ratelimiter/src/main/java/com/pusong/common/ratelimiter/config/RateLimiterConfig.java similarity index 79% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/config/RateLimiterConfig.java rename to pusong-common/pusong-common-ratelimiter/src/main/java/com/pusong/common/ratelimiter/config/RateLimiterConfig.java index 4b7e5b7..1887f53 100644 --- a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/config/RateLimiterConfig.java +++ b/pusong-common/pusong-common-ratelimiter/src/main/java/com/pusong/common/ratelimiter/config/RateLimiterConfig.java @@ -1,6 +1,6 @@ -package org.dromara.common.ratelimiter.config; +package com.pusong.common.ratelimiter.config; -import org.dromara.common.ratelimiter.aspectj.RateLimiterAspect; +import com.pusong.common.ratelimiter.aspectj.RateLimiterAspect; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.data.redis.connection.RedisConfiguration; diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/enums/LimitType.java b/pusong-common/pusong-common-ratelimiter/src/main/java/com/pusong/common/ratelimiter/enums/LimitType.java similarity index 85% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/enums/LimitType.java rename to pusong-common/pusong-common-ratelimiter/src/main/java/com/pusong/common/ratelimiter/enums/LimitType.java index b7f059f..ab6c49d 100644 --- a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/enums/LimitType.java +++ b/pusong-common/pusong-common-ratelimiter/src/main/java/com/pusong/common/ratelimiter/enums/LimitType.java @@ -1,4 +1,4 @@ -package org.dromara.common.ratelimiter.enums; +package com.pusong.common.ratelimiter.enums; /** * 限流类型 diff --git a/pusong-common/pusong-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pusong-common/pusong-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..98f54a5 --- /dev/null +++ b/pusong-common/pusong-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.pusong.common.ratelimiter.config.RateLimiterConfig diff --git a/pusong-common/pusong-common-ratelimiter/src/main/resources/spel-extension.json b/pusong-common/pusong-common-ratelimiter/src/main/resources/spel-extension.json new file mode 100644 index 0000000..8cb5016 --- /dev/null +++ b/pusong-common/pusong-common-ratelimiter/src/main/resources/spel-extension.json @@ -0,0 +1,7 @@ +{ + "com.pusong.common.ratelimiter.annotation.RateLimiter@key": { + "method": { + "parameters": true + } + } +} diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/pusong-common/pusong-common-redis/pom.xml similarity index 84% rename from ruoyi-common/ruoyi-common-redis/pom.xml rename to pusong-common/pusong-common-redis/pom.xml index f56f8aa..f50360e 100644 --- a/ruoyi-common/ruoyi-common-redis/pom.xml +++ b/pusong-common/pusong-common-redis/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.pusong + pusong-common ${revision} 4.0.0 - ruoyi-common-redis + pusong-common-redis ruoyi-common-redis 缓存服务 @@ -18,8 +18,8 @@ - org.dromara - ruoyi-common-core + com.pusong + pusong-common-core diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/CacheConfig.java b/pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/config/CacheConfig.java similarity index 91% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/CacheConfig.java rename to pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/config/CacheConfig.java index d57ba4e..29c25a7 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/CacheConfig.java +++ b/pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/config/CacheConfig.java @@ -1,8 +1,8 @@ -package org.dromara.common.redis.config; +package com.pusong.common.redis.config; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; -import org.dromara.common.redis.manager.PlusSpringCacheManager; +import com.pusong.common.redis.manager.PlusSpringCacheManager; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.cache.CacheManager; import org.springframework.cache.annotation.EnableCaching; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java b/pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/config/RedisConfig.java similarity index 96% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java rename to pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/config/RedisConfig.java index f8fe79a..29c24ad 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java +++ b/pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/config/RedisConfig.java @@ -1,4 +1,4 @@ -package org.dromara.common.redis.config; +package com.pusong.common.redis.config; import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.annotation.JsonAutoDetect; @@ -8,11 +8,11 @@ import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; +import com.pusong.common.redis.config.properties.RedissonProperties; +import com.pusong.common.redis.handler.KeyPrefixHandler; +import com.pusong.common.redis.handler.RedisExceptionHandler; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.redis.config.properties.RedissonProperties; -import org.dromara.common.redis.handler.KeyPrefixHandler; -import org.dromara.common.redis.handler.RedisExceptionHandler; +import com.pusong.common.core.utils.SpringUtils; import org.redisson.client.codec.StringCodec; import org.redisson.codec.CompositeCodec; import org.redisson.codec.TypedJsonJacksonCodec; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/properties/RedissonProperties.java b/pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/config/properties/RedissonProperties.java similarity index 98% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/properties/RedissonProperties.java rename to pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/config/properties/RedissonProperties.java index ebec786..dea07b1 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/properties/RedissonProperties.java +++ b/pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/config/properties/RedissonProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.redis.config.properties; +package com.pusong.common.redis.config.properties; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java b/pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/handler/KeyPrefixHandler.java similarity index 92% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java rename to pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/handler/KeyPrefixHandler.java index 3bf3e34..5acb7ba 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java +++ b/pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/handler/KeyPrefixHandler.java @@ -1,6 +1,6 @@ -package org.dromara.common.redis.handler; +package com.pusong.common.redis.handler; -import org.dromara.common.core.utils.StringUtils; +import com.pusong.common.core.utils.StringUtils; import org.redisson.api.NameMapper; /** diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/RedisExceptionHandler.java b/pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/handler/RedisExceptionHandler.java similarity index 91% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/RedisExceptionHandler.java rename to pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/handler/RedisExceptionHandler.java index 5e904f3..6eedd00 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/RedisExceptionHandler.java +++ b/pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/handler/RedisExceptionHandler.java @@ -1,10 +1,10 @@ -package org.dromara.common.redis.handler; +package com.pusong.common.redis.handler; import cn.hutool.http.HttpStatus; import com.baomidou.lock.exception.LockFailureException; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.R; +import com.pusong.common.core.domain.R; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java b/pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/manager/CaffeineCacheDecorator.java similarity index 95% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java rename to pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/manager/CaffeineCacheDecorator.java index ee1d405..4c1a3e4 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java +++ b/pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/manager/CaffeineCacheDecorator.java @@ -1,6 +1,6 @@ -package org.dromara.common.redis.manager; +package com.pusong.common.redis.manager; -import org.dromara.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.SpringUtils; import org.springframework.cache.Cache; import java.util.concurrent.Callable; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java b/pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/manager/PlusSpringCacheManager.java similarity index 98% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java rename to pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/manager/PlusSpringCacheManager.java index a48cb14..e3aa8f5 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java +++ b/pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/manager/PlusSpringCacheManager.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.common.redis.manager; +package com.pusong.common.redis.manager; -import org.dromara.common.redis.utils.RedisUtils; +import com.pusong.common.redis.utils.RedisUtils; import org.redisson.api.RMap; import org.redisson.api.RMapCache; import org.redisson.spring.cache.CacheConfig; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/CacheUtils.java b/pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/utils/CacheUtils.java similarity index 95% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/CacheUtils.java rename to pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/utils/CacheUtils.java index 42a88d6..fd515e6 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/CacheUtils.java +++ b/pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/utils/CacheUtils.java @@ -1,6 +1,6 @@ -package org.dromara.common.redis.utils; +package com.pusong.common.redis.utils; -import org.dromara.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.redisson.api.RMap; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/QueueUtils.java b/pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/utils/QueueUtils.java similarity index 98% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/QueueUtils.java rename to pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/utils/QueueUtils.java index 4587e64..d04b317 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/QueueUtils.java +++ b/pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/utils/QueueUtils.java @@ -1,6 +1,6 @@ -package org.dromara.common.redis.utils; +package com.pusong.common.redis.utils; -import org.dromara.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.redisson.api.*; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java b/pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/utils/RedisUtils.java similarity index 99% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java rename to pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/utils/RedisUtils.java index 67be2fb..aceacea 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java +++ b/pusong-common/pusong-common-redis/src/main/java/com/pusong/common/redis/utils/RedisUtils.java @@ -1,8 +1,8 @@ -package org.dromara.common.redis.utils; +package com.pusong.common.redis.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.SpringUtils; import org.redisson.api.*; import java.time.Duration; diff --git a/pusong-common/pusong-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pusong-common/pusong-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..536d8da --- /dev/null +++ b/pusong-common/pusong-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.pusong.common.redis.config.RedisConfig +com.pusong.common.redis.config.CacheConfig diff --git a/ruoyi-common/ruoyi-common-satoken/pom.xml b/pusong-common/pusong-common-satoken/pom.xml similarity index 76% rename from ruoyi-common/ruoyi-common-satoken/pom.xml rename to pusong-common/pusong-common-satoken/pom.xml index 4df7d4d..0496b0b 100644 --- a/ruoyi-common/ruoyi-common-satoken/pom.xml +++ b/pusong-common/pusong-common-satoken/pom.xml @@ -3,25 +3,25 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.pusong + pusong-common ${revision} 4.0.0 - ruoyi-common-satoken + pusong-common-satoken - org.dromara - ruoyi-common-core + com.pusong + pusong-common-core - org.dromara - ruoyi-common-redis + com.pusong + pusong-common-redis diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java b/pusong-common/pusong-common-satoken/src/main/java/com/pusong/common/satoken/config/SaTokenConfig.java similarity index 79% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java rename to pusong-common/pusong-common-satoken/src/main/java/com/pusong/common/satoken/config/SaTokenConfig.java index 61c6b9a..7d53d2a 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java +++ b/pusong-common/pusong-common-satoken/src/main/java/com/pusong/common/satoken/config/SaTokenConfig.java @@ -1,13 +1,13 @@ -package org.dromara.common.satoken.config; +package com.pusong.common.satoken.config; import cn.dev33.satoken.dao.SaTokenDao; import cn.dev33.satoken.jwt.StpLogicJwtForSimple; import cn.dev33.satoken.stp.StpInterface; import cn.dev33.satoken.stp.StpLogic; -import org.dromara.common.core.factory.YmlPropertySourceFactory; -import org.dromara.common.satoken.core.dao.PlusSaTokenDao; -import org.dromara.common.satoken.core.service.SaPermissionImpl; -import org.dromara.common.satoken.handler.SaTokenExceptionHandler; +import com.pusong.common.core.factory.YmlPropertySourceFactory; +import com.pusong.common.satoken.core.dao.PlusSaTokenDao; +import com.pusong.common.satoken.core.service.SaPermissionImpl; +import com.pusong.common.satoken.handler.SaTokenExceptionHandler; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.PropertySource; diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java b/pusong-common/pusong-common-satoken/src/main/java/com/pusong/common/satoken/core/dao/PlusSaTokenDao.java similarity index 97% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java rename to pusong-common/pusong-common-satoken/src/main/java/com/pusong/common/satoken/core/dao/PlusSaTokenDao.java index 38e12c3..b2d141c 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java +++ b/pusong-common/pusong-common-satoken/src/main/java/com/pusong/common/satoken/core/dao/PlusSaTokenDao.java @@ -1,10 +1,10 @@ -package org.dromara.common.satoken.core.dao; +package com.pusong.common.satoken.core.dao; import cn.dev33.satoken.dao.SaTokenDao; import cn.dev33.satoken.util.SaFoxUtil; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; -import org.dromara.common.redis.utils.RedisUtils; +import com.pusong.common.redis.utils.RedisUtils; import java.time.Duration; import java.util.ArrayList; diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java b/pusong-common/pusong-common-satoken/src/main/java/com/pusong/common/satoken/core/service/SaPermissionImpl.java similarity index 86% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java rename to pusong-common/pusong-common-satoken/src/main/java/com/pusong/common/satoken/core/service/SaPermissionImpl.java index 1cef9a7..756e855 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java +++ b/pusong-common/pusong-common-satoken/src/main/java/com/pusong/common/satoken/core/service/SaPermissionImpl.java @@ -1,9 +1,9 @@ -package org.dromara.common.satoken.core.service; +package com.pusong.common.satoken.core.service; import cn.dev33.satoken.stp.StpInterface; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.enums.UserType; -import org.dromara.common.satoken.utils.LoginHelper; +import com.pusong.common.core.domain.model.LoginUser; +import com.pusong.common.core.enums.UserType; +import com.pusong.common.satoken.utils.LoginHelper; import java.util.ArrayList; import java.util.List; diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java b/pusong-common/pusong-common-satoken/src/main/java/com/pusong/common/satoken/handler/SaTokenExceptionHandler.java similarity index 95% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java rename to pusong-common/pusong-common-satoken/src/main/java/com/pusong/common/satoken/handler/SaTokenExceptionHandler.java index a45af89..0920e4e 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java +++ b/pusong-common/pusong-common-satoken/src/main/java/com/pusong/common/satoken/handler/SaTokenExceptionHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.satoken.handler; +package com.pusong.common.satoken.handler; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.exception.NotPermissionException; @@ -6,7 +6,7 @@ import cn.dev33.satoken.exception.NotRoleException; import cn.hutool.http.HttpStatus; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.R; +import com.pusong.common.core.domain.R; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java b/pusong-common/pusong-common-satoken/src/main/java/com/pusong/common/satoken/utils/LoginHelper.java similarity index 95% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java rename to pusong-common/pusong-common-satoken/src/main/java/com/pusong/common/satoken/utils/LoginHelper.java index 1e0d8a7..da33b85 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java +++ b/pusong-common/pusong-common-satoken/src/main/java/com/pusong/common/satoken/utils/LoginHelper.java @@ -1,4 +1,4 @@ -package org.dromara.common.satoken.utils; +package com.pusong.common.satoken.utils; import cn.dev33.satoken.session.SaSession; import cn.dev33.satoken.stp.SaLoginModel; @@ -7,10 +7,10 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.enums.UserType; +import com.pusong.common.core.constant.TenantConstants; +import com.pusong.common.core.constant.UserConstants; +import com.pusong.common.core.domain.model.LoginUser; +import com.pusong.common.core.enums.UserType; import java.util.Set; diff --git a/pusong-common/pusong-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pusong-common/pusong-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..cf91f8f --- /dev/null +++ b/pusong-common/pusong-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.pusong.common.satoken.config.SaTokenConfig diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/resources/common-satoken.yml b/pusong-common/pusong-common-satoken/src/main/resources/common-satoken.yml similarity index 100% rename from ruoyi-common/ruoyi-common-satoken/src/main/resources/common-satoken.yml rename to pusong-common/pusong-common-satoken/src/main/resources/common-satoken.yml diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/pusong-common/pusong-common-security/pom.xml similarity index 69% rename from ruoyi-common/ruoyi-common-security/pom.xml rename to pusong-common/pusong-common-security/pom.xml index 5b39df2..9996668 100644 --- a/ruoyi-common/ruoyi-common-security/pom.xml +++ b/pusong-common/pusong-common-security/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.pusong + pusong-common ${revision} 4.0.0 - ruoyi-common-security + pusong-common-security ruoyi-common-security 安全模块 @@ -17,8 +17,8 @@ - org.dromara - ruoyi-common-satoken + com.pusong + pusong-common-satoken diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java b/pusong-common/pusong-common-security/src/main/java/com/pusong/common/security/config/SecurityConfig.java similarity index 88% rename from ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java rename to pusong-common/pusong-common-security/src/main/java/com/pusong/common/security/config/SecurityConfig.java index b9283e0..42bd43d 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java +++ b/pusong-common/pusong-common-security/src/main/java/com/pusong/common/security/config/SecurityConfig.java @@ -1,17 +1,17 @@ -package org.dromara.common.security.config; +package com.pusong.common.security.config; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.interceptor.SaInterceptor; import cn.dev33.satoken.router.SaRouter; import cn.dev33.satoken.stp.StpUtil; +import com.pusong.common.security.config.properties.SecurityProperties; +import com.pusong.common.security.handler.AllUrlHandler; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.security.config.properties.SecurityProperties; -import org.dromara.common.security.handler.AllUrlHandler; +import com.pusong.common.core.utils.ServletUtils; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.satoken.utils.LoginHelper; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/properties/SecurityProperties.java b/pusong-common/pusong-common-security/src/main/java/com/pusong/common/security/config/properties/SecurityProperties.java similarity index 84% rename from ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/properties/SecurityProperties.java rename to pusong-common/pusong-common-security/src/main/java/com/pusong/common/security/config/properties/SecurityProperties.java index be1cc6e..f292fbb 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/properties/SecurityProperties.java +++ b/pusong-common/pusong-common-security/src/main/java/com/pusong/common/security/config/properties/SecurityProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.security.config.properties; +package com.pusong.common.security.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/handler/AllUrlHandler.java b/pusong-common/pusong-common-security/src/main/java/com/pusong/common/security/handler/AllUrlHandler.java similarity index 93% rename from ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/handler/AllUrlHandler.java rename to pusong-common/pusong-common-security/src/main/java/com/pusong/common/security/handler/AllUrlHandler.java index a0c6ada..a617f6e 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/handler/AllUrlHandler.java +++ b/pusong-common/pusong-common-security/src/main/java/com/pusong/common/security/handler/AllUrlHandler.java @@ -1,7 +1,7 @@ -package org.dromara.common.security.handler; +package com.pusong.common.security.handler; import cn.hutool.core.util.ReUtil; -import org.dromara.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.SpringUtils; import lombok.Data; import org.springframework.beans.factory.InitializingBean; import org.springframework.web.method.HandlerMethod; diff --git a/pusong-common/pusong-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pusong-common/pusong-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..1d7125d --- /dev/null +++ b/pusong-common/pusong-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.pusong.common.security.handler.AllUrlHandler +com.pusong.common.security.config.SecurityConfig diff --git a/ruoyi-common/ruoyi-common-sensitive/pom.xml b/pusong-common/pusong-common-sensitive/pom.xml similarity index 69% rename from ruoyi-common/ruoyi-common-sensitive/pom.xml rename to pusong-common/pusong-common-sensitive/pom.xml index fecdf09..4828eb1 100644 --- a/ruoyi-common/ruoyi-common-sensitive/pom.xml +++ b/pusong-common/pusong-common-sensitive/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.pusong + pusong-common ${revision} 4.0.0 - ruoyi-common-sensitive + pusong-common-sensitive ruoyi-common-sensitive 脱敏模块 @@ -17,8 +17,8 @@ - org.dromara - ruoyi-common-json + com.pusong + pusong-common-json diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java b/pusong-common/pusong-common-sensitive/src/main/java/com/pusong/common/sensitive/annotation/Sensitive.java similarity index 78% rename from ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java rename to pusong-common/pusong-common-sensitive/src/main/java/com/pusong/common/sensitive/annotation/Sensitive.java index 1dfc896..741ff74 100644 --- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java +++ b/pusong-common/pusong-common-sensitive/src/main/java/com/pusong/common/sensitive/annotation/Sensitive.java @@ -1,9 +1,9 @@ -package org.dromara.common.sensitive.annotation; +package com.pusong.common.sensitive.annotation; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import org.dromara.common.sensitive.core.SensitiveStrategy; -import org.dromara.common.sensitive.handler.SensitiveHandler; +import com.pusong.common.sensitive.core.SensitiveStrategy; +import com.pusong.common.sensitive.handler.SensitiveHandler; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java b/pusong-common/pusong-common-sensitive/src/main/java/com/pusong/common/sensitive/core/SensitiveService.java similarity index 85% rename from ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java rename to pusong-common/pusong-common-sensitive/src/main/java/com/pusong/common/sensitive/core/SensitiveService.java index 7b5264b..66d5679 100644 --- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java +++ b/pusong-common/pusong-common-sensitive/src/main/java/com/pusong/common/sensitive/core/SensitiveService.java @@ -1,4 +1,4 @@ -package org.dromara.common.sensitive.core; +package com.pusong.common.sensitive.core; /** * 脱敏服务 diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveStrategy.java b/pusong-common/pusong-common-sensitive/src/main/java/com/pusong/common/sensitive/core/SensitiveStrategy.java similarity index 95% rename from ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveStrategy.java rename to pusong-common/pusong-common-sensitive/src/main/java/com/pusong/common/sensitive/core/SensitiveStrategy.java index 9d1978a..fdd9a11 100644 --- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveStrategy.java +++ b/pusong-common/pusong-common-sensitive/src/main/java/com/pusong/common/sensitive/core/SensitiveStrategy.java @@ -1,4 +1,4 @@ -package org.dromara.common.sensitive.core; +package com.pusong.common.sensitive.core; import cn.hutool.core.util.DesensitizedUtil; import lombok.AllArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java b/pusong-common/pusong-common-sensitive/src/main/java/com/pusong/common/sensitive/handler/SensitiveHandler.java similarity index 88% rename from ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java rename to pusong-common/pusong-common-sensitive/src/main/java/com/pusong/common/sensitive/handler/SensitiveHandler.java index c76c83a..1b4bcab 100644 --- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java +++ b/pusong-common/pusong-common-sensitive/src/main/java/com/pusong/common/sensitive/handler/SensitiveHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.sensitive.handler; +package com.pusong.common.sensitive.handler; import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.core.JsonGenerator; @@ -7,10 +7,10 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.ContextualSerializer; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.sensitive.annotation.Sensitive; -import org.dromara.common.sensitive.core.SensitiveService; -import org.dromara.common.sensitive.core.SensitiveStrategy; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.sensitive.annotation.Sensitive; +import com.pusong.common.sensitive.core.SensitiveService; +import com.pusong.common.sensitive.core.SensitiveStrategy; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeansException; diff --git a/ruoyi-common/ruoyi-common-sms/pom.xml b/pusong-common/pusong-common-sms/pom.xml similarity index 76% rename from ruoyi-common/ruoyi-common-sms/pom.xml rename to pusong-common/pusong-common-sms/pom.xml index 932cb9d..e29cea9 100644 --- a/ruoyi-common/ruoyi-common-sms/pom.xml +++ b/pusong-common/pusong-common-sms/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.pusong + pusong-common ${revision} 4.0.0 - ruoyi-common-sms + pusong-common-sms ruoyi-common-sms 短信模块 @@ -24,8 +24,8 @@ - org.dromara - ruoyi-common-redis + com.pusong + pusong-common-redis diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java b/pusong-common/pusong-common-sms/src/main/java/com/pusong/common/sms/config/SmsAutoConfiguration.java similarity index 82% rename from ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java rename to pusong-common/pusong-common-sms/src/main/java/com/pusong/common/sms/config/SmsAutoConfiguration.java index 3a39cc2..88c1c33 100644 --- a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java +++ b/pusong-common/pusong-common-sms/src/main/java/com/pusong/common/sms/config/SmsAutoConfiguration.java @@ -1,7 +1,7 @@ -package org.dromara.common.sms.config; +package com.pusong.common.sms.config; -import org.dromara.common.sms.core.dao.PlusSmsDao; -import org.dromara.common.sms.handler.SmsExceptionHandler; +import com.pusong.common.sms.handler.SmsExceptionHandler; +import com.pusong.common.sms.dao.PlusSmsDao; import org.dromara.sms4j.api.dao.SmsDao; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java b/pusong-common/pusong-common-sms/src/main/java/com/pusong/common/sms/dao/PlusSmsDao.java similarity index 91% rename from ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java rename to pusong-common/pusong-common-sms/src/main/java/com/pusong/common/sms/dao/PlusSmsDao.java index 91d8d24..5784549 100644 --- a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java +++ b/pusong-common/pusong-common-sms/src/main/java/com/pusong/common/sms/dao/PlusSmsDao.java @@ -1,7 +1,7 @@ -package org.dromara.common.sms.core.dao; +package com.pusong.common.sms.dao; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.redis.utils.RedisUtils; +import com.pusong.common.core.constant.GlobalConstants; +import com.pusong.common.redis.utils.RedisUtils; import org.dromara.sms4j.api.dao.SmsDao; import java.time.Duration; diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/handler/SmsExceptionHandler.java b/pusong-common/pusong-common-sms/src/main/java/com/pusong/common/sms/handler/SmsExceptionHandler.java similarity index 91% rename from ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/handler/SmsExceptionHandler.java rename to pusong-common/pusong-common-sms/src/main/java/com/pusong/common/sms/handler/SmsExceptionHandler.java index 2c619a3..092af71 100644 --- a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/handler/SmsExceptionHandler.java +++ b/pusong-common/pusong-common-sms/src/main/java/com/pusong/common/sms/handler/SmsExceptionHandler.java @@ -1,9 +1,9 @@ -package org.dromara.common.sms.handler; +package com.pusong.common.sms.handler; import cn.hutool.http.HttpStatus; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.R; +import com.pusong.common.core.domain.R; import org.dromara.sms4j.comm.exception.SmsBlendException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; diff --git a/pusong-common/pusong-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pusong-common/pusong-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..817e1c0 --- /dev/null +++ b/pusong-common/pusong-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.pusong.common.sms.config.SmsAutoConfiguration diff --git a/ruoyi-common/ruoyi-common-social/pom.xml b/pusong-common/pusong-common-social/pom.xml similarity index 68% rename from ruoyi-common/ruoyi-common-social/pom.xml rename to pusong-common/pusong-common-social/pom.xml index 9f9a965..f2d2211 100644 --- a/ruoyi-common/ruoyi-common-social/pom.xml +++ b/pusong-common/pusong-common-social/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"> - org.dromara - ruoyi-common + com.pusong + pusong-common ${revision} 4.0.0 - ruoyi-common-social + pusong-common-social ruoyi-common-social 授权认证 @@ -22,13 +22,13 @@ - org.dromara - ruoyi-common-json + com.pusong + pusong-common-json - org.dromara - ruoyi-common-redis + com.pusong + pusong-common-redis diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/SocialAutoConfiguration.java b/pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/config/SocialAutoConfiguration.java similarity index 75% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/SocialAutoConfiguration.java rename to pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/config/SocialAutoConfiguration.java index 19b39d8..4314a04 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/SocialAutoConfiguration.java +++ b/pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/config/SocialAutoConfiguration.java @@ -1,8 +1,8 @@ -package org.dromara.common.social.config; +package com.pusong.common.social.config; import me.zhyd.oauth.cache.AuthStateCache; -import org.dromara.common.social.config.properties.SocialProperties; -import org.dromara.common.social.utils.AuthRedisStateCache; +import com.pusong.common.social.config.properties.SocialProperties; +import com.pusong.common.social.utils.AuthRedisStateCache; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialLoginConfigProperties.java b/pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/config/properties/SocialLoginConfigProperties.java similarity index 95% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialLoginConfigProperties.java rename to pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/config/properties/SocialLoginConfigProperties.java index 5f49d9c..6150271 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialLoginConfigProperties.java +++ b/pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/config/properties/SocialLoginConfigProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.social.config.properties; +package com.pusong.common.social.config.properties; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java b/pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/config/properties/SocialProperties.java similarity index 88% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java rename to pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/config/properties/SocialProperties.java index 1487a6a..62a0cc5 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java +++ b/pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/config/properties/SocialProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.social.config.properties; +package com.pusong.common.social.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java b/pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/maxkey/AuthMaxKeyRequest.java similarity index 95% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java rename to pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/maxkey/AuthMaxKeyRequest.java index b95c19e..6e50bd5 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java +++ b/pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/maxkey/AuthMaxKeyRequest.java @@ -1,4 +1,4 @@ -package org.dromara.common.social.maxkey; +package com.pusong.common.social.maxkey; import cn.hutool.core.lang.Dict; import me.zhyd.oauth.cache.AuthStateCache; @@ -8,8 +8,8 @@ import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthToken; import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.request.AuthDefaultRequest; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.json.utils.JsonUtils; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.json.utils.JsonUtils; /** * @author 长春叭哥 2023年03月26日 diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeySource.java b/pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/maxkey/AuthMaxKeySource.java similarity index 96% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeySource.java rename to pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/maxkey/AuthMaxKeySource.java index 1ff57f7..69e87c9 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeySource.java +++ b/pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/maxkey/AuthMaxKeySource.java @@ -1,4 +1,4 @@ -package org.dromara.common.social.maxkey; +package com.pusong.common.social.maxkey; import me.zhyd.oauth.config.AuthSource; import me.zhyd.oauth.request.AuthDefaultRequest; diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java b/pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/topiam/AuthTopIamRequest.java similarity index 93% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java rename to pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/topiam/AuthTopIamRequest.java index 13649f9..e2e590d 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java +++ b/pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/topiam/AuthTopIamRequest.java @@ -1,4 +1,4 @@ -package org.dromara.common.social.topiam; +package com.pusong.common.social.topiam; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.StrUtil; @@ -13,10 +13,10 @@ import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.request.AuthDefaultRequest; import me.zhyd.oauth.utils.HttpUtils; import me.zhyd.oauth.utils.UrlBuilder; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.json.utils.JsonUtils; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.json.utils.JsonUtils; -import static org.dromara.common.social.topiam.AuthTopiamSource.TOPIAM; +import static com.pusong.common.social.topiam.AuthTopiamSource.TOPIAM; /** * TopIAM 认证请求 diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopiamSource.java b/pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/topiam/AuthTopiamSource.java similarity index 96% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopiamSource.java rename to pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/topiam/AuthTopiamSource.java index e47d6c6..810b0d4 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopiamSource.java +++ b/pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/topiam/AuthTopiamSource.java @@ -1,4 +1,4 @@ -package org.dromara.common.social.topiam; +package com.pusong.common.social.topiam; import me.zhyd.oauth.config.AuthSource; import me.zhyd.oauth.request.AuthDefaultRequest; diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/AuthRedisStateCache.java b/pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/utils/AuthRedisStateCache.java similarity index 91% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/AuthRedisStateCache.java rename to pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/utils/AuthRedisStateCache.java index 0b6ec20..c03f327 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/AuthRedisStateCache.java +++ b/pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/utils/AuthRedisStateCache.java @@ -1,9 +1,9 @@ -package org.dromara.common.social.utils; +package com.pusong.common.social.utils; import lombok.AllArgsConstructor; import me.zhyd.oauth.cache.AuthStateCache; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.redis.utils.RedisUtils; +import com.pusong.common.core.constant.GlobalConstants; +import com.pusong.common.redis.utils.RedisUtils; import java.time.Duration; diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java b/pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/utils/SocialUtils.java similarity index 91% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java rename to pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/utils/SocialUtils.java index 04f6214..7642d25 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java +++ b/pusong-common/pusong-common-social/src/main/java/com/pusong/common/social/utils/SocialUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.social.utils; +package com.pusong.common.social.utils; import cn.hutool.core.util.ObjectUtil; import me.zhyd.oauth.config.AuthConfig; @@ -7,11 +7,11 @@ import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthResponse; import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.request.*; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.social.config.properties.SocialLoginConfigProperties; -import org.dromara.common.social.config.properties.SocialProperties; -import org.dromara.common.social.maxkey.AuthMaxKeyRequest; -import org.dromara.common.social.topiam.AuthTopIamRequest; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.social.config.properties.SocialLoginConfigProperties; +import com.pusong.common.social.config.properties.SocialProperties; +import com.pusong.common.social.maxkey.AuthMaxKeyRequest; +import com.pusong.common.social.topiam.AuthTopIamRequest; /** * 认证授权工具类 diff --git a/pusong-common/pusong-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pusong-common/pusong-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..132212e --- /dev/null +++ b/pusong-common/pusong-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.pusong.common.social.config.SocialAutoConfiguration diff --git a/ruoyi-common/ruoyi-common-tenant/pom.xml b/pusong-common/pusong-common-tenant/pom.xml similarity index 65% rename from ruoyi-common/ruoyi-common-tenant/pom.xml rename to pusong-common/pusong-common-tenant/pom.xml index 8e1a6ab..bde6d94 100644 --- a/ruoyi-common/ruoyi-common-tenant/pom.xml +++ b/pusong-common/pusong-common-tenant/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.pusong + pusong-common ${revision} 4.0.0 - ruoyi-common-tenant + pusong-common-tenant ruoyi-common-tenant 租户模块 @@ -17,14 +17,14 @@ - org.dromara - ruoyi-common-mybatis + com.pusong + pusong-common-mybatis true - org.dromara - ruoyi-common-redis + com.pusong + pusong-common-redis diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/config/TenantConfig.java b/pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/config/TenantConfig.java similarity index 83% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/config/TenantConfig.java rename to pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/config/TenantConfig.java index 07302bc..a1200ac 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/config/TenantConfig.java +++ b/pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/config/TenantConfig.java @@ -1,17 +1,17 @@ -package org.dromara.common.tenant.config; +package com.pusong.common.tenant.config; import cn.dev33.satoken.dao.SaTokenDao; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; -import org.dromara.common.core.utils.reflect.ReflectUtils; -import org.dromara.common.mybatis.config.MybatisPlusConfig; -import org.dromara.common.redis.config.RedisConfig; -import org.dromara.common.redis.config.properties.RedissonProperties; -import org.dromara.common.tenant.core.TenantSaTokenDao; -import org.dromara.common.tenant.handle.PlusTenantLineHandler; -import org.dromara.common.tenant.handle.TenantKeyPrefixHandler; -import org.dromara.common.tenant.manager.TenantSpringCacheManager; -import org.dromara.common.tenant.properties.TenantProperties; +import com.pusong.common.core.utils.reflect.ReflectUtils; +import com.pusong.common.mybatis.config.MybatisPlusConfig; +import com.pusong.common.redis.config.RedisConfig; +import com.pusong.common.redis.config.properties.RedissonProperties; +import com.pusong.common.tenant.handle.PlusTenantLineHandler; +import com.pusong.common.tenant.handle.TenantKeyPrefixHandler; +import com.pusong.common.tenant.manager.TenantSpringCacheManager; +import com.pusong.common.tenant.properties.TenantProperties; +import com.pusong.common.tenant.core.TenantSaTokenDao; import org.redisson.config.ClusterServersConfig; import org.redisson.config.SingleServerConfig; import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer; diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantEntity.java b/pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/core/TenantEntity.java similarity index 73% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantEntity.java rename to pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/core/TenantEntity.java index 8ad0d2c..924b300 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantEntity.java +++ b/pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/core/TenantEntity.java @@ -1,6 +1,6 @@ -package org.dromara.common.tenant.core; +package com.pusong.common.tenant.core; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.pusong.common.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantSaTokenDao.java b/pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/core/TenantSaTokenDao.java similarity index 95% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantSaTokenDao.java rename to pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/core/TenantSaTokenDao.java index b8da28e..3ad083d 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantSaTokenDao.java +++ b/pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/core/TenantSaTokenDao.java @@ -1,8 +1,8 @@ -package org.dromara.common.tenant.core; +package com.pusong.common.tenant.core; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.satoken.core.dao.PlusSaTokenDao; +import com.pusong.common.core.constant.GlobalConstants; +import com.pusong.common.redis.utils.RedisUtils; +import com.pusong.common.satoken.core.dao.PlusSaTokenDao; import java.time.Duration; import java.util.List; diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/exception/TenantException.java b/pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/exception/TenantException.java similarity index 74% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/exception/TenantException.java rename to pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/exception/TenantException.java index ee2bc97..e0431eb 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/exception/TenantException.java +++ b/pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/exception/TenantException.java @@ -1,6 +1,6 @@ -package org.dromara.common.tenant.exception; +package com.pusong.common.tenant.exception; -import org.dromara.common.core.exception.base.BaseException; +import com.pusong.common.core.exception.base.BaseException; import java.io.Serial; diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java b/pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/handle/PlusTenantLineHandler.java similarity index 87% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java rename to pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/handle/PlusTenantLineHandler.java index 6c93ee5..8de9e52 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java +++ b/pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/handle/PlusTenantLineHandler.java @@ -1,15 +1,15 @@ -package org.dromara.common.tenant.handle; +package com.pusong.common.tenant.handle; import cn.hutool.core.collection.ListUtil; import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler; +import com.pusong.common.tenant.helper.TenantHelper; +import com.pusong.common.tenant.properties.TenantProperties; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.NullValue; import net.sf.jsqlparser.expression.StringValue; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.common.tenant.properties.TenantProperties; +import com.pusong.common.core.utils.StringUtils; import java.util.List; diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java b/pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/handle/TenantKeyPrefixHandler.java similarity index 88% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java rename to pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/handle/TenantKeyPrefixHandler.java index 9475398..7c4089a 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java +++ b/pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/handle/TenantKeyPrefixHandler.java @@ -1,11 +1,11 @@ -package org.dromara.common.tenant.handle; +package com.pusong.common.tenant.handle; import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper; +import com.pusong.common.tenant.helper.TenantHelper; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.redis.handler.KeyPrefixHandler; -import org.dromara.common.tenant.helper.TenantHelper; +import com.pusong.common.core.constant.GlobalConstants; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.redis.handler.KeyPrefixHandler; /** * 多租户redis缓存key前缀处理 diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java b/pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/helper/TenantHelper.java similarity index 94% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java rename to pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/helper/TenantHelper.java index 9d087e1..41709c9 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java +++ b/pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/helper/TenantHelper.java @@ -1,4 +1,4 @@ -package org.dromara.common.tenant.helper; +package com.pusong.common.tenant.helper; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.convert.Convert; @@ -8,11 +8,11 @@ import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.satoken.utils.LoginHelper; +import com.pusong.common.core.constant.GlobalConstants; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.redis.utils.RedisUtils; +import com.pusong.common.satoken.utils.LoginHelper; import java.util.function.Supplier; diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/manager/TenantSpringCacheManager.java b/pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/manager/TenantSpringCacheManager.java similarity index 71% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/manager/TenantSpringCacheManager.java rename to pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/manager/TenantSpringCacheManager.java index d230afc..79b7861 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/manager/TenantSpringCacheManager.java +++ b/pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/manager/TenantSpringCacheManager.java @@ -1,9 +1,9 @@ -package org.dromara.common.tenant.manager; +package com.pusong.common.tenant.manager; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.redis.manager.PlusSpringCacheManager; -import org.dromara.common.tenant.helper.TenantHelper; +import com.pusong.common.core.constant.GlobalConstants; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.redis.manager.PlusSpringCacheManager; +import com.pusong.common.tenant.helper.TenantHelper; import org.springframework.cache.Cache; /** diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/properties/TenantProperties.java b/pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/properties/TenantProperties.java similarity index 89% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/properties/TenantProperties.java rename to pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/properties/TenantProperties.java index 1675ccf..4768f86 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/properties/TenantProperties.java +++ b/pusong-common/pusong-common-tenant/src/main/java/com/pusong/common/tenant/properties/TenantProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.tenant.properties; +package com.pusong.common.tenant.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/pusong-common/pusong-common-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pusong-common/pusong-common-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..3f353ef --- /dev/null +++ b/pusong-common/pusong-common-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.pusong.common.tenant.config.TenantConfig diff --git a/ruoyi-common/ruoyi-common-translation/pom.xml b/pusong-common/pusong-common-translation/pom.xml similarity index 69% rename from ruoyi-common/ruoyi-common-translation/pom.xml rename to pusong-common/pusong-common-translation/pom.xml index e77b868..a6d59af 100644 --- a/ruoyi-common/ruoyi-common-translation/pom.xml +++ b/pusong-common/pusong-common-translation/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.pusong + pusong-common ${revision} 4.0.0 - ruoyi-common-translation + pusong-common-translation ruoyi-common-translation 通用翻译功能 @@ -18,8 +18,8 @@ - org.dromara - ruoyi-common-json + com.pusong + pusong-common-json diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/Translation.java b/pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/annotation/Translation.java similarity index 87% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/Translation.java rename to pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/annotation/Translation.java index c24aa6f..587956c 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/Translation.java +++ b/pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/annotation/Translation.java @@ -1,8 +1,8 @@ -package org.dromara.common.translation.annotation; +package com.pusong.common.translation.annotation; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import org.dromara.common.translation.core.handler.TranslationHandler; +import com.pusong.common.translation.core.handler.TranslationHandler; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/TranslationType.java b/pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/annotation/TranslationType.java similarity index 73% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/TranslationType.java rename to pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/annotation/TranslationType.java index 43bfab0..e30b55d 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/TranslationType.java +++ b/pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/annotation/TranslationType.java @@ -1,6 +1,6 @@ -package org.dromara.common.translation.annotation; +package com.pusong.common.translation.annotation; -import org.dromara.common.translation.core.TranslationInterface; +import com.pusong.common.translation.core.TranslationInterface; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java b/pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/config/TranslationConfig.java similarity index 80% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java rename to pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/config/TranslationConfig.java index 5dcd0c1..bcaeb2b 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java +++ b/pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/config/TranslationConfig.java @@ -1,10 +1,10 @@ -package org.dromara.common.translation.config; +package com.pusong.common.translation.config; import com.fasterxml.jackson.databind.ObjectMapper; -import org.dromara.common.translation.annotation.TranslationType; -import org.dromara.common.translation.core.TranslationInterface; -import org.dromara.common.translation.core.handler.TranslationBeanSerializerModifier; -import org.dromara.common.translation.core.handler.TranslationHandler; +import com.pusong.common.translation.annotation.TranslationType; +import com.pusong.common.translation.core.handler.TranslationBeanSerializerModifier; +import com.pusong.common.translation.core.handler.TranslationHandler; +import com.pusong.common.translation.core.TranslationInterface; import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java b/pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/constant/TransConstant.java similarity index 91% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java rename to pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/constant/TransConstant.java index c084ea1..fe8f0be 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java +++ b/pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/constant/TransConstant.java @@ -1,4 +1,4 @@ -package org.dromara.common.translation.constant; +package com.pusong.common.translation.constant; /** * 翻译常量 diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/TranslationInterface.java b/pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/core/TranslationInterface.java similarity index 76% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/TranslationInterface.java rename to pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/core/TranslationInterface.java index e4d6dd3..7b37bde 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/TranslationInterface.java +++ b/pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/core/TranslationInterface.java @@ -1,6 +1,6 @@ -package org.dromara.common.translation.core; +package com.pusong.common.translation.core; -import org.dromara.common.translation.annotation.TranslationType; +import com.pusong.common.translation.annotation.TranslationType; /** * 翻译接口 (实现类需标注 {@link TranslationType} 注解标明翻译类型) diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationBeanSerializerModifier.java b/pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/core/handler/TranslationBeanSerializerModifier.java similarity index 95% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationBeanSerializerModifier.java rename to pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/core/handler/TranslationBeanSerializerModifier.java index 727672f..6d00480 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationBeanSerializerModifier.java +++ b/pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/core/handler/TranslationBeanSerializerModifier.java @@ -1,4 +1,4 @@ -package org.dromara.common.translation.core.handler; +package com.pusong.common.translation.core.handler; import com.fasterxml.jackson.databind.BeanDescription; import com.fasterxml.jackson.databind.SerializationConfig; diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationHandler.java b/pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/core/handler/TranslationHandler.java similarity index 88% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationHandler.java rename to pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/core/handler/TranslationHandler.java index bb9615b..4ef6eff 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationHandler.java +++ b/pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/core/handler/TranslationHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.translation.core.handler; +package com.pusong.common.translation.core.handler; import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.core.JsonGenerator; @@ -7,10 +7,10 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.ContextualSerializer; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.reflect.ReflectUtils; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.core.TranslationInterface; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.core.utils.reflect.ReflectUtils; +import com.pusong.common.translation.annotation.Translation; +import com.pusong.common.translation.core.TranslationInterface; import lombok.extern.slf4j.Slf4j; import java.io.IOException; diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DeptNameTranslationImpl.java b/pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/core/impl/DeptNameTranslationImpl.java similarity index 67% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DeptNameTranslationImpl.java rename to pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/core/impl/DeptNameTranslationImpl.java index c391437..dd30db9 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DeptNameTranslationImpl.java +++ b/pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/core/impl/DeptNameTranslationImpl.java @@ -1,9 +1,9 @@ -package org.dromara.common.translation.core.impl; +package com.pusong.common.translation.core.impl; -import org.dromara.common.core.service.DeptService; -import org.dromara.common.translation.annotation.TranslationType; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.common.translation.core.TranslationInterface; +import com.pusong.common.core.service.DeptService; +import com.pusong.common.translation.annotation.TranslationType; +import com.pusong.common.translation.constant.TransConstant; +import com.pusong.common.translation.core.TranslationInterface; import lombok.AllArgsConstructor; /** diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java b/pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/core/impl/DictTypeTranslationImpl.java similarity index 61% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java rename to pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/core/impl/DictTypeTranslationImpl.java index 859a93e..c6afb3a 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java +++ b/pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/core/impl/DictTypeTranslationImpl.java @@ -1,10 +1,10 @@ -package org.dromara.common.translation.core.impl; +package com.pusong.common.translation.core.impl; -import org.dromara.common.core.service.DictService; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.translation.annotation.TranslationType; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.common.translation.core.TranslationInterface; +import com.pusong.common.core.service.DictService; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.translation.annotation.TranslationType; +import com.pusong.common.translation.constant.TransConstant; +import com.pusong.common.translation.core.TranslationInterface; import lombok.AllArgsConstructor; /** diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java b/pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/core/impl/NicknameTranslationImpl.java similarity index 67% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java rename to pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/core/impl/NicknameTranslationImpl.java index b92c7f0..8b520cc 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java +++ b/pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/core/impl/NicknameTranslationImpl.java @@ -1,10 +1,10 @@ -package org.dromara.common.translation.core.impl; +package com.pusong.common.translation.core.impl; import lombok.AllArgsConstructor; -import org.dromara.common.core.service.UserService; -import org.dromara.common.translation.annotation.TranslationType; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.common.translation.core.TranslationInterface; +import com.pusong.common.core.service.UserService; +import com.pusong.common.translation.annotation.TranslationType; +import com.pusong.common.translation.constant.TransConstant; +import com.pusong.common.translation.core.TranslationInterface; /** * 用户名称翻译实现 diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/OssUrlTranslationImpl.java b/pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/core/impl/OssUrlTranslationImpl.java similarity index 66% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/OssUrlTranslationImpl.java rename to pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/core/impl/OssUrlTranslationImpl.java index fc6f6df..fae0bc5 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/OssUrlTranslationImpl.java +++ b/pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/core/impl/OssUrlTranslationImpl.java @@ -1,9 +1,9 @@ -package org.dromara.common.translation.core.impl; +package com.pusong.common.translation.core.impl; -import org.dromara.common.core.service.OssService; -import org.dromara.common.translation.annotation.TranslationType; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.common.translation.core.TranslationInterface; +import com.pusong.common.core.service.OssService; +import com.pusong.common.translation.annotation.TranslationType; +import com.pusong.common.translation.constant.TransConstant; +import com.pusong.common.translation.core.TranslationInterface; import lombok.AllArgsConstructor; /** diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java b/pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/core/impl/UserNameTranslationImpl.java similarity index 62% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java rename to pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/core/impl/UserNameTranslationImpl.java index 96f1cd3..75c110b 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java +++ b/pusong-common/pusong-common-translation/src/main/java/com/pusong/common/translation/core/impl/UserNameTranslationImpl.java @@ -1,9 +1,9 @@ -package org.dromara.common.translation.core.impl; +package com.pusong.common.translation.core.impl; -import org.dromara.common.core.service.UserService; -import org.dromara.common.translation.annotation.TranslationType; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.common.translation.core.TranslationInterface; +import com.pusong.common.core.service.UserService; +import com.pusong.common.translation.annotation.TranslationType; +import com.pusong.common.translation.constant.TransConstant; +import com.pusong.common.translation.core.TranslationInterface; import lombok.AllArgsConstructor; /** diff --git a/pusong-common/pusong-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pusong-common/pusong-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..cd5d883 --- /dev/null +++ b/pusong-common/pusong-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,6 @@ +com.pusong.common.translation.config.TranslationConfig +com.pusong.common.translation.core.impl.DeptNameTranslationImpl +com.pusong.common.translation.core.impl.DictTypeTranslationImpl +com.pusong.common.translation.core.impl.OssUrlTranslationImpl +com.pusong.common.translation.core.impl.UserNameTranslationImpl +com.pusong.common.translation.core.impl.NicknameTranslationImpl diff --git a/ruoyi-common/ruoyi-common-web/pom.xml b/pusong-common/pusong-common-web/pom.xml similarity index 83% rename from ruoyi-common/ruoyi-common-web/pom.xml rename to pusong-common/pusong-common-web/pom.xml index b250fa9..449391e 100644 --- a/ruoyi-common/ruoyi-common-web/pom.xml +++ b/pusong-common/pusong-common-web/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.pusong + pusong-common ${revision} 4.0.0 - ruoyi-common-web + pusong-common-web ruoyi-common-web web服务 @@ -17,13 +17,13 @@ - org.dromara - ruoyi-common-json + com.pusong + pusong-common-json - org.dromara - ruoyi-common-redis + com.pusong + pusong-common-redis diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/CaptchaConfig.java b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/config/CaptchaConfig.java similarity index 94% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/CaptchaConfig.java rename to pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/config/CaptchaConfig.java index 650517e..f519d84 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/CaptchaConfig.java +++ b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/config/CaptchaConfig.java @@ -1,10 +1,10 @@ -package org.dromara.common.web.config; +package com.pusong.common.web.config; import cn.hutool.captcha.CaptchaUtil; import cn.hutool.captcha.CircleCaptcha; import cn.hutool.captcha.LineCaptcha; import cn.hutool.captcha.ShearCaptcha; -import org.dromara.common.web.config.properties.CaptchaProperties; +import com.pusong.common.web.config.properties.CaptchaProperties; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/FilterConfig.java b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/config/FilterConfig.java similarity index 88% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/FilterConfig.java rename to pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/config/FilterConfig.java index 91fff76..14b2c11 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/FilterConfig.java +++ b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/config/FilterConfig.java @@ -1,9 +1,9 @@ -package org.dromara.common.web.config; +package com.pusong.common.web.config; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.web.config.properties.XssProperties; -import org.dromara.common.web.filter.RepeatableFilter; -import org.dromara.common.web.filter.XssFilter; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.web.config.properties.XssProperties; +import com.pusong.common.web.filter.RepeatableFilter; +import com.pusong.common.web.filter.XssFilter; import jakarta.servlet.DispatcherType; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/I18nConfig.java b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/config/I18nConfig.java similarity index 84% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/I18nConfig.java rename to pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/config/I18nConfig.java index 4e212cb..ac3bc0b 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/I18nConfig.java +++ b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/config/I18nConfig.java @@ -1,6 +1,6 @@ -package org.dromara.common.web.config; +package com.pusong.common.web.config; -import org.dromara.common.web.core.I18nLocaleResolver; +import com.pusong.common.web.core.I18nLocaleResolver; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/ResourcesConfig.java b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/config/ResourcesConfig.java similarity index 91% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/ResourcesConfig.java rename to pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/config/ResourcesConfig.java index 1371913..40386c6 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/ResourcesConfig.java +++ b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/config/ResourcesConfig.java @@ -1,7 +1,7 @@ -package org.dromara.common.web.config; +package com.pusong.common.web.config; -import org.dromara.common.web.handler.GlobalExceptionHandler; -import org.dromara.common.web.interceptor.PlusWebInvokeTimeInterceptor; +import com.pusong.common.web.handler.GlobalExceptionHandler; +import com.pusong.common.web.interceptor.PlusWebInvokeTimeInterceptor; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.web.cors.CorsConfiguration; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/config/UndertowConfig.java similarity index 94% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java rename to pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/config/UndertowConfig.java index 0f78928..c3beb9d 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java +++ b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/config/UndertowConfig.java @@ -1,8 +1,8 @@ -package org.dromara.common.web.config; +package com.pusong.common.web.config; import io.undertow.server.DefaultByteBufferPool; import io.undertow.websockets.jsr.WebSocketDeploymentInfo; -import org.dromara.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.SpringUtils; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory; import org.springframework.boot.web.server.WebServerFactoryCustomizer; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/CaptchaProperties.java b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/config/properties/CaptchaProperties.java similarity index 79% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/CaptchaProperties.java rename to pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/config/properties/CaptchaProperties.java index bfc52f4..b9e4d08 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/CaptchaProperties.java +++ b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/config/properties/CaptchaProperties.java @@ -1,7 +1,7 @@ -package org.dromara.common.web.config.properties; +package com.pusong.common.web.config.properties; -import org.dromara.common.web.enums.CaptchaCategory; -import org.dromara.common.web.enums.CaptchaType; +import com.pusong.common.web.enums.CaptchaCategory; +import com.pusong.common.web.enums.CaptchaType; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/XssProperties.java b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/config/properties/XssProperties.java similarity index 90% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/XssProperties.java rename to pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/config/properties/XssProperties.java index ecf4f33..e32fa93 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/XssProperties.java +++ b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/config/properties/XssProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.web.config.properties; +package com.pusong.common.web.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/BaseController.java b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/core/BaseController.java similarity index 83% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/BaseController.java rename to pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/core/BaseController.java index fd01dda..1dcfc66 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/BaseController.java +++ b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/core/BaseController.java @@ -1,7 +1,7 @@ -package org.dromara.common.web.core; +package com.pusong.common.web.core; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.utils.StringUtils; /** * web层通用数据处理 diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/core/I18nLocaleResolver.java similarity index 95% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java rename to pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/core/I18nLocaleResolver.java index 98ddd06..b42033c 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java +++ b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/core/I18nLocaleResolver.java @@ -1,4 +1,4 @@ -package org.dromara.common.web.core; +package com.pusong.common.web.core; import org.springframework.web.servlet.LocaleResolver; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaCategory.java b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/enums/CaptchaCategory.java similarity index 93% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaCategory.java rename to pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/enums/CaptchaCategory.java index ecf2658..71dc2e1 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaCategory.java +++ b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/enums/CaptchaCategory.java @@ -1,4 +1,4 @@ -package org.dromara.common.web.enums; +package com.pusong.common.web.enums; import cn.hutool.captcha.AbstractCaptcha; import cn.hutool.captcha.CircleCaptcha; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaType.java b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/enums/CaptchaType.java similarity index 82% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaType.java rename to pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/enums/CaptchaType.java index d0b7334..26a64a5 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaType.java +++ b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/enums/CaptchaType.java @@ -1,8 +1,8 @@ -package org.dromara.common.web.enums; +package com.pusong.common.web.enums; import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.captcha.generator.RandomGenerator; -import org.dromara.common.web.utils.UnsignedMathGenerator; +import com.pusong.common.web.utils.UnsignedMathGenerator; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatableFilter.java b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/filter/RepeatableFilter.java similarity index 92% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatableFilter.java rename to pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/filter/RepeatableFilter.java index e0a3bf2..692a609 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatableFilter.java +++ b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/filter/RepeatableFilter.java @@ -1,6 +1,6 @@ -package org.dromara.common.web.filter; +package com.pusong.common.web.filter; -import org.dromara.common.core.utils.StringUtils; +import com.pusong.common.core.utils.StringUtils; import org.springframework.http.MediaType; import jakarta.servlet.*; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatedlyRequestWrapper.java b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/filter/RepeatedlyRequestWrapper.java similarity index 95% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatedlyRequestWrapper.java rename to pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/filter/RepeatedlyRequestWrapper.java index 8933225..5e46875 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatedlyRequestWrapper.java +++ b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/filter/RepeatedlyRequestWrapper.java @@ -1,7 +1,7 @@ -package org.dromara.common.web.filter; +package com.pusong.common.web.filter; import cn.hutool.core.io.IoUtil; -import org.dromara.common.core.constant.Constants; +import com.pusong.common.core.constant.Constants; import jakarta.servlet.ReadListener; import jakarta.servlet.ServletInputStream; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/filter/XssFilter.java similarity index 95% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java rename to pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/filter/XssFilter.java index a6cbe8c..62a9a0d 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java +++ b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/filter/XssFilter.java @@ -1,6 +1,6 @@ -package org.dromara.common.web.filter; +package com.pusong.common.web.filter; -import org.dromara.common.core.utils.StringUtils; +import com.pusong.common.core.utils.StringUtils; import org.springframework.http.HttpMethod; import jakarta.servlet.*; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/filter/XssHttpServletRequestWrapper.java similarity index 96% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java rename to pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/filter/XssHttpServletRequestWrapper.java index 4a425c5..6b63dd6 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java +++ b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/filter/XssHttpServletRequestWrapper.java @@ -1,9 +1,9 @@ -package org.dromara.common.web.filter; +package com.pusong.common.web.filter; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HtmlUtil; -import org.dromara.common.core.utils.StringUtils; +import com.pusong.common.core.utils.StringUtils; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/handler/GlobalExceptionHandler.java similarity index 95% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java rename to pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/handler/GlobalExceptionHandler.java index bd47c18..a7114a3 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java +++ b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/handler/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.web.handler; +package com.pusong.common.web.handler; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpStatus; @@ -6,10 +6,10 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolationException; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.exception.base.BaseException; -import org.dromara.common.core.utils.StreamUtils; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.exception.base.BaseException; +import com.pusong.common.core.utils.StreamUtils; import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.validation.BindException; import org.springframework.web.HttpRequestMethodNotSupportedException; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/interceptor/PlusWebInvokeTimeInterceptor.java similarity index 92% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java rename to pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/interceptor/PlusWebInvokeTimeInterceptor.java index 12c8086..dbb8c7e 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java +++ b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/interceptor/PlusWebInvokeTimeInterceptor.java @@ -1,15 +1,15 @@ -package org.dromara.common.web.interceptor; +package com.pusong.common.web.interceptor; import cn.hutool.core.io.IoUtil; import cn.hutool.core.map.MapUtil; +import com.pusong.common.web.filter.RepeatedlyRequestWrapper; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.time.StopWatch; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.web.filter.RepeatedlyRequestWrapper; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.json.utils.JsonUtils; import org.springframework.http.MediaType; import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.ModelAndView; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/utils/UnsignedMathGenerator.java b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/utils/UnsignedMathGenerator.java similarity index 96% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/utils/UnsignedMathGenerator.java rename to pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/utils/UnsignedMathGenerator.java index a400cff..3f48359 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/utils/UnsignedMathGenerator.java +++ b/pusong-common/pusong-common-web/src/main/java/com/pusong/common/web/utils/UnsignedMathGenerator.java @@ -1,10 +1,10 @@ -package org.dromara.common.web.utils; +package com.pusong.common.web.utils; import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.core.math.Calculator; import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.RandomUtil; -import org.dromara.common.core.utils.StringUtils; +import com.pusong.common.core.utils.StringUtils; import java.io.Serial; diff --git a/pusong-common/pusong-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pusong-common/pusong-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..bd2012d --- /dev/null +++ b/pusong-common/pusong-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,5 @@ +com.pusong.common.web.config.CaptchaConfig +com.pusong.common.web.config.FilterConfig +com.pusong.common.web.config.I18nConfig +com.pusong.common.web.config.ResourcesConfig +com.pusong.common.web.config.UndertowConfig diff --git a/ruoyi-common/ruoyi-common-websocket/pom.xml b/pusong-common/pusong-common-websocket/pom.xml similarity index 60% rename from ruoyi-common/ruoyi-common-websocket/pom.xml rename to pusong-common/pusong-common-websocket/pom.xml index db86dcb..0bc8a5c 100644 --- a/ruoyi-common/ruoyi-common-websocket/pom.xml +++ b/pusong-common/pusong-common-websocket/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.pusong + pusong-common ${revision} 4.0.0 - ruoyi-common-websocket + pusong-common-websocket ruoyi-common-websocket 模块 @@ -17,20 +17,20 @@ - org.dromara - ruoyi-common-core + com.pusong + pusong-common-core - org.dromara - ruoyi-common-redis + com.pusong + pusong-common-redis - org.dromara - ruoyi-common-satoken + com.pusong + pusong-common-satoken - org.dromara - ruoyi-common-json + com.pusong + pusong-common-json org.springframework.boot diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java b/pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/config/WebSocketConfig.java similarity index 87% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java rename to pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/config/WebSocketConfig.java index ef5cfc9..9b0fc67 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java +++ b/pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/config/WebSocketConfig.java @@ -1,10 +1,10 @@ -package org.dromara.common.websocket.config; +package com.pusong.common.websocket.config; import cn.hutool.core.util.StrUtil; -import org.dromara.common.websocket.config.properties.WebSocketProperties; -import org.dromara.common.websocket.handler.PlusWebSocketHandler; -import org.dromara.common.websocket.interceptor.PlusWebSocketInterceptor; -import org.dromara.common.websocket.listener.WebSocketTopicListener; +import com.pusong.common.websocket.config.properties.WebSocketProperties; +import com.pusong.common.websocket.handler.PlusWebSocketHandler; +import com.pusong.common.websocket.interceptor.PlusWebSocketInterceptor; +import com.pusong.common.websocket.listener.WebSocketTopicListener; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/properties/WebSocketProperties.java b/pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/config/properties/WebSocketProperties.java similarity index 87% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/properties/WebSocketProperties.java rename to pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/config/properties/WebSocketProperties.java index d629fe5..074e870 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/properties/WebSocketProperties.java +++ b/pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/config/properties/WebSocketProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.websocket.config.properties; +package com.pusong.common.websocket.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/constant/WebSocketConstants.java b/pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/constant/WebSocketConstants.java similarity index 90% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/constant/WebSocketConstants.java rename to pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/constant/WebSocketConstants.java index e243279..5fb233b 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/constant/WebSocketConstants.java +++ b/pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/constant/WebSocketConstants.java @@ -1,4 +1,4 @@ -package org.dromara.common.websocket.constant; +package com.pusong.common.websocket.constant; /** * websocket的常量配置 diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/dto/WebSocketMessageDto.java b/pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/dto/WebSocketMessageDto.java similarity index 91% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/dto/WebSocketMessageDto.java rename to pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/dto/WebSocketMessageDto.java index e2d4456..2919b11 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/dto/WebSocketMessageDto.java +++ b/pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/dto/WebSocketMessageDto.java @@ -1,4 +1,4 @@ -package org.dromara.common.websocket.dto; +package com.pusong.common.websocket.dto; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java b/pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/handler/PlusWebSocketHandler.java similarity index 89% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java rename to pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/handler/PlusWebSocketHandler.java index 8b1cc5d..a5665f9 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java +++ b/pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/handler/PlusWebSocketHandler.java @@ -1,19 +1,18 @@ -package org.dromara.common.websocket.handler; +package com.pusong.common.websocket.handler; import cn.hutool.core.util.ObjectUtil; +import com.pusong.common.websocket.constant.WebSocketConstants; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.websocket.dto.WebSocketMessageDto; -import org.dromara.common.websocket.holder.WebSocketSessionHolder; -import org.dromara.common.websocket.utils.WebSocketUtils; +import com.pusong.common.core.domain.model.LoginUser; +import com.pusong.common.websocket.dto.WebSocketMessageDto; +import com.pusong.common.websocket.holder.WebSocketSessionHolder; +import com.pusong.common.websocket.utils.WebSocketUtils; import org.springframework.web.socket.*; import org.springframework.web.socket.handler.AbstractWebSocketHandler; import java.io.IOException; import java.util.List; -import static org.dromara.common.websocket.constant.WebSocketConstants.LOGIN_USER_KEY; - /** * WebSocketHandler 实现类 * @@ -27,7 +26,7 @@ public class PlusWebSocketHandler extends AbstractWebSocketHandler { */ @Override public void afterConnectionEstablished(WebSocketSession session) throws IOException { - LoginUser loginUser = (LoginUser) session.getAttributes().get(LOGIN_USER_KEY); + LoginUser loginUser = (LoginUser) session.getAttributes().get(WebSocketConstants.LOGIN_USER_KEY); if (ObjectUtil.isNull(loginUser)) { session.close(CloseStatus.BAD_DATA); log.info("[connect] invalid token received. sessionId: {}", session.getId()); @@ -47,7 +46,7 @@ public class PlusWebSocketHandler extends AbstractWebSocketHandler { @Override protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception { // 从WebSocket会话中获取登录用户信息 - LoginUser loginUser = (LoginUser) session.getAttributes().get(LOGIN_USER_KEY); + LoginUser loginUser = (LoginUser) session.getAttributes().get(WebSocketConstants.LOGIN_USER_KEY); // 创建WebSocket消息DTO对象 WebSocketMessageDto webSocketMessageDto = new WebSocketMessageDto(); @@ -100,7 +99,7 @@ public class PlusWebSocketHandler extends AbstractWebSocketHandler { */ @Override public void afterConnectionClosed(WebSocketSession session, CloseStatus status) { - LoginUser loginUser = (LoginUser) session.getAttributes().get(LOGIN_USER_KEY); + LoginUser loginUser = (LoginUser) session.getAttributes().get(WebSocketConstants.LOGIN_USER_KEY); if (ObjectUtil.isNull(loginUser)) { log.info("[disconnect] invalid token received. sessionId: {}", session.getId()); return; diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/holder/WebSocketSessionHolder.java b/pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/holder/WebSocketSessionHolder.java similarity index 97% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/holder/WebSocketSessionHolder.java rename to pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/holder/WebSocketSessionHolder.java index 368801c..5b96a55 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/holder/WebSocketSessionHolder.java +++ b/pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/holder/WebSocketSessionHolder.java @@ -1,4 +1,4 @@ -package org.dromara.common.websocket.holder; +package com.pusong.common.websocket.holder; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java b/pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/interceptor/PlusWebSocketInterceptor.java similarity index 87% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java rename to pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/interceptor/PlusWebSocketInterceptor.java index 1ad8ad6..9a62c1b 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java +++ b/pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/interceptor/PlusWebSocketInterceptor.java @@ -1,12 +1,12 @@ -package org.dromara.common.websocket.interceptor; +package com.pusong.common.websocket.interceptor; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.stp.StpUtil; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.satoken.utils.LoginHelper; +import com.pusong.common.core.domain.model.LoginUser; +import com.pusong.common.core.utils.ServletUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.satoken.utils.LoginHelper; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; import org.springframework.web.socket.WebSocketHandler; @@ -14,7 +14,7 @@ import org.springframework.web.socket.server.HandshakeInterceptor; import java.util.Map; -import static org.dromara.common.websocket.constant.WebSocketConstants.LOGIN_USER_KEY; +import static com.pusong.common.websocket.constant.WebSocketConstants.LOGIN_USER_KEY; /** * WebSocket握手请求的拦截器 diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/listener/WebSocketTopicListener.java b/pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/listener/WebSocketTopicListener.java similarity index 90% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/listener/WebSocketTopicListener.java rename to pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/listener/WebSocketTopicListener.java index 0ad39af..e139170 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/listener/WebSocketTopicListener.java +++ b/pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/listener/WebSocketTopicListener.java @@ -1,9 +1,9 @@ -package org.dromara.common.websocket.listener; +package com.pusong.common.websocket.listener; import cn.hutool.core.collection.CollUtil; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.websocket.holder.WebSocketSessionHolder; -import org.dromara.common.websocket.utils.WebSocketUtils; +import com.pusong.common.websocket.holder.WebSocketSessionHolder; +import com.pusong.common.websocket.utils.WebSocketUtils; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.core.Ordered; diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java b/pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/utils/WebSocketUtils.java similarity index 83% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java rename to pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/utils/WebSocketUtils.java index afe76e0..f3a7739 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java +++ b/pusong-common/pusong-common-websocket/src/main/java/com/pusong/common/websocket/utils/WebSocketUtils.java @@ -1,12 +1,13 @@ -package org.dromara.common.websocket.utils; +package com.pusong.common.websocket.utils; import cn.hutool.core.collection.CollUtil; +import com.pusong.common.websocket.constant.WebSocketConstants; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.websocket.dto.WebSocketMessageDto; -import org.dromara.common.websocket.holder.WebSocketSessionHolder; +import com.pusong.common.redis.utils.RedisUtils; +import com.pusong.common.websocket.dto.WebSocketMessageDto; +import com.pusong.common.websocket.holder.WebSocketSessionHolder; import org.springframework.web.socket.PongMessage; import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.WebSocketMessage; @@ -17,8 +18,6 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; -import static org.dromara.common.websocket.constant.WebSocketConstants.WEB_SOCKET_TOPIC; - /** * 工具类 * @@ -45,7 +44,7 @@ public class WebSocketUtils { * @param consumer 处理WebSocket消息的消费者函数 */ public static void subscribeMessage(Consumer consumer) { - RedisUtils.subscribe(WEB_SOCKET_TOPIC, WebSocketMessageDto.class, consumer); + RedisUtils.subscribe(WebSocketConstants.WEB_SOCKET_TOPIC, WebSocketMessageDto.class, consumer); } /** @@ -68,9 +67,9 @@ public class WebSocketUtils { WebSocketMessageDto broadcastMessage = new WebSocketMessageDto(); broadcastMessage.setMessage(webSocketMessage.getMessage()); broadcastMessage.setSessionKeys(unsentSessionKeys); - RedisUtils.publish(WEB_SOCKET_TOPIC, broadcastMessage, consumer -> { + RedisUtils.publish(WebSocketConstants.WEB_SOCKET_TOPIC, broadcastMessage, consumer -> { log.info(" WebSocket发送主题订阅消息topic:{} session keys:{} message:{}", - WEB_SOCKET_TOPIC, unsentSessionKeys, webSocketMessage.getMessage()); + WebSocketConstants.WEB_SOCKET_TOPIC, unsentSessionKeys, webSocketMessage.getMessage()); }); } } @@ -83,8 +82,8 @@ public class WebSocketUtils { public static void publishAll(String message) { WebSocketMessageDto broadcastMessage = new WebSocketMessageDto(); broadcastMessage.setMessage(message); - RedisUtils.publish(WEB_SOCKET_TOPIC, broadcastMessage, consumer -> { - log.info("WebSocket发送主题订阅消息topic:{} message:{}", WEB_SOCKET_TOPIC, message); + RedisUtils.publish(WebSocketConstants.WEB_SOCKET_TOPIC, broadcastMessage, consumer -> { + log.info("WebSocket发送主题订阅消息topic:{} message:{}", WebSocketConstants.WEB_SOCKET_TOPIC, message); }); } diff --git a/pusong-common/pusong-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pusong-common/pusong-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..1b5ec03 --- /dev/null +++ b/pusong-common/pusong-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.pusong.common.websocket.config.WebSocketConfig diff --git a/ruoyi-extend/pom.xml b/pusong-extend/pom.xml similarity index 66% rename from ruoyi-extend/pom.xml rename to pusong-extend/pom.xml index d7280ce..7e3f199 100644 --- a/ruoyi-extend/pom.xml +++ b/pusong-extend/pom.xml @@ -3,17 +3,17 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-vue-plus - org.dromara + pusong-vue-plus + com.pusong ${revision} 4.0.0 - ruoyi-extend + pusong-extend pom - ruoyi-monitor-admin - ruoyi-snailjob-server + pusong-monitor-admin + pusong-snailjob-server diff --git a/ruoyi-extend/ruoyi-monitor-admin/Dockerfile b/pusong-extend/pusong-monitor-admin/Dockerfile similarity index 100% rename from ruoyi-extend/ruoyi-monitor-admin/Dockerfile rename to pusong-extend/pusong-monitor-admin/Dockerfile diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/pusong-extend/pusong-monitor-admin/pom.xml similarity index 93% rename from ruoyi-extend/ruoyi-monitor-admin/pom.xml rename to pusong-extend/pusong-monitor-admin/pom.xml index 91194c6..62a9f28 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/pom.xml +++ b/pusong-extend/pusong-monitor-admin/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-extend - org.dromara + pusong-extend + com.pusong ${revision} 4.0.0 jar - ruoyi-monitor-admin + pusong-monitor-admin diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/MonitorAdminApplication.java b/pusong-extend/pusong-monitor-admin/src/main/java/com/pusong/monitor/admin/MonitorAdminApplication.java similarity index 92% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/MonitorAdminApplication.java rename to pusong-extend/pusong-monitor-admin/src/main/java/com/pusong/monitor/admin/MonitorAdminApplication.java index 0339ebb..d441be7 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/MonitorAdminApplication.java +++ b/pusong-extend/pusong-monitor-admin/src/main/java/com/pusong/monitor/admin/MonitorAdminApplication.java @@ -1,4 +1,4 @@ -package org.dromara.monitor.admin; +package com.pusong.monitor.admin; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/AdminServerConfig.java b/pusong-extend/pusong-monitor-admin/src/main/java/com/pusong/monitor/admin/config/AdminServerConfig.java similarity index 95% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/AdminServerConfig.java rename to pusong-extend/pusong-monitor-admin/src/main/java/com/pusong/monitor/admin/config/AdminServerConfig.java index 53d248e..fe0f81f 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/AdminServerConfig.java +++ b/pusong-extend/pusong-monitor-admin/src/main/java/com/pusong/monitor/admin/config/AdminServerConfig.java @@ -1,4 +1,4 @@ -package org.dromara.monitor.admin.config; +package com.pusong.monitor.admin.config; import de.codecentric.boot.admin.server.config.EnableAdminServer; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/SecurityConfig.java b/pusong-extend/pusong-monitor-admin/src/main/java/com/pusong/monitor/admin/config/SecurityConfig.java similarity index 98% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/SecurityConfig.java rename to pusong-extend/pusong-monitor-admin/src/main/java/com/pusong/monitor/admin/config/SecurityConfig.java index 3f5dec8..7fe94e7 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/SecurityConfig.java +++ b/pusong-extend/pusong-monitor-admin/src/main/java/com/pusong/monitor/admin/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package org.dromara.monitor.admin.config; +package com.pusong.monitor.admin.config; import de.codecentric.boot.admin.server.config.AdminServerProperties; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/CustomNotifier.java b/pusong-extend/pusong-monitor-admin/src/main/java/com/pusong/monitor/admin/notifier/CustomNotifier.java similarity index 96% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/CustomNotifier.java rename to pusong-extend/pusong-monitor-admin/src/main/java/com/pusong/monitor/admin/notifier/CustomNotifier.java index 477a598..9519a50 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/CustomNotifier.java +++ b/pusong-extend/pusong-monitor-admin/src/main/java/com/pusong/monitor/admin/notifier/CustomNotifier.java @@ -1,4 +1,4 @@ -package org.dromara.monitor.admin.notifier; +package com.pusong.monitor.admin.notifier; import de.codecentric.boot.admin.server.domain.entities.Instance; import de.codecentric.boot.admin.server.domain.entities.InstanceRepository; diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml b/pusong-extend/pusong-monitor-admin/src/main/resources/application.yml similarity index 89% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml rename to pusong-extend/pusong-monitor-admin/src/main/resources/application.yml index 43078f7..a455d3e 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml +++ b/pusong-extend/pusong-monitor-admin/src/main/resources/application.yml @@ -18,7 +18,7 @@ spring: boot: admin: ui: - title: RuoYi-Vue-Plus服务监控中心 + title: PuSong-Vue-Plus服务监控中心 context-path: /admin --- # Actuator 监控端点的配置项 @@ -38,7 +38,7 @@ spring.boot.admin.client: # 增加客户端开关 enabled: true # 设置 Spring Boot Admin Server 地址 - url: http://192.168.18.23:9090/admin + url: http://localhost:9090/admin instance: service-host-type: IP username: pusong diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/banner.txt b/pusong-extend/pusong-monitor-admin/src/main/resources/banner.txt similarity index 100% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/resources/banner.txt rename to pusong-extend/pusong-monitor-admin/src/main/resources/banner.txt diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback-plus.xml b/pusong-extend/pusong-monitor-admin/src/main/resources/logback-plus.xml similarity index 100% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback-plus.xml rename to pusong-extend/pusong-monitor-admin/src/main/resources/logback-plus.xml diff --git a/ruoyi-extend/ruoyi-snailjob-server/Dockerfile b/pusong-extend/pusong-snailjob-server/Dockerfile similarity index 100% rename from ruoyi-extend/ruoyi-snailjob-server/Dockerfile rename to pusong-extend/pusong-snailjob-server/Dockerfile diff --git a/ruoyi-extend/ruoyi-snailjob-server/pom.xml b/pusong-extend/pusong-snailjob-server/pom.xml similarity index 91% rename from ruoyi-extend/ruoyi-snailjob-server/pom.xml rename to pusong-extend/pusong-snailjob-server/pom.xml index 7348b29..c0b3566 100644 --- a/ruoyi-extend/ruoyi-snailjob-server/pom.xml +++ b/pusong-extend/pusong-snailjob-server/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-extend + com.pusong + pusong-extend ${revision} 4.0.0 jar - ruoyi-snailjob-server + pusong-snailjob-server diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/java/org/dromara/snailjob/SnailJobServerApplication.java b/pusong-extend/pusong-snailjob-server/src/main/java/com/pusong/snailjob/SnailJobServerApplication.java similarity index 93% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/java/org/dromara/snailjob/SnailJobServerApplication.java rename to pusong-extend/pusong-snailjob-server/src/main/java/com/pusong/snailjob/SnailJobServerApplication.java index dfab068..40c1056 100644 --- a/ruoyi-extend/ruoyi-snailjob-server/src/main/java/org/dromara/snailjob/SnailJobServerApplication.java +++ b/pusong-extend/pusong-snailjob-server/src/main/java/com/pusong/snailjob/SnailJobServerApplication.java @@ -1,4 +1,4 @@ -package org.dromara.snailjob; +package com.pusong.snailjob; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml b/pusong-extend/pusong-snailjob-server/src/main/resources/application-dev.yml similarity index 96% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml rename to pusong-extend/pusong-snailjob-server/src/main/resources/application-dev.yml index 1ed73cb..ebde8ff 100644 --- a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml +++ b/pusong-extend/pusong-snailjob-server/src/main/resources/application-dev.yml @@ -40,7 +40,7 @@ snail-job: spring.boot.admin.client: # 增加客户端开关 enabled: true - url: http://192.168.18.23:9090/admin + url: http://localhost:9090/admin instance: service-host-type: IP username: pusong diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml b/pusong-extend/pusong-snailjob-server/src/main/resources/application-prod.yml similarity index 100% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml rename to pusong-extend/pusong-snailjob-server/src/main/resources/application-prod.yml diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application.yml b/pusong-extend/pusong-snailjob-server/src/main/resources/application.yml similarity index 100% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application.yml rename to pusong-extend/pusong-snailjob-server/src/main/resources/application.yml diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/banner.txt b/pusong-extend/pusong-snailjob-server/src/main/resources/banner.txt similarity index 100% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/resources/banner.txt rename to pusong-extend/pusong-snailjob-server/src/main/resources/banner.txt diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/logback-plus.xml b/pusong-extend/pusong-snailjob-server/src/main/resources/logback-plus.xml similarity index 100% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/resources/logback-plus.xml rename to pusong-extend/pusong-snailjob-server/src/main/resources/logback-plus.xml diff --git a/ruoyi-modules/pom.xml b/pusong-modules/pom.xml similarity index 61% rename from ruoyi-modules/pom.xml rename to pusong-modules/pom.xml index daff497..25eb098 100644 --- a/ruoyi-modules/pom.xml +++ b/pusong-modules/pom.xml @@ -3,21 +3,21 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-vue-plus - org.dromara + pusong-vue-plus + com.pusong ${revision} 4.0.0 - ruoyi-demo - ruoyi-generator - ruoyi-job - ruoyi-system - ruoyi-workflow + pusong-demo + pusong-generator + pusong-job + pusong-system + pusong-workflow - ruoyi-modules + pusong-modules pom diff --git a/pusong-modules/pusong-demo/pom.xml b/pusong-modules/pusong-demo/pom.xml new file mode 100644 index 0000000..e787852 --- /dev/null +++ b/pusong-modules/pusong-demo/pom.xml @@ -0,0 +1,108 @@ + + + + com.pusong + pusong-modules + ${revision} + + 4.0.0 + + pusong-demo + + + demo模块 + + + + + + + com.pusong + pusong-common-core + + + + com.pusong + pusong-common-doc + + + + com.pusong + pusong-common-sms + + + + com.pusong + pusong-common-mail + + + + com.pusong + pusong-common-redis + + + + com.pusong + pusong-common-idempotent + + + + com.pusong + pusong-common-mybatis + + + + com.pusong + pusong-common-log + + + + com.pusong + pusong-common-excel + + + + com.pusong + pusong-common-security + + + + com.pusong + pusong-common-web + + + + com.pusong + pusong-common-ratelimiter + + + + com.pusong + pusong-common-translation + + + + com.pusong + pusong-common-sensitive + + + + com.pusong + pusong-common-encrypt + + + + com.pusong + pusong-common-tenant + + + + com.pusong + pusong-common-websocket + + + + + diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailController.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/MailController.java similarity index 90% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailController.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/MailController.java index 47b4349..23acfb7 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailController.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/MailController.java @@ -1,7 +1,7 @@ -package org.dromara.demo.controller; +package com.pusong.demo.controller; -import org.dromara.common.core.domain.R; -import org.dromara.common.mail.utils.MailUtils; +import com.pusong.common.core.domain.R; +import com.pusong.common.mail.utils.MailUtils; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/RedisCacheController.java similarity index 94% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/RedisCacheController.java index 341880c..caca846 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/RedisCacheController.java @@ -1,8 +1,8 @@ -package org.dromara.demo.controller; +package com.pusong.demo.controller; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.domain.R; -import org.dromara.common.redis.utils.RedisUtils; +import com.pusong.common.core.constant.CacheNames; +import com.pusong.common.core.domain.R; +import com.pusong.common.redis.utils.RedisUtils; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CachePut; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/RedisLockController.java similarity index 96% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/RedisLockController.java index b7e0962..9393f10 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/RedisLockController.java @@ -1,10 +1,10 @@ -package org.dromara.demo.controller; +package com.pusong.demo.controller; import com.baomidou.lock.LockInfo; import com.baomidou.lock.LockTemplate; import com.baomidou.lock.annotation.Lock4j; import com.baomidou.lock.executor.RedissonLockExecutor; -import org.dromara.common.core.domain.R; +import com.pusong.common.core.domain.R; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/RedisPubSubController.java similarity index 89% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/RedisPubSubController.java index bdbf033..19ca223 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/RedisPubSubController.java @@ -1,7 +1,7 @@ -package org.dromara.demo.controller; +package com.pusong.demo.controller; -import org.dromara.common.core.domain.R; -import org.dromara.common.redis.utils.RedisUtils; +import com.pusong.common.core.domain.R; +import com.pusong.common.redis.utils.RedisUtils; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/RedisRateLimiterController.java similarity index 88% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/RedisRateLimiterController.java index f8adf7d..49a3c73 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/RedisRateLimiterController.java @@ -1,8 +1,8 @@ -package org.dromara.demo.controller; +package com.pusong.demo.controller; -import org.dromara.common.core.domain.R; -import org.dromara.common.ratelimiter.annotation.RateLimiter; -import org.dromara.common.ratelimiter.enums.LimitType; +import com.pusong.common.core.domain.R; +import com.pusong.common.ratelimiter.annotation.RateLimiter; +import com.pusong.common.ratelimiter.enums.LimitType; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/SmsController.java similarity index 96% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/SmsController.java index b993f60..7f9e230 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/SmsController.java @@ -1,7 +1,7 @@ -package org.dromara.demo.controller; +package com.pusong.demo.controller; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; +import com.pusong.common.core.domain.R; import org.dromara.sms4j.api.SmsBlend; import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.core.factory.SmsFactory; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/Swagger3DemoController.java similarity index 91% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/Swagger3DemoController.java index bb02f98..4b57c24 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/Swagger3DemoController.java @@ -1,6 +1,6 @@ -package org.dromara.demo.controller; +package com.pusong.demo.controller; -import org.dromara.common.core.domain.R; +import com.pusong.common.core.domain.R; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/TestBatchController.java similarity index 92% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/TestBatchController.java index af8c77b..28b72e5 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/TestBatchController.java @@ -1,10 +1,10 @@ -package org.dromara.demo.controller; +package com.pusong.demo.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.dromara.common.core.domain.R; -import org.dromara.common.web.core.BaseController; -import org.dromara.demo.domain.TestDemo; -import org.dromara.demo.mapper.TestDemoMapper; +import com.pusong.common.core.domain.R; +import com.pusong.common.web.core.BaseController; +import com.pusong.demo.domain.TestDemo; +import com.pusong.demo.mapper.TestDemoMapper; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/TestDemoController.java similarity index 81% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/TestDemoController.java index f31c540..ceb0f6a 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/TestDemoController.java @@ -1,25 +1,25 @@ -package org.dromara.demo.controller; +package com.pusong.demo.controller; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.core.validate.QueryGroup; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.excel.core.ExcelResult; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.demo.domain.TestDemo; -import org.dromara.demo.domain.bo.TestDemoBo; -import org.dromara.demo.domain.bo.TestDemoImportVo; -import org.dromara.demo.domain.vo.TestDemoVo; -import org.dromara.demo.service.ITestDemoService; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.utils.MapstructUtils; +import com.pusong.common.core.utils.ValidatorUtils; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.core.validate.EditGroup; +import com.pusong.common.core.validate.QueryGroup; +import com.pusong.common.web.core.BaseController; +import com.pusong.common.idempotent.annotation.RepeatSubmit; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.excel.core.ExcelResult; +import com.pusong.common.excel.utils.ExcelUtil; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.demo.domain.TestDemo; +import com.pusong.demo.domain.bo.TestDemoBo; +import com.pusong.demo.domain.bo.TestDemoImportVo; +import com.pusong.demo.domain.vo.TestDemoVo; +import com.pusong.demo.service.ITestDemoService; import lombok.RequiredArgsConstructor; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestEncryptController.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/TestEncryptController.java similarity index 88% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestEncryptController.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/TestEncryptController.java index 2b6886d..be63386 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestEncryptController.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/TestEncryptController.java @@ -1,8 +1,8 @@ -package org.dromara.demo.controller; +package com.pusong.demo.controller; -import org.dromara.common.core.domain.R; -import org.dromara.demo.domain.TestDemoEncrypt; -import org.dromara.demo.mapper.TestDemoEncryptMapper; +import com.pusong.common.core.domain.R; +import com.pusong.demo.domain.TestDemoEncrypt; +import com.pusong.demo.mapper.TestDemoEncryptMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/TestExcelController.java similarity index 95% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/TestExcelController.java index 3fd124c..d597edc 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/TestExcelController.java @@ -1,15 +1,15 @@ -package org.dromara.demo.controller; +package com.pusong.demo.controller; import cn.hutool.core.collection.CollUtil; +import com.pusong.demo.domain.vo.ExportDemoVo; import jakarta.servlet.http.HttpServletResponse; import lombok.AllArgsConstructor; import lombok.Data; import lombok.RequiredArgsConstructor; -import org.dromara.common.excel.core.ExcelResult; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.demo.domain.vo.ExportDemoVo; -import org.dromara.demo.listener.ExportDemoListener; -import org.dromara.demo.service.IExportExcelService; +import com.pusong.common.excel.core.ExcelResult; +import com.pusong.common.excel.utils.ExcelUtil; +import com.pusong.demo.listener.ExportDemoListener; +import com.pusong.demo.service.IExportExcelService; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/TestI18nController.java similarity index 92% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/TestI18nController.java index 40393c5..cadd134 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/TestI18nController.java @@ -1,7 +1,7 @@ -package org.dromara.demo.controller; +package com.pusong.demo.controller; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.MessageUtils; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.utils.MessageUtils; import lombok.Data; import org.hibernate.validator.constraints.Range; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/TestSensitiveController.java similarity index 85% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/TestSensitiveController.java index eba0552..b6e797e 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/TestSensitiveController.java @@ -1,11 +1,11 @@ -package org.dromara.demo.controller; +package com.pusong.demo.controller; -import org.dromara.common.core.domain.R; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.sensitive.annotation.Sensitive; -import org.dromara.common.sensitive.core.SensitiveStrategy; +import com.pusong.common.core.domain.R; +import com.pusong.common.web.core.BaseController; +import com.pusong.common.sensitive.annotation.Sensitive; +import com.pusong.common.sensitive.core.SensitiveStrategy; import lombok.Data; -import org.dromara.common.sensitive.core.SensitiveService; +import com.pusong.common.sensitive.core.SensitiveService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/TestTreeController.java similarity index 81% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/TestTreeController.java index 5c55205..e4a1a5e 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/TestTreeController.java @@ -1,18 +1,18 @@ -package org.dromara.demo.controller; +package com.pusong.demo.controller; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.core.validate.QueryGroup; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.demo.domain.bo.TestTreeBo; -import org.dromara.demo.domain.vo.TestTreeVo; -import org.dromara.demo.service.ITestTreeService; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.core.validate.EditGroup; +import com.pusong.common.core.validate.QueryGroup; +import com.pusong.common.web.core.BaseController; +import com.pusong.common.excel.utils.ExcelUtil; +import com.pusong.common.idempotent.annotation.RepeatSubmit; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.demo.domain.bo.TestTreeBo; +import com.pusong.demo.domain.vo.TestTreeVo; +import com.pusong.demo.service.ITestTreeService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WeSocketController.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/WeSocketController.java similarity index 78% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WeSocketController.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/WeSocketController.java index 699a5e6..dc9b0c5 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WeSocketController.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/WeSocketController.java @@ -1,8 +1,8 @@ -package org.dromara.demo.controller; +package com.pusong.demo.controller; -import org.dromara.common.core.domain.R; -import org.dromara.common.websocket.dto.WebSocketMessageDto; -import org.dromara.common.websocket.utils.WebSocketUtils; +import com.pusong.common.core.domain.R; +import com.pusong.common.websocket.dto.WebSocketMessageDto; +import com.pusong.common.websocket.utils.WebSocketUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; diff --git a/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/package-info.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/package-info.java new file mode 100644 index 0000000..7e41890 --- /dev/null +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/package-info.java @@ -0,0 +1 @@ +package com.pusong.demo.controller; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/queue/BoundedQueueController.java similarity index 92% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/queue/BoundedQueueController.java index 30ec27f..a716788 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/queue/BoundedQueueController.java @@ -1,11 +1,9 @@ -package org.dromara.demo.controller.queue; +package com.pusong.demo.controller.queue; -import cn.dev33.satoken.annotation.SaIgnore; -import org.dromara.common.core.domain.R; -import org.dromara.common.redis.utils.QueueUtils; +import com.pusong.common.core.domain.R; +import com.pusong.common.redis.utils.QueueUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RBoundedBlockingQueue; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/queue/DelayedQueueController.java similarity index 95% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/queue/DelayedQueueController.java index fb2aade..faf8a74 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/queue/DelayedQueueController.java @@ -1,8 +1,8 @@ -package org.dromara.demo.controller.queue; +package com.pusong.demo.controller.queue; import cn.dev33.satoken.annotation.SaIgnore; -import org.dromara.common.core.domain.R; -import org.dromara.common.redis.utils.QueueUtils; +import com.pusong.common.core.domain.R; +import com.pusong.common.redis.utils.QueueUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityDemo.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/queue/PriorityDemo.java similarity index 91% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityDemo.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/queue/PriorityDemo.java index e2449b5..368b919 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityDemo.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/queue/PriorityDemo.java @@ -1,4 +1,4 @@ -package org.dromara.demo.controller.queue; +package com.pusong.demo.controller.queue; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/queue/PriorityQueueController.java similarity index 95% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/queue/PriorityQueueController.java index 02c7396..99df94e 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/controller/queue/PriorityQueueController.java @@ -1,8 +1,8 @@ -package org.dromara.demo.controller.queue; +package com.pusong.demo.controller.queue; import cn.hutool.core.util.RandomUtil; -import org.dromara.common.core.domain.R; -import org.dromara.common.redis.utils.QueueUtils; +import com.pusong.common.core.domain.R; +import com.pusong.common.redis.utils.QueueUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemo.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/TestDemo.java similarity index 91% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemo.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/TestDemo.java index d3af0c9..249e213 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemo.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/TestDemo.java @@ -1,7 +1,7 @@ -package org.dromara.demo.domain; +package com.pusong.demo.domain; import com.baomidou.mybatisplus.annotation.*; -import org.dromara.common.tenant.core.TenantEntity; +import com.pusong.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/TestDemoEncrypt.java similarity index 93% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/TestDemoEncrypt.java index bdcd596..505ebba 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/TestDemoEncrypt.java @@ -1,8 +1,8 @@ -package org.dromara.demo.domain; +package com.pusong.demo.domain; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.encrypt.annotation.EncryptField; -import org.dromara.common.encrypt.enumd.AlgorithmType; +import com.pusong.common.encrypt.annotation.EncryptField; +import com.pusong.common.encrypt.enumd.AlgorithmType; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestTree.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/TestTree.java similarity index 92% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestTree.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/TestTree.java index fd68253..387eee4 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestTree.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/TestTree.java @@ -1,10 +1,10 @@ -package org.dromara.demo.domain; +package com.pusong.demo.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.Version; -import org.dromara.common.tenant.core.TenantEntity; +import com.pusong.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/bo/TestDemoBo.java similarity index 84% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/bo/TestDemoBo.java index 8134677..e25156c 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/bo/TestDemoBo.java @@ -1,9 +1,9 @@ -package org.dromara.demo.domain.bo; +package com.pusong.demo.domain.bo; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.demo.domain.TestDemo; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.core.validate.EditGroup; +import com.pusong.common.mybatis.core.domain.BaseEntity; +import com.pusong.demo.domain.TestDemo; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoImportVo.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/bo/TestDemoImportVo.java similarity index 96% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoImportVo.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/bo/TestDemoImportVo.java index c066118..d55b3c0 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoImportVo.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/bo/TestDemoImportVo.java @@ -1,4 +1,4 @@ -package org.dromara.demo.domain.bo; +package com.pusong.demo.domain.bo; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/bo/TestTreeBo.java similarity index 82% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/bo/TestTreeBo.java index 1bbac0e..0c32d76 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/bo/TestTreeBo.java @@ -1,9 +1,9 @@ -package org.dromara.demo.domain.bo; +package com.pusong.demo.domain.bo; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.demo.domain.TestTree; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.core.validate.EditGroup; +import com.pusong.common.mybatis.core.domain.BaseEntity; +import com.pusong.demo.domain.TestTree; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/package-info.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/package-info.java new file mode 100644 index 0000000..614efdb --- /dev/null +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/package-info.java @@ -0,0 +1 @@ +package com.pusong.demo.domain; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/ExportDemoVo.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/vo/ExportDemoVo.java similarity index 87% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/ExportDemoVo.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/vo/ExportDemoVo.java index 95fa0d1..3ab828a 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/ExportDemoVo.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/vo/ExportDemoVo.java @@ -1,4 +1,4 @@ -package org.dromara.demo.domain.vo; +package com.pusong.demo.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -7,13 +7,13 @@ import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.common.core.enums.UserStatus; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.annotation.ExcelEnumFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.common.excel.convert.ExcelEnumConvert; +import com.pusong.common.core.enums.UserStatus; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.core.validate.EditGroup; +import com.pusong.common.excel.annotation.ExcelDictFormat; +import com.pusong.common.excel.annotation.ExcelEnumFormat; +import com.pusong.common.excel.convert.ExcelDictConvert; +import com.pusong.common.excel.convert.ExcelEnumConvert; /** * 带有下拉选的Excel导出 diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/vo/TestDemoVo.java similarity index 90% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/vo/TestDemoVo.java index 016c2f7..2ecceab 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/vo/TestDemoVo.java @@ -1,10 +1,10 @@ -package org.dromara.demo.domain.vo; +package com.pusong.demo.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.demo.domain.TestDemo; +import com.pusong.common.translation.annotation.Translation; +import com.pusong.common.translation.constant.TransConstant; +import com.pusong.demo.domain.TestDemo; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/vo/TestTreeVo.java similarity index 93% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/vo/TestTreeVo.java index 58b4bdb..1390ece 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/domain/vo/TestTreeVo.java @@ -1,8 +1,8 @@ -package org.dromara.demo.domain.vo; +package com.pusong.demo.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.demo.domain.TestTree; +import com.pusong.demo.domain.TestTree; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/listener/ExportDemoListener.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/listener/ExportDemoListener.java similarity index 86% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/listener/ExportDemoListener.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/listener/ExportDemoListener.java index 7bd4e1e..3cfe791 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/listener/ExportDemoListener.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/listener/ExportDemoListener.java @@ -1,13 +1,13 @@ -package org.dromara.demo.listener; +package com.pusong.demo.listener; import cn.hutool.core.util.NumberUtil; import com.alibaba.excel.context.AnalysisContext; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.excel.core.DefaultExcelListener; -import org.dromara.common.excel.core.DropDownOptions; -import org.dromara.demo.domain.vo.ExportDemoVo; +import com.pusong.common.core.utils.ValidatorUtils; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.core.validate.EditGroup; +import com.pusong.common.excel.core.DefaultExcelListener; +import com.pusong.common.excel.core.DropDownOptions; +import com.pusong.demo.domain.vo.ExportDemoVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoEncryptMapper.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/mapper/TestDemoEncryptMapper.java similarity index 52% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoEncryptMapper.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/mapper/TestDemoEncryptMapper.java index 601f97a..eeedf67 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoEncryptMapper.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/mapper/TestDemoEncryptMapper.java @@ -1,7 +1,7 @@ -package org.dromara.demo.mapper; +package com.pusong.demo.mapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.demo.domain.TestDemoEncrypt; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.demo.domain.TestDemoEncrypt; /** * 测试加密功能 diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/mapper/TestDemoMapper.java similarity index 83% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/mapper/TestDemoMapper.java index ddf68f2..dd08481 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/mapper/TestDemoMapper.java @@ -1,15 +1,14 @@ -package org.dromara.demo.mapper; +package com.pusong.demo.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.poi.ss.formula.functions.T; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.demo.domain.TestDemo; -import org.dromara.demo.domain.vo.TestDemoVo; +import com.pusong.common.mybatis.annotation.DataColumn; +import com.pusong.common.mybatis.annotation.DataPermission; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.demo.domain.TestDemo; +import com.pusong.demo.domain.vo.TestDemoVo; import org.apache.ibatis.annotations.Param; import java.util.Collection; diff --git a/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/mapper/TestTreeMapper.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/mapper/TestTreeMapper.java new file mode 100644 index 0000000..02f37af --- /dev/null +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/mapper/TestTreeMapper.java @@ -0,0 +1,21 @@ +package com.pusong.demo.mapper; + +import com.pusong.common.mybatis.annotation.DataColumn; +import com.pusong.common.mybatis.annotation.DataPermission; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.demo.domain.TestTree; +import com.pusong.demo.domain.vo.TestTreeVo; + +/** + * 测试树表Mapper接口 + * + * @author Lion Li + * @date 2021-07-26 + */ +@DataPermission({ + @DataColumn(key = "deptName", value = "dept_id"), + @DataColumn(key = "userName", value = "user_id") +}) +public interface TestTreeMapper extends BaseMapperPlus { + +} diff --git a/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/mapper/package-info.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/mapper/package-info.java new file mode 100644 index 0000000..e4c2724 --- /dev/null +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/mapper/package-info.java @@ -0,0 +1 @@ +package com.pusong.demo.mapper; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IExportExcelService.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/service/IExportExcelService.java similarity index 89% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IExportExcelService.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/service/IExportExcelService.java index 4dfa5ef..efe3509 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IExportExcelService.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/service/IExportExcelService.java @@ -1,4 +1,4 @@ -package org.dromara.demo.service; +package com.pusong.demo.service; import jakarta.servlet.http.HttpServletResponse; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/service/ITestDemoService.java similarity index 81% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/service/ITestDemoService.java index bca4192..ece4055 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/service/ITestDemoService.java @@ -1,10 +1,10 @@ -package org.dromara.demo.service; +package com.pusong.demo.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.demo.domain.TestDemo; -import org.dromara.demo.domain.bo.TestDemoBo; -import org.dromara.demo.domain.vo.TestDemoVo; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.demo.domain.TestDemo; +import com.pusong.demo.domain.bo.TestDemoBo; +import com.pusong.demo.domain.vo.TestDemoVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestTreeService.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/service/ITestTreeService.java similarity index 88% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestTreeService.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/service/ITestTreeService.java index 9155201..6733440 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestTreeService.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/service/ITestTreeService.java @@ -1,7 +1,7 @@ -package org.dromara.demo.service; +package com.pusong.demo.service; -import org.dromara.demo.domain.bo.TestTreeBo; -import org.dromara.demo.domain.vo.TestTreeVo; +import com.pusong.demo.domain.bo.TestTreeBo; +import com.pusong.demo.domain.vo.TestTreeVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/service/impl/ExportExcelServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/service/impl/ExportExcelServiceImpl.java index 0240e02..4150cc7 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/service/impl/ExportExcelServiceImpl.java @@ -1,15 +1,15 @@ -package org.dromara.demo.service.impl; +package com.pusong.demo.service.impl; import cn.hutool.core.util.StrUtil; +import com.pusong.demo.domain.vo.ExportDemoVo; import jakarta.servlet.http.HttpServletResponse; import lombok.Data; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.enums.UserStatus; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.excel.core.DropDownOptions; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.demo.domain.vo.ExportDemoVo; -import org.dromara.demo.service.IExportExcelService; +import com.pusong.common.core.enums.UserStatus; +import com.pusong.common.core.utils.StreamUtils; +import com.pusong.common.excel.core.DropDownOptions; +import com.pusong.common.excel.utils.ExcelUtil; +import com.pusong.demo.service.IExportExcelService; import org.springframework.stereotype.Service; import java.util.ArrayList; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/service/impl/TestDemoServiceImpl.java similarity index 87% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/service/impl/TestDemoServiceImpl.java index b3c6ec2..df16454 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/service/impl/TestDemoServiceImpl.java @@ -1,17 +1,17 @@ -package org.dromara.demo.service.impl; +package com.pusong.demo.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.demo.domain.TestDemo; -import org.dromara.demo.domain.bo.TestDemoBo; -import org.dromara.demo.domain.vo.TestDemoVo; -import org.dromara.demo.mapper.TestDemoMapper; -import org.dromara.demo.service.ITestDemoService; +import com.pusong.common.core.utils.MapstructUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.demo.domain.TestDemo; +import com.pusong.demo.domain.bo.TestDemoBo; +import com.pusong.demo.domain.vo.TestDemoVo; +import com.pusong.demo.mapper.TestDemoMapper; +import com.pusong.demo.service.ITestDemoService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/service/impl/TestTreeServiceImpl.java similarity index 86% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java rename to pusong-modules/pusong-demo/src/main/java/com/pusong/demo/service/impl/TestTreeServiceImpl.java index 463934c..66d5947 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/service/impl/TestTreeServiceImpl.java @@ -1,14 +1,14 @@ -package org.dromara.demo.service.impl; +package com.pusong.demo.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.demo.domain.TestTree; -import org.dromara.demo.domain.bo.TestTreeBo; -import org.dromara.demo.domain.vo.TestTreeVo; -import org.dromara.demo.mapper.TestTreeMapper; -import org.dromara.demo.service.ITestTreeService; +import com.pusong.common.core.utils.MapstructUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.demo.domain.TestTree; +import com.pusong.demo.domain.bo.TestTreeBo; +import com.pusong.demo.domain.vo.TestTreeVo; +import com.pusong.demo.mapper.TestTreeMapper; +import com.pusong.demo.service.ITestTreeService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/service/impl/package-info.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/service/impl/package-info.java new file mode 100644 index 0000000..78d9c4b --- /dev/null +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/service/impl/package-info.java @@ -0,0 +1 @@ +package com.pusong.demo.service.impl; diff --git a/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/service/package-info.java b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/service/package-info.java new file mode 100644 index 0000000..af7e650 --- /dev/null +++ b/pusong-modules/pusong-demo/src/main/java/com/pusong/demo/service/package-info.java @@ -0,0 +1 @@ +package com.pusong.demo.service; diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/excel/单列表.xlsx b/pusong-modules/pusong-demo/src/main/resources/excel/单列表.xlsx similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/resources/excel/单列表.xlsx rename to pusong-modules/pusong-demo/src/main/resources/excel/单列表.xlsx diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/excel/多sheet列表.xlsx b/pusong-modules/pusong-demo/src/main/resources/excel/多sheet列表.xlsx similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/resources/excel/多sheet列表.xlsx rename to pusong-modules/pusong-demo/src/main/resources/excel/多sheet列表.xlsx diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/excel/多列表.xlsx b/pusong-modules/pusong-demo/src/main/resources/excel/多列表.xlsx similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/resources/excel/多列表.xlsx rename to pusong-modules/pusong-demo/src/main/resources/excel/多列表.xlsx diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml b/pusong-modules/pusong-demo/src/main/resources/mapper/demo/TestDemoMapper.xml similarity index 61% rename from ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml rename to pusong-modules/pusong-demo/src/main/resources/mapper/demo/TestDemoMapper.xml index dbf89a3..e17daf8 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml +++ b/pusong-modules/pusong-demo/src/main/resources/mapper/demo/TestDemoMapper.xml @@ -2,9 +2,9 @@ - + - SELECT * FROM test_demo ${ew.customSqlSegment} diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml b/pusong-modules/pusong-demo/src/main/resources/mapper/demo/TestTreeMapper.xml similarity index 72% rename from ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml rename to pusong-modules/pusong-demo/src/main/resources/mapper/demo/TestTreeMapper.xml index d7975ec..1fac94e 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml +++ b/pusong-modules/pusong-demo/src/main/resources/mapper/demo/TestTreeMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/package-info.md b/pusong-modules/pusong-demo/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/resources/mapper/package-info.md rename to pusong-modules/pusong-demo/src/main/resources/mapper/package-info.md diff --git a/ruoyi-modules/ruoyi-generator/pom.xml b/pusong-modules/pusong-generator/pom.xml similarity index 60% rename from ruoyi-modules/ruoyi-generator/pom.xml rename to pusong-modules/pusong-generator/pom.xml index de34f69..fb47474 100644 --- a/ruoyi-modules/ruoyi-generator/pom.xml +++ b/pusong-modules/pusong-generator/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-modules + com.pusong + pusong-modules ${revision} 4.0.0 - ruoyi-generator + pusong-generator generator 代码生成 @@ -18,28 +18,28 @@ - org.dromara - ruoyi-common-core + com.pusong + pusong-common-core - org.dromara - ruoyi-common-doc + com.pusong + pusong-common-doc - org.dromara - ruoyi-common-mybatis + com.pusong + pusong-common-mybatis - org.dromara - ruoyi-common-web + com.pusong + pusong-common-web - org.dromara - ruoyi-common-log + com.pusong + pusong-common-log diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/GenConfig.java b/pusong-modules/pusong-generator/src/main/java/com/pusong/generator/config/GenConfig.java similarity index 97% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/GenConfig.java rename to pusong-modules/pusong-generator/src/main/java/com/pusong/generator/config/GenConfig.java index b29f8c9..f5a6a93 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/GenConfig.java +++ b/pusong-modules/pusong-generator/src/main/java/com/pusong/generator/config/GenConfig.java @@ -1,4 +1,4 @@ -package org.dromara.generator.config; +package com.pusong.generator.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java b/pusong-modules/pusong-generator/src/main/java/com/pusong/generator/constant/GenConstants.java similarity index 98% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java rename to pusong-modules/pusong-generator/src/main/java/com/pusong/generator/constant/GenConstants.java index c345f22..e31f94e 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java +++ b/pusong-modules/pusong-generator/src/main/java/com/pusong/generator/constant/GenConstants.java @@ -1,4 +1,4 @@ -package org.dromara.generator.constant; +package com.pusong.generator.constant; /** * 代码生成通用常量 diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java b/pusong-modules/pusong-generator/src/main/java/com/pusong/generator/controller/GenController.java similarity index 92% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java rename to pusong-modules/pusong-generator/src/main/java/com/pusong/generator/controller/GenController.java index e3d4c08..46770e8 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java +++ b/pusong-modules/pusong-generator/src/main/java/com/pusong/generator/controller/GenController.java @@ -1,18 +1,18 @@ -package org.dromara.generator.controller; +package com.pusong.generator.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.convert.Convert; import cn.hutool.core.io.IoUtil; -import org.dromara.common.core.domain.R; -import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.generator.domain.GenTable; -import org.dromara.generator.domain.GenTableColumn; -import org.dromara.generator.service.IGenTableService; +import com.pusong.common.core.domain.R; +import com.pusong.common.mybatis.helper.DataBaseHelper; +import com.pusong.common.web.core.BaseController; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.generator.domain.GenTable; +import com.pusong.generator.domain.GenTableColumn; +import com.pusong.generator.service.IGenTableService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java b/pusong-modules/pusong-generator/src/main/java/com/pusong/generator/domain/GenTable.java similarity index 95% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java rename to pusong-modules/pusong-generator/src/main/java/com/pusong/generator/domain/GenTable.java index f792ceb..6cf64ed 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java +++ b/pusong-modules/pusong-generator/src/main/java/com/pusong/generator/domain/GenTable.java @@ -1,12 +1,12 @@ -package org.dromara.generator.domain; +package com.pusong.generator.domain; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.generator.constant.GenConstants; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.mybatis.core.domain.BaseEntity; +import com.pusong.generator.constant.GenConstants; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java b/pusong-modules/pusong-generator/src/main/java/com/pusong/generator/domain/GenTableColumn.java similarity index 97% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java rename to pusong-modules/pusong-generator/src/main/java/com/pusong/generator/domain/GenTableColumn.java index ebdb993..cc5872c 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java +++ b/pusong-modules/pusong-generator/src/main/java/com/pusong/generator/domain/GenTableColumn.java @@ -1,11 +1,11 @@ -package org.dromara.generator.domain; +package com.pusong.generator.domain; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.ibatis.type.JdbcType; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java b/pusong-modules/pusong-generator/src/main/java/com/pusong/generator/mapper/GenTableColumnMapper.java similarity index 82% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java rename to pusong-modules/pusong-generator/src/main/java/com/pusong/generator/mapper/GenTableColumnMapper.java index f38d39c..bf9493f 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java +++ b/pusong-modules/pusong-generator/src/main/java/com/pusong/generator/mapper/GenTableColumnMapper.java @@ -1,10 +1,10 @@ -package org.dromara.generator.mapper; +package com.pusong.generator.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; +import com.pusong.generator.domain.GenTableColumn; import org.apache.ibatis.annotations.Param; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.generator.domain.GenTableColumn; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; import java.util.List; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java b/pusong-modules/pusong-generator/src/main/java/com/pusong/generator/mapper/GenTableMapper.java similarity index 90% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java rename to pusong-modules/pusong-generator/src/main/java/com/pusong/generator/mapper/GenTableMapper.java index c2ff7b6..feb8889 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java +++ b/pusong-modules/pusong-generator/src/main/java/com/pusong/generator/mapper/GenTableMapper.java @@ -1,10 +1,10 @@ -package org.dromara.generator.mapper; +package com.pusong.generator.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.generator.domain.GenTable; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.generator.domain.GenTable; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java b/pusong-modules/pusong-generator/src/main/java/com/pusong/generator/service/GenTableServiceImpl.java similarity index 94% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java rename to pusong-modules/pusong-generator/src/main/java/com/pusong/generator/service/GenTableServiceImpl.java index d418815..8e12c80 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java +++ b/pusong-modules/pusong-generator/src/main/java/com/pusong/generator/service/GenTableServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.generator.service; +package com.pusong.generator.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.IoUtil; @@ -11,28 +11,28 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.pusong.generator.domain.GenTableColumn; +import com.pusong.generator.util.GenUtils; +import com.pusong.generator.util.VelocityUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.file.FileUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.generator.constant.GenConstants; -import org.dromara.generator.domain.GenTable; -import org.dromara.generator.domain.GenTableColumn; -import org.dromara.generator.mapper.GenTableColumnMapper; -import org.dromara.generator.mapper.GenTableMapper; -import org.dromara.generator.util.GenUtils; -import org.dromara.generator.util.VelocityInitializer; -import org.dromara.generator.util.VelocityUtils; +import com.pusong.common.core.constant.Constants; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.utils.StreamUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.core.utils.file.FileUtils; +import com.pusong.common.json.utils.JsonUtils; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.satoken.utils.LoginHelper; +import com.pusong.generator.constant.GenConstants; +import com.pusong.generator.domain.GenTable; +import com.pusong.generator.mapper.GenTableColumnMapper; +import com.pusong.generator.mapper.GenTableMapper; +import com.pusong.generator.util.VelocityInitializer; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java b/pusong-modules/pusong-generator/src/main/java/com/pusong/generator/service/IGenTableService.java similarity index 91% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java rename to pusong-modules/pusong-generator/src/main/java/com/pusong/generator/service/IGenTableService.java index 2a2fb82..420161e 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java +++ b/pusong-modules/pusong-generator/src/main/java/com/pusong/generator/service/IGenTableService.java @@ -1,9 +1,9 @@ -package org.dromara.generator.service; +package com.pusong.generator.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.generator.domain.GenTable; -import org.dromara.generator.domain.GenTableColumn; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.generator.domain.GenTable; +import com.pusong.generator.domain.GenTableColumn; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java b/pusong-modules/pusong-generator/src/main/java/com/pusong/generator/util/GenUtils.java similarity index 96% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java rename to pusong-modules/pusong-generator/src/main/java/com/pusong/generator/util/GenUtils.java index 2e6b37b..98e9bf1 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java +++ b/pusong-modules/pusong-generator/src/main/java/com/pusong/generator/util/GenUtils.java @@ -1,13 +1,13 @@ -package org.dromara.generator.util; +package com.pusong.generator.util; +import com.pusong.generator.config.GenConfig; +import com.pusong.generator.domain.GenTableColumn; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.commons.lang3.RegExUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.generator.config.GenConfig; -import org.dromara.generator.constant.GenConstants; -import org.dromara.generator.domain.GenTable; -import org.dromara.generator.domain.GenTableColumn; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.generator.constant.GenConstants; +import com.pusong.generator.domain.GenTable; import java.util.Arrays; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityInitializer.java b/pusong-modules/pusong-generator/src/main/java/com/pusong/generator/util/VelocityInitializer.java similarity index 90% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityInitializer.java rename to pusong-modules/pusong-generator/src/main/java/com/pusong/generator/util/VelocityInitializer.java index 09e0121..498a52e 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityInitializer.java +++ b/pusong-modules/pusong-generator/src/main/java/com/pusong/generator/util/VelocityInitializer.java @@ -1,6 +1,6 @@ -package org.dromara.generator.util; +package com.pusong.generator.util; -import org.dromara.common.core.constant.Constants; +import com.pusong.common.core.constant.Constants; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.velocity.app.Velocity; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java b/pusong-modules/pusong-generator/src/main/java/com/pusong/generator/util/VelocityUtils.java similarity index 97% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java rename to pusong-modules/pusong-generator/src/main/java/com/pusong/generator/util/VelocityUtils.java index f5db391..2f29259 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java +++ b/pusong-modules/pusong-generator/src/main/java/com/pusong/generator/util/VelocityUtils.java @@ -1,15 +1,15 @@ -package org.dromara.generator.util; +package com.pusong.generator.util; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.Dict; -import org.dromara.generator.constant.GenConstants; -import org.dromara.common.core.utils.DateUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.generator.domain.GenTable; -import org.dromara.generator.domain.GenTableColumn; +import com.pusong.generator.domain.GenTableColumn; +import com.pusong.generator.constant.GenConstants; +import com.pusong.common.core.utils.DateUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.json.utils.JsonUtils; +import com.pusong.common.mybatis.helper.DataBaseHelper; +import com.pusong.generator.domain.GenTable; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.velocity.VelocityContext; diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml b/pusong-modules/pusong-generator/src/main/resources/generator.yml similarity index 89% rename from ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml rename to pusong-modules/pusong-generator/src/main/resources/generator.yml index d779d97..b1f3b27 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml +++ b/pusong-modules/pusong-generator/src/main/resources/generator.yml @@ -3,7 +3,7 @@ gen: # 作者 author: Lion Li # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: org.dromara.system + packageName: com.pusong.system # 自动去除表前缀，默认是false autoRemovePre: false # 表前缀（生成类名不会包含表前缀，多个用逗号分隔） diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/pusong-modules/pusong-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml similarity index 97% rename from ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml rename to pusong-modules/pusong-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml index 123d51a..9e1695f 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/pusong-modules/pusong-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -2,9 +2,9 @@ - + - + - + select table_name, table_comment, create_time, update_time from information_schema.tables where table_schema = (select database()) @@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by create_time desc - + select lower(dt.table_name) as table_name, dtc.comments as table_comment, uo.created as create_time, uo.last_ddl_time as update_time from user_tables dt, user_tab_comments dtc, user_objects uo where dt.table_name = dtc.table_name diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/package-info.md b/pusong-modules/pusong-generator/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/mapper/package-info.md rename to pusong-modules/pusong-generator/src/main/resources/mapper/package-info.md diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm b/pusong-modules/pusong-generator/src/main/resources/vm/java/bo.java.vm similarity index 88% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm rename to pusong-modules/pusong-generator/src/main/resources/vm/java/bo.java.vm index 511d37c..d4a87ba 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm +++ b/pusong-modules/pusong-generator/src/main/resources/vm/java/bo.java.vm @@ -1,9 +1,7 @@ package ${packageName}.domain.bo; import ${packageName}.domain.${ClassName}; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import com.pusong.common.mybatis.core.domain.BaseEntity; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/pusong-modules/pusong-generator/src/main/resources/vm/java/controller.java.vm similarity index 87% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm rename to pusong-modules/pusong-generator/src/main/resources/vm/java/controller.java.vm index 6438971..028bb12 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm +++ b/pusong-modules/pusong-generator/src/main/resources/vm/java/controller.java.vm @@ -8,20 +8,20 @@ import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; +import com.pusong.common.idempotent.annotation.RepeatSubmit; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.web.core.BaseController; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.core.validate.EditGroup; +import com.pusong.common.log.enums.BusinessType; +import utils.com.pusong.common.excel.ExcelUtil; import ${packageName}.domain.vo.${ClassName}Vo; import ${packageName}.domain.bo.${ClassName}Bo; import ${packageName}.service.I${ClassName}Service; #if($table.crud) -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.mybatis.core.page.TableDataInfo; #elseif($table.tree) #end diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/pusong-modules/pusong-generator/src/main/resources/vm/java/domain.java.vm similarity index 90% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm rename to pusong-modules/pusong-generator/src/main/resources/vm/java/domain.java.vm index 205fb73..64f40be 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm +++ b/pusong-modules/pusong-generator/src/main/resources/vm/java/domain.java.vm @@ -6,9 +6,8 @@ package ${packageName}.domain; #end #end #if($IsTenant==1) -import org.dromara.common.tenant.core.TenantEntity; +import com.pusong.common.tenant.core.TenantEntity; #else -import org.dromara.common.mybatis.core.domain.BaseEntity; #end import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm b/pusong-modules/pusong-generator/src/main/resources/vm/java/mapper.java.vm similarity index 82% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm rename to pusong-modules/pusong-generator/src/main/resources/vm/java/mapper.java.vm index 0922401..7cc77fc 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm +++ b/pusong-modules/pusong-generator/src/main/resources/vm/java/mapper.java.vm @@ -2,7 +2,7 @@ package ${packageName}.mapper; import ${packageName}.domain.${ClassName}; import ${packageName}.domain.vo.${ClassName}Vo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; /** * ${functionName}Mapper接口 diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/pusong-modules/pusong-generator/src/main/resources/vm/java/service.java.vm similarity index 93% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm rename to pusong-modules/pusong-generator/src/main/resources/vm/java/service.java.vm index 4db9030..3a9210d 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm +++ b/pusong-modules/pusong-generator/src/main/resources/vm/java/service.java.vm @@ -3,8 +3,8 @@ package ${packageName}.service; import ${packageName}.domain.vo.${ClassName}Vo; import ${packageName}.domain.bo.${ClassName}Bo; #if($table.crud) -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.mybatis.core.page.PageQuery; #end import java.util.Collection; diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/pusong-modules/pusong-generator/src/main/resources/vm/java/serviceImpl.java.vm similarity index 95% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm rename to pusong-modules/pusong-generator/src/main/resources/vm/java/serviceImpl.java.vm index e7236fd..dcee0b2 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/pusong-modules/pusong-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -1,10 +1,9 @@ package ${packageName}.service.impl; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -#if($table.crud) -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.pusong.common.core.utils.MapstructUtils; + #if($table.crud) +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; #end import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm b/pusong-modules/pusong-generator/src/main/resources/vm/java/vo.java.vm similarity index 92% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm rename to pusong-modules/pusong-generator/src/main/resources/vm/java/vo.java.vm index f99a2ed..709c337 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm +++ b/pusong-modules/pusong-generator/src/main/resources/vm/java/vo.java.vm @@ -6,8 +6,8 @@ import ${import}; import ${packageName}.domain.${ClassName}; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; +import annotation.com.pusong.common.excel.ExcelDictFormat; +import convert.com.pusong.common.excel.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/oracle/sql.vm b/pusong-modules/pusong-generator/src/main/resources/vm/sql/oracle/sql.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/oracle/sql.vm rename to pusong-modules/pusong-generator/src/main/resources/vm/sql/oracle/sql.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/postgres/sql.vm b/pusong-modules/pusong-generator/src/main/resources/vm/sql/postgres/sql.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/postgres/sql.vm rename to pusong-modules/pusong-generator/src/main/resources/vm/sql/postgres/sql.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sql.vm b/pusong-modules/pusong-generator/src/main/resources/vm/sql/sql.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sql.vm rename to pusong-modules/pusong-generator/src/main/resources/vm/sql/sql.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sqlserver/sql.vm b/pusong-modules/pusong-generator/src/main/resources/vm/sql/sqlserver/sql.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sqlserver/sql.vm rename to pusong-modules/pusong-generator/src/main/resources/vm/sql/sqlserver/sql.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm b/pusong-modules/pusong-generator/src/main/resources/vm/ts/api.ts.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm rename to pusong-modules/pusong-generator/src/main/resources/vm/ts/api.ts.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/types.ts.vm b/pusong-modules/pusong-generator/src/main/resources/vm/ts/types.ts.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/types.ts.vm rename to pusong-modules/pusong-generator/src/main/resources/vm/ts/types.ts.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/pusong-modules/pusong-generator/src/main/resources/vm/vue/index-tree.vue.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm rename to pusong-modules/pusong-generator/src/main/resources/vm/vue/index-tree.vue.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/pusong-modules/pusong-generator/src/main/resources/vm/vue/index.vue.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm rename to pusong-modules/pusong-generator/src/main/resources/vm/vue/index.vue.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/pusong-modules/pusong-generator/src/main/resources/vm/xml/mapper.xml.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm rename to pusong-modules/pusong-generator/src/main/resources/vm/xml/mapper.xml.vm diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/pusong-modules/pusong-job/pom.xml similarity index 66% rename from ruoyi-modules/ruoyi-job/pom.xml rename to pusong-modules/pusong-job/pom.xml index 2431a1c..a315c17 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/pusong-modules/pusong-job/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-modules + com.pusong + pusong-modules ${revision} 4.0.0 jar - ruoyi-job + pusong-job 任务调度 @@ -19,13 +19,13 @@ - org.dromara - ruoyi-common-json + com.pusong + pusong-common-json - org.dromara - ruoyi-common-job + com.pusong + pusong-common-job diff --git a/pusong-modules/pusong-job/src/main/java/com/pusong/job/snailjob/package-info.java b/pusong-modules/pusong-job/src/main/java/com/pusong/job/snailjob/package-info.java new file mode 100644 index 0000000..8ce8e85 --- /dev/null +++ b/pusong-modules/pusong-job/src/main/java/com/pusong/job/snailjob/package-info.java @@ -0,0 +1 @@ +package com.pusong.job.snailjob; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestAnnoJobExecutor.java b/pusong-modules/pusong-job/src/main/java/com/pusong/job/snailjob/snailjob/TestAnnoJobExecutor.java similarity index 94% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestAnnoJobExecutor.java rename to pusong-modules/pusong-job/src/main/java/com/pusong/job/snailjob/snailjob/TestAnnoJobExecutor.java index 5bea9da..7e3b823 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestAnnoJobExecutor.java +++ b/pusong-modules/pusong-job/src/main/java/com/pusong/job/snailjob/snailjob/TestAnnoJobExecutor.java @@ -1,4 +1,4 @@ -package org.dromara.job.snailjob; +package com.pusong.job.snailjob.snailjob; import com.aizuda.snailjob.client.job.core.annotation.JobExecutor; import com.aizuda.snailjob.client.job.core.dto.JobArgs; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestClassJobExecutor.java b/pusong-modules/pusong-job/src/main/java/com/pusong/job/snailjob/snailjob/TestClassJobExecutor.java similarity index 92% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestClassJobExecutor.java rename to pusong-modules/pusong-job/src/main/java/com/pusong/job/snailjob/snailjob/TestClassJobExecutor.java index 6f7c21f..41ca067 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestClassJobExecutor.java +++ b/pusong-modules/pusong-job/src/main/java/com/pusong/job/snailjob/snailjob/TestClassJobExecutor.java @@ -1,4 +1,4 @@ -package org.dromara.job.snailjob; +package com.pusong.job.snailjob.snailjob; import com.aizuda.snailjob.client.job.core.dto.JobArgs; import com.aizuda.snailjob.client.job.core.executor.AbstractJobExecutor; diff --git a/pusong-modules/pusong-system/pom.xml b/pusong-modules/pusong-system/pom.xml new file mode 100644 index 0000000..e4f6772 --- /dev/null +++ b/pusong-modules/pusong-system/pom.xml @@ -0,0 +1,100 @@ + + + + com.pusong + pusong-modules + ${revision} + + 4.0.0 + + pusong-system + + + system系统模块 + + + + + + com.pusong + pusong-common-core + + + + com.pusong + pusong-common-doc + + + + com.pusong + pusong-common-mybatis + + + + com.pusong + pusong-common-translation + + + + + com.pusong + pusong-common-oss + + + + com.pusong + pusong-common-log + + + + + com.pusong + pusong-common-excel + + + + + com.pusong + pusong-common-sms + + + + com.pusong + pusong-common-tenant + + + + com.pusong + pusong-common-security + + + + com.pusong + pusong-common-web + + + + com.pusong + pusong-common-idempotent + + + + com.pusong + pusong-common-sensitive + + + + com.pusong + pusong-common-encrypt + + + + com.pusong + pusong-common-websocket + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/monitor/CacheController.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/monitor/CacheController.java index 6b7499a..cf2b3c2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/monitor/CacheController.java @@ -1,9 +1,9 @@ -package org.dromara.system.controller.monitor; +package com.pusong.system.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.system.domain.vo.CacheListInfoVo; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.system.domain.vo.CacheListInfoVo; import lombok.RequiredArgsConstructor; import org.redisson.spring.data.connection.RedissonConnectionFactory; import org.springframework.data.redis.connection.RedisConnection; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/monitor/SysLogininforController.java similarity index 78% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/monitor/SysLogininforController.java index 18e32d8..4c95a63 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/monitor/SysLogininforController.java @@ -1,18 +1,18 @@ -package org.dromara.system.controller.monitor; +package com.pusong.system.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysLogininforBo; -import org.dromara.system.domain.vo.SysLogininforVo; -import org.dromara.system.service.ISysLogininforService; +import com.pusong.common.core.constant.GlobalConstants; +import com.pusong.common.core.domain.R; +import com.pusong.common.excel.utils.ExcelUtil; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.redis.utils.RedisUtils; +import com.pusong.common.web.core.BaseController; +import com.pusong.system.domain.bo.SysLogininforBo; +import com.pusong.system.domain.vo.SysLogininforVo; +import com.pusong.system.service.ISysLogininforService; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/monitor/SysOperlogController.java similarity index 77% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/monitor/SysOperlogController.java index 575aba6..e33388b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/monitor/SysOperlogController.java @@ -1,16 +1,16 @@ -package org.dromara.system.controller.monitor; +package com.pusong.system.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.system.domain.bo.SysOperLogBo; -import org.dromara.system.domain.vo.SysOperLogVo; -import org.dromara.system.service.ISysOperLogService; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.web.core.BaseController; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.core.domain.R; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.common.excel.utils.ExcelUtil; +import com.pusong.system.domain.bo.SysOperLogBo; +import com.pusong.system.domain.vo.SysOperLogVo; +import com.pusong.system.service.ISysOperLogService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/monitor/SysUserOnlineController.java similarity index 88% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/monitor/SysUserOnlineController.java index 9b08c2d..639a8f6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/monitor/SysUserOnlineController.java @@ -1,21 +1,21 @@ -package org.dromara.system.controller.monitor; +package com.pusong.system.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.bean.BeanUtil; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.domain.dto.UserOnlineDTO; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.SysUserOnline; +import com.pusong.common.core.constant.CacheConstants; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.domain.dto.UserOnlineDTO; +import com.pusong.common.core.utils.StreamUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.redis.utils.RedisUtils; +import com.pusong.common.web.core.BaseController; +import com.pusong.system.domain.SysUserOnline; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysClientController.java similarity index 81% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysClientController.java index 13be4a4..5db5ba3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysClientController.java @@ -1,4 +1,4 @@ -package org.dromara.system.controller.system; +package com.pusong.system.controller.system; import java.util.List; @@ -8,19 +8,19 @@ import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.bo.SysClientBo; -import org.dromara.system.service.ISysClientService; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.idempotent.annotation.RepeatSubmit; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.web.core.BaseController; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.core.validate.EditGroup; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.common.excel.utils.ExcelUtil; +import com.pusong.system.domain.vo.SysClientVo; +import com.pusong.system.domain.bo.SysClientBo; +import com.pusong.system.service.ISysClientService; +import com.pusong.common.mybatis.core.page.TableDataInfo; /** * 客户端管理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysConfigController.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysConfigController.java index c73c386..d4727dd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysConfigController.java @@ -1,16 +1,16 @@ -package org.dromara.system.controller.system; +package com.pusong.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysConfigBo; -import org.dromara.system.domain.vo.SysConfigVo; -import org.dromara.system.service.ISysConfigService; +import com.pusong.common.core.domain.R; +import com.pusong.common.excel.utils.ExcelUtil; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.web.core.BaseController; +import com.pusong.system.domain.bo.SysConfigBo; +import com.pusong.system.domain.vo.SysConfigVo; +import com.pusong.system.service.ISysConfigService; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysDeptController.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysDeptController.java index 98b76e4..252dad9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysDeptController.java @@ -1,17 +1,17 @@ -package org.dromara.system.controller.system; +package com.pusong.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.convert.Convert; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysDeptBo; -import org.dromara.system.domain.vo.SysDeptVo; -import org.dromara.system.service.ISysDeptService; +import com.pusong.common.core.constant.UserConstants; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.common.web.core.BaseController; +import com.pusong.system.domain.bo.SysDeptBo; +import com.pusong.system.domain.vo.SysDeptVo; +import com.pusong.system.service.ISysDeptService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysDictDataController.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysDictDataController.java index 5752751..b61e144 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysDictDataController.java @@ -1,18 +1,18 @@ -package org.dromara.system.controller.system; +package com.pusong.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.system.domain.bo.SysDictDataBo; -import org.dromara.system.domain.vo.SysDictDataVo; -import org.dromara.system.service.ISysDictDataService; -import org.dromara.system.service.ISysDictTypeService; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.web.core.BaseController; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.core.domain.R; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.common.excel.utils.ExcelUtil; +import com.pusong.system.domain.bo.SysDictDataBo; +import com.pusong.system.domain.vo.SysDictDataVo; +import com.pusong.system.service.ISysDictDataService; +import com.pusong.system.service.ISysDictTypeService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysDictTypeController.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysDictTypeController.java index 67c1f51..81c80ea 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysDictTypeController.java @@ -1,16 +1,16 @@ -package org.dromara.system.controller.system; +package com.pusong.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysDictTypeBo; -import org.dromara.system.domain.vo.SysDictTypeVo; -import org.dromara.system.service.ISysDictTypeService; +import com.pusong.common.core.domain.R; +import com.pusong.common.excel.utils.ExcelUtil; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.web.core.BaseController; +import com.pusong.system.domain.bo.SysDictTypeBo; +import com.pusong.system.domain.vo.SysDictTypeVo; +import com.pusong.system.service.ISysDictTypeService; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysMenuController.java similarity index 88% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysMenuController.java index e5daa0e..408bc84 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysMenuController.java @@ -1,23 +1,23 @@ -package org.dromara.system.controller.system; +package com.pusong.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckRole; import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.lang.tree.Tree; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.SysMenu; -import org.dromara.system.domain.bo.SysMenuBo; -import org.dromara.system.domain.vo.MenuTreeSelectVo; -import org.dromara.system.domain.vo.RouterVo; -import org.dromara.system.domain.vo.SysMenuVo; -import org.dromara.system.service.ISysMenuService; +import com.pusong.common.core.constant.TenantConstants; +import com.pusong.common.core.constant.UserConstants; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.common.satoken.utils.LoginHelper; +import com.pusong.common.web.core.BaseController; +import com.pusong.system.domain.SysMenu; +import com.pusong.system.domain.bo.SysMenuBo; +import com.pusong.system.domain.vo.MenuTreeSelectVo; +import com.pusong.system.domain.vo.RouterVo; +import com.pusong.system.domain.vo.SysMenuVo; +import com.pusong.system.service.ISysMenuService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysNoticeController.java similarity index 79% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysNoticeController.java index a0aa26e..77060a1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysNoticeController.java @@ -1,18 +1,18 @@ -package org.dromara.system.controller.system; +package com.pusong.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.service.DictService; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.websocket.utils.WebSocketUtils; -import org.dromara.system.domain.bo.SysNoticeBo; -import org.dromara.system.domain.vo.SysNoticeVo; -import org.dromara.system.service.ISysNoticeService; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.service.DictService; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.web.core.BaseController; +import com.pusong.common.websocket.utils.WebSocketUtils; +import com.pusong.system.domain.bo.SysNoticeBo; +import com.pusong.system.domain.vo.SysNoticeVo; +import com.pusong.system.service.ISysNoticeService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysOssConfigController.java similarity index 80% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysOssConfigController.java index 24ddaff..a2fa7b0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysOssConfigController.java @@ -1,19 +1,19 @@ -package org.dromara.system.controller.system; +package com.pusong.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.core.validate.QueryGroup; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysOssConfigBo; -import org.dromara.system.domain.vo.SysOssConfigVo; -import org.dromara.system.service.ISysOssConfigService; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.core.validate.EditGroup; +import com.pusong.common.core.validate.QueryGroup; +import com.pusong.common.web.core.BaseController; +import com.pusong.common.idempotent.annotation.RepeatSubmit; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.system.domain.bo.SysOssConfigBo; +import com.pusong.system.domain.vo.SysOssConfigVo; +import com.pusong.system.service.ISysOssConfigService; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysOssController.java similarity index 83% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysOssController.java index 73ada3b..1387209 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysOssController.java @@ -1,19 +1,19 @@ -package org.dromara.system.controller.system; +package com.pusong.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.QueryGroup; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysOssBo; -import org.dromara.system.domain.vo.SysOssUploadVo; -import org.dromara.system.domain.vo.SysOssVo; -import org.dromara.system.service.ISysOssService; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.validate.QueryGroup; +import com.pusong.common.web.core.BaseController; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.system.domain.bo.SysOssBo; +import com.pusong.system.domain.vo.SysOssUploadVo; +import com.pusong.system.domain.vo.SysOssVo; +import com.pusong.system.service.ISysOssService; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import lombok.RequiredArgsConstructor; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysPostController.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysPostController.java index 782bcfc..136babc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysPostController.java @@ -1,20 +1,20 @@ -package org.dromara.system.controller.system; +package com.pusong.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysPostBo; -import org.dromara.system.domain.vo.SysPostVo; -import org.dromara.system.service.ISysPostService; +import com.pusong.common.core.constant.UserConstants; +import com.pusong.common.core.domain.R; +import com.pusong.common.excel.utils.ExcelUtil; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.web.core.BaseController; +import com.pusong.system.domain.bo.SysPostBo; +import com.pusong.system.domain.vo.SysPostVo; +import com.pusong.system.service.ISysPostService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysProfileController.java similarity index 81% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysProfileController.java index 559e1d5..16c44cb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysProfileController.java @@ -1,27 +1,27 @@ -package org.dromara.system.controller.system; +package com.pusong.system.controller.system; import cn.dev33.satoken.secure.BCrypt; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.io.FileUtil; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.file.MimeTypeUtils; -import org.dromara.common.encrypt.annotation.ApiEncrypt; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.bo.SysUserPasswordBo; -import org.dromara.system.domain.bo.SysUserProfileBo; -import org.dromara.system.domain.vo.AvatarVo; -import org.dromara.system.domain.vo.ProfileVo; -import org.dromara.system.domain.vo.SysOssVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.service.ISysOssService; -import org.dromara.system.service.ISysUserService; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.core.utils.file.MimeTypeUtils; +import com.pusong.common.encrypt.annotation.ApiEncrypt; +import com.pusong.common.idempotent.annotation.RepeatSubmit; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.common.satoken.utils.LoginHelper; +import com.pusong.common.web.core.BaseController; +import com.pusong.system.domain.bo.SysUserBo; +import com.pusong.system.domain.bo.SysUserPasswordBo; +import com.pusong.system.domain.bo.SysUserProfileBo; +import com.pusong.system.domain.vo.AvatarVo; +import com.pusong.system.domain.vo.ProfileVo; +import com.pusong.system.domain.vo.SysOssVo; +import com.pusong.system.domain.vo.SysUserVo; +import com.pusong.system.service.ISysOssService; +import com.pusong.system.service.ISysUserService; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysRoleController.java similarity index 88% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysRoleController.java index d4a9dc8..a99cdf6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysRoleController.java @@ -1,25 +1,25 @@ -package org.dromara.system.controller.system; +package com.pusong.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.SysUserRole; -import org.dromara.system.domain.bo.SysDeptBo; -import org.dromara.system.domain.bo.SysRoleBo; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.DeptTreeSelectVo; -import org.dromara.system.domain.vo.SysRoleVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.service.ISysDeptService; -import org.dromara.system.service.ISysRoleService; -import org.dromara.system.service.ISysUserService; +import com.pusong.common.core.domain.R; +import com.pusong.common.excel.utils.ExcelUtil; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.web.core.BaseController; +import com.pusong.system.domain.SysUserRole; +import com.pusong.system.domain.bo.SysDeptBo; +import com.pusong.system.domain.bo.SysRoleBo; +import com.pusong.system.domain.bo.SysUserBo; +import com.pusong.system.domain.vo.DeptTreeSelectVo; +import com.pusong.system.domain.vo.SysRoleVo; +import com.pusong.system.domain.vo.SysUserVo; +import com.pusong.system.service.ISysDeptService; +import com.pusong.system.service.ISysRoleService; +import com.pusong.system.service.ISysUserService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysSocialController.java similarity index 72% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysSocialController.java index b0281cf..0b8a28a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysSocialController.java @@ -1,11 +1,11 @@ -package org.dromara.system.controller.system; +package com.pusong.system.controller.system; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.vo.SysSocialVo; -import org.dromara.system.service.ISysSocialService; +import com.pusong.common.core.domain.R; +import com.pusong.common.satoken.utils.LoginHelper; +import com.pusong.common.web.core.BaseController; +import com.pusong.system.domain.vo.SysSocialVo; +import com.pusong.system.service.ISysSocialService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysTenantController.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysTenantController.java index 60be68a..02f1fcb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysTenantController.java @@ -1,4 +1,4 @@ -package org.dromara.system.controller.system; +package com.pusong.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckRole; @@ -8,22 +8,22 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.encrypt.annotation.ApiEncrypt; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysTenantBo; -import org.dromara.system.domain.vo.SysTenantVo; -import org.dromara.system.service.ISysTenantService; +import com.pusong.common.core.constant.TenantConstants; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.core.validate.EditGroup; +import com.pusong.common.encrypt.annotation.ApiEncrypt; +import com.pusong.common.excel.utils.ExcelUtil; +import com.pusong.common.idempotent.annotation.RepeatSubmit; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.tenant.helper.TenantHelper; +import com.pusong.common.web.core.BaseController; +import com.pusong.system.domain.bo.SysTenantBo; +import com.pusong.system.domain.vo.SysTenantVo; +import com.pusong.system.service.ISysTenantService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysTenantPackageController.java similarity index 83% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysTenantPackageController.java index 7d99916..a63c766 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysTenantPackageController.java @@ -1,21 +1,21 @@ -package org.dromara.system.controller.system; +package com.pusong.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckRole; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysTenantPackageBo; -import org.dromara.system.domain.vo.SysTenantPackageVo; -import org.dromara.system.service.ISysTenantPackageService; +import com.pusong.common.core.constant.TenantConstants; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.core.validate.EditGroup; +import com.pusong.common.excel.utils.ExcelUtil; +import com.pusong.common.idempotent.annotation.RepeatSubmit; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.web.core.BaseController; +import com.pusong.system.domain.bo.SysTenantPackageBo; +import com.pusong.system.domain.vo.SysTenantPackageVo; +import com.pusong.system.service.ISysTenantPackageService; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysUserController.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysUserController.java index 36104d6..cdddb07 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/controller/system/SysUserController.java @@ -1,35 +1,37 @@ -package org.dromara.system.controller.system; +package com.pusong.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.secure.BCrypt; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; +import com.pusong.system.domain.vo.*; +import com.pusong.system.service.*; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.annotation.ApiEncrypt; -import org.dromara.common.excel.core.ExcelResult; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysDeptBo; -import org.dromara.system.domain.bo.SysPostBo; -import org.dromara.system.domain.bo.SysRoleBo; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.*; -import org.dromara.system.listener.SysUserImportListener; -import org.dromara.system.service.*; +import com.pusong.common.core.constant.UserConstants; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.domain.model.LoginUser; +import com.pusong.common.core.utils.StreamUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.encrypt.annotation.ApiEncrypt; +import com.pusong.common.excel.core.ExcelResult; +import com.pusong.common.excel.utils.ExcelUtil; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.satoken.utils.LoginHelper; +import com.pusong.common.tenant.helper.TenantHelper; +import com.pusong.common.web.core.BaseController; +import com.pusong.system.domain.bo.SysDeptBo; +import com.pusong.system.domain.bo.SysPostBo; +import com.pusong.system.domain.bo.SysRoleBo; +import com.pusong.system.domain.bo.SysUserBo; +import com.pusong.system.domain.vo.*; +import com.pusong.system.listener.SysUserImportListener; +import com.pusong.system.service.*; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysCache.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysCache.java index e398a20..96c7f12 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysCache.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain; +package com.pusong.system.domain; -import org.dromara.common.core.utils.StringUtils; +import com.pusong.common.core.utils.StringUtils; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysClient.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysClient.java index 0f681be..2f579a7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysClient.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain; +package com.pusong.system.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.pusong.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysConfig.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysConfig.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysConfig.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysConfig.java index 6fcb88f..cf46642 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysConfig.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysConfig.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain; +package com.pusong.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.tenant.core.TenantEntity; +import com.pusong.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysDept.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysDept.java index 48ca682..4c1e88d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysDept.java @@ -1,11 +1,11 @@ -package org.dromara.system.domain; +package com.pusong.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.tenant.core.TenantEntity; +import com.pusong.common.tenant.core.TenantEntity; import java.io.Serial; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictData.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysDictData.java similarity index 88% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictData.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysDictData.java index 6884fc2..57513db 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictData.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysDictData.java @@ -1,9 +1,9 @@ -package org.dromara.system.domain; +package com.pusong.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.tenant.core.TenantEntity; +import com.pusong.common.core.constant.UserConstants; +import com.pusong.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictType.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysDictType.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictType.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysDictType.java index 955af85..f405f15 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictType.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysDictType.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain; +package com.pusong.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.tenant.core.TenantEntity; +import com.pusong.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLogininfor.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysLogininfor.java similarity index 97% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLogininfor.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysLogininfor.java index c57dc0a..a8ae064 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLogininfor.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysLogininfor.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package com.pusong.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysMenu.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysMenu.java index 6b498a3..8b06bd5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysMenu.java @@ -1,12 +1,12 @@ -package org.dromara.system.domain; +package com.pusong.system.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.pusong.common.core.constant.Constants; +import com.pusong.common.core.constant.UserConstants; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysNotice.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysNotice.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysNotice.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysNotice.java index bfcc2bc..225283a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysNotice.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysNotice.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain; +package com.pusong.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.tenant.core.TenantEntity; +import com.pusong.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysOperLog.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysOperLog.java index 41a8c59..0be05eb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysOperLog.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package com.pusong.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOss.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysOss.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOss.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysOss.java index af88898..82da1d1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOss.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysOss.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain; +package com.pusong.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.tenant.core.TenantEntity; +import com.pusong.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysOssConfig.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysOssConfig.java index 4b67d63..cb9eea3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysOssConfig.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain; +package com.pusong.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.pusong.common.mybatis.core.domain.BaseEntity; /** * 对象存储配置对象 sys_oss_config diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysPost.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysPost.java index 2c985da..0c372e6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysPost.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain; +package com.pusong.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.tenant.core.TenantEntity; +import com.pusong.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysRole.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysRole.java index 2b42464..703cb7a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysRole.java @@ -1,9 +1,9 @@ -package org.dromara.system.domain; +package com.pusong.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.tenant.core.TenantEntity; +import com.pusong.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleDept.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysRoleDept.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleDept.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysRoleDept.java index ba77694..0db65d1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleDept.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysRoleDept.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package com.pusong.system.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysRoleMenu.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysRoleMenu.java index ba28f17..2c7bbbc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysRoleMenu.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package com.pusong.system.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysSocial.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysSocial.java index 10f2936..ea0ebd2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysSocial.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain; +package com.pusong.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.tenant.core.TenantEntity; +import com.pusong.common.tenant.core.TenantEntity; import java.io.Serial; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysTenant.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysTenant.java index a564a40..6301e7c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysTenant.java @@ -1,9 +1,9 @@ -package org.dromara.system.domain; +package com.pusong.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.pusong.common.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysTenantPackage.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysTenantPackage.java index f7e423f..a64c9fa 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysTenantPackage.java @@ -1,11 +1,11 @@ -package org.dromara.system.domain; +package com.pusong.system.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serial; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.pusong.common.mybatis.core.domain.BaseEntity; /** * 租户套餐对象 sys_tenant_package diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysUser.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysUser.java index 8dde40b..3fca1a4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysUser.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain; +package com.pusong.system.domain; import com.baomidou.mybatisplus.annotation.*; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.tenant.core.TenantEntity; +import com.pusong.common.core.constant.UserConstants; +import com.pusong.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserOnline.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysUserOnline.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserOnline.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysUserOnline.java index ba30eb6..23fe139 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserOnline.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysUserOnline.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package com.pusong.system.domain; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserPost.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysUserPost.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserPost.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysUserPost.java index 119c117..f19779a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserPost.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysUserPost.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package com.pusong.system.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserRole.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysUserRole.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserRole.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysUserRole.java index 0a50e80..d8b29b2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserRole.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/SysUserRole.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package com.pusong.system.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysClientBo.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysClientBo.java index e5f5ffa..c2b8d7c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysClientBo.java @@ -1,9 +1,9 @@ -package org.dromara.system.domain.bo; +package com.pusong.system.domain.bo; -import org.dromara.system.domain.SysClient; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import com.pusong.system.domain.SysClient; +import com.pusong.common.mybatis.core.domain.BaseEntity; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysConfigBo.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysConfigBo.java index 257935d..13d45ea 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysConfigBo.java @@ -1,12 +1,12 @@ -package org.dromara.system.domain.bo; +package com.pusong.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysConfig; +import com.pusong.common.mybatis.core.domain.BaseEntity; +import com.pusong.system.domain.SysConfig; /** * 参数配置业务对象 sys_config diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysDeptBo.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysDeptBo.java index 5f64d6f..f3c336b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysDeptBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.pusong.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.Email; @@ -7,8 +7,8 @@ import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysDept; +import com.pusong.common.mybatis.core.domain.BaseEntity; +import com.pusong.system.domain.SysDept; /** * 部门业务对象 sys_dept diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysDictDataBo.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysDictDataBo.java index 042946c..ebb9789 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysDictDataBo.java @@ -1,13 +1,12 @@ -package org.dromara.system.domain.bo; +package com.pusong.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysDictData; +import com.pusong.common.mybatis.core.domain.BaseEntity; +import com.pusong.system.domain.SysDictData; /** * 字典数据业务对象 sys_dict_data diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysDictTypeBo.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysDictTypeBo.java index fcc1ac1..68d5059 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysDictTypeBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.pusong.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -6,9 +6,9 @@ import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.core.constant.RegexConstants; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysDictType; +import com.pusong.common.core.constant.RegexConstants; +import com.pusong.common.mybatis.core.domain.BaseEntity; +import com.pusong.system.domain.SysDictType; /** * 字典类型业务对象 sys_dict_type diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysLogininforBo.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysLogininforBo.java index 4646162..680ea46 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysLogininforBo.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain.bo; +package com.pusong.system.domain.bo; -import org.dromara.system.domain.SysLogininfor; +import com.pusong.system.domain.SysLogininfor; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysMenuBo.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysMenuBo.java index fbaafaa..917cb8f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysMenuBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.pusong.system.domain.bo; import com.fasterxml.jackson.annotation.JsonInclude; import io.github.linpeilie.annotations.AutoMapper; @@ -8,9 +8,9 @@ import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.core.constant.RegexConstants; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysMenu; +import com.pusong.common.core.constant.RegexConstants; +import com.pusong.common.mybatis.core.domain.BaseEntity; +import com.pusong.system.domain.SysMenu; /** * 菜单权限业务对象 sys_menu diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysNoticeBo.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysNoticeBo.java index cdcc575..eae25e6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysNoticeBo.java @@ -1,13 +1,13 @@ -package org.dromara.system.domain.bo; +package com.pusong.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.core.xss.Xss; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysNotice; +import com.pusong.common.core.xss.Xss; +import com.pusong.common.mybatis.core.domain.BaseEntity; +import com.pusong.system.domain.SysNotice; /** * 通知公告业务对象 sys_notice diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysOperLogBo.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysOperLogBo.java index f16400a..270d13b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysOperLogBo.java @@ -1,7 +1,7 @@ -package org.dromara.system.domain.bo; +package com.pusong.system.domain.bo; -import org.dromara.common.log.event.OperLogEvent; -import org.dromara.system.domain.SysOperLog; +import com.pusong.common.log.event.OperLogEvent; +import com.pusong.system.domain.SysOperLog; import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMappers; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysOssBo.java similarity index 83% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysOssBo.java index 7cb3104..3473cc3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysOssBo.java @@ -1,7 +1,7 @@ -package org.dromara.system.domain.bo; +package com.pusong.system.domain.bo; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysOss; +import com.pusong.common.mybatis.core.domain.BaseEntity; +import com.pusong.system.domain.SysOss; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysOssConfigBo.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysOssConfigBo.java index 3dc4328..b4fef44 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysOssConfigBo.java @@ -1,9 +1,9 @@ -package org.dromara.system.domain.bo; +package com.pusong.system.domain.bo; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysOssConfig; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.core.validate.EditGroup; +import com.pusong.common.mybatis.core.domain.BaseEntity; +import com.pusong.system.domain.SysOssConfig; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysPostBo.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysPostBo.java index 09805cd..de861b1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysPostBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.pusong.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -6,8 +6,8 @@ import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysPost; +import com.pusong.common.mybatis.core.domain.BaseEntity; +import com.pusong.system.domain.SysPost; /** * 岗位信息业务对象 sys_post diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysRoleBo.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysRoleBo.java index 0c8b4dc..5dd3670 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysRoleBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.pusong.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -7,9 +7,9 @@ import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysRole; +import com.pusong.common.core.constant.UserConstants; +import com.pusong.common.mybatis.core.domain.BaseEntity; +import com.pusong.system.domain.SysRole; /** * 角色信息业务对象 sys_role diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysSocialBo.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysSocialBo.java index cede1e9..1d3333f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysSocialBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.pusong.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -6,10 +6,10 @@ import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.tenant.core.TenantEntity; -import org.dromara.system.domain.SysSocial; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.core.validate.EditGroup; +import com.pusong.common.tenant.core.TenantEntity; +import com.pusong.system.domain.SysSocial; /** * 社会化关系业务对象 sys_social diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysTenantBo.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysTenantBo.java index e3ac642..4c89d27 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysTenantBo.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain.bo; +package com.pusong.system.domain.bo; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.system.domain.SysTenant; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.core.validate.EditGroup; +import com.pusong.system.domain.SysTenant; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,7 +10,7 @@ import jakarta.validation.constraints.*; import java.util.Date; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.pusong.common.mybatis.core.domain.BaseEntity; /** * 租户业务对象 sys_tenant diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysTenantPackageBo.java similarity index 73% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysTenantPackageBo.java index eecbc9f..4911559 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysTenantPackageBo.java @@ -1,15 +1,15 @@ -package org.dromara.system.domain.bo; +package com.pusong.system.domain.bo; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.system.domain.SysTenantPackage; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.core.validate.EditGroup; +import com.pusong.system.domain.SysTenantPackage; import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapping; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.pusong.common.mybatis.core.domain.BaseEntity; /** * 租户套餐业务对象 sys_tenant_package @@ -37,7 +37,7 @@ public class SysTenantPackageBo extends BaseEntity { /** * 关联菜单id */ - @AutoMapping(target = "menuIds", expression = "java(org.dromara.common.core.utils.StringUtils.join(source.getMenuIds(), \",\"))") + @AutoMapping(target = "menuIds", expression = "java(com.pusong.common.core.utils.StringUtils.join(source.getMenuIds(), \",\"))") private Long[] menuIds; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysUserBo.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysUserBo.java index 7ad2759..f63c4e3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysUserBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.pusong.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.Email; @@ -7,10 +7,10 @@ import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.xss.Xss; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysUser; +import com.pusong.common.core.constant.UserConstants; +import com.pusong.common.core.xss.Xss; +import com.pusong.common.mybatis.core.domain.BaseEntity; +import com.pusong.system.domain.SysUser; /** * 用户信息业务对象 sys_user diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysUserPasswordBo.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysUserPasswordBo.java index 8615fcd..1a14edd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysUserPasswordBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.pusong.system.domain.bo; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysUserProfileBo.java similarity index 78% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysUserProfileBo.java index 846dd79..2fc60fe 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/bo/SysUserProfileBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.pusong.system.domain.bo; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.Pattern; @@ -6,11 +6,11 @@ import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.dromara.common.core.constant.RegexConstants; -import org.dromara.common.core.xss.Xss; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.sensitive.annotation.Sensitive; -import org.dromara.common.sensitive.core.SensitiveStrategy; +import com.pusong.common.core.constant.RegexConstants; +import com.pusong.common.core.xss.Xss; +import com.pusong.common.mybatis.core.domain.BaseEntity; +import com.pusong.common.sensitive.annotation.Sensitive; +import com.pusong.common.sensitive.core.SensitiveStrategy; /** * 个人信息业务处理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/AvatarVo.java similarity index 82% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/AvatarVo.java index 46c020b..2ed26fb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/AvatarVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/CacheListInfoVo.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/CacheListInfoVo.java index f827cba..245075a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/CacheListInfoVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/DeptTreeSelectVo.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/DeptTreeSelectVo.java index 6f7db28..2e2f006 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/DeptTreeSelectVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; import cn.hutool.core.lang.tree.Tree; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/MenuTreeSelectVo.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/MenuTreeSelectVo.java index 0724538..40552e2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/MenuTreeSelectVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; import cn.hutool.core.lang.tree.Tree; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/MetaVo.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/MetaVo.java index f720cd7..5243bbd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/MetaVo.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; -import org.dromara.common.core.utils.StringUtils; +import com.pusong.common.core.utils.StringUtils; import lombok.Data; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/ProfileVo.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/ProfileVo.java index c047651..e130a24 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/ProfileVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/RouterVo.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/RouterVo.java index 0d576ef..5144a2d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/RouterVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysClientVo.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysClientVo.java index 34f24eb..da083f6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysClientVo.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; -import org.dromara.system.domain.SysClient; +import com.pusong.system.domain.SysClient; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; +import com.pusong.common.excel.annotation.ExcelDictFormat; +import com.pusong.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysConfigVo.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysConfigVo.java index f896000..b254f1a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysConfigVo.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysConfig; +import com.pusong.common.excel.annotation.ExcelDictFormat; +import com.pusong.common.excel.convert.ExcelDictConvert; +import com.pusong.system.domain.SysConfig; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysDeptVo.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysDeptVo.java index c56fb09..189907f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysDeptVo.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysDept; +import com.pusong.common.excel.annotation.ExcelDictFormat; +import com.pusong.common.excel.convert.ExcelDictConvert; +import com.pusong.system.domain.SysDept; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysDictDataVo.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysDictDataVo.java index 83ea619..ea2b6e9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysDictDataVo.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysDictData; +import com.pusong.common.excel.annotation.ExcelDictFormat; +import com.pusong.common.excel.convert.ExcelDictConvert; +import com.pusong.system.domain.SysDictData; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysDictTypeVo.java similarity index 83% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysDictTypeVo.java index e6a184f..d4e0171 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysDictTypeVo.java @@ -1,10 +1,8 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysDictType; +import com.pusong.system.domain.SysDictType; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysLogininforVo.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysLogininforVo.java index de19aea..ff28e10 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysLogininforVo.java @@ -1,11 +1,11 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; import java.util.Date; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysLogininfor; +import com.pusong.common.excel.annotation.ExcelDictFormat; +import com.pusong.common.excel.convert.ExcelDictConvert; +import com.pusong.system.domain.SysLogininfor; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysMenuVo.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysMenuVo.java index 5214a33..f147514 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysMenuVo.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; -import org.dromara.system.domain.SysMenu; +import com.pusong.system.domain.SysMenu; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysNoticeVo.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysNoticeVo.java index afe7367..225afde 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysNoticeVo.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.system.domain.SysNotice; +import com.pusong.common.translation.annotation.Translation; +import com.pusong.common.translation.constant.TransConstant; +import com.pusong.system.domain.SysNotice; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysOperLogVo.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysOperLogVo.java index d9eb71d..9a5534e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysOperLogVo.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysOperLog; +import com.pusong.common.excel.annotation.ExcelDictFormat; +import com.pusong.common.excel.convert.ExcelDictConvert; +import com.pusong.system.domain.SysOperLog; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysOssConfigVo.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysOssConfigVo.java index e7cfde4..3776247 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysOssConfigVo.java @@ -1,7 +1,7 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import org.dromara.system.domain.SysOssConfig; +import com.pusong.system.domain.SysOssConfig; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysOssUploadVo.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysOssUploadVo.java index 11e0ff8..114fb88 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysOssUploadVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysOssVo.java similarity index 83% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysOssVo.java index 8d5c429..69adf14 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysOssVo.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.system.domain.SysOss; +import com.pusong.common.translation.annotation.Translation; +import com.pusong.common.translation.constant.TransConstant; +import com.pusong.system.domain.SysOss; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysPostVo.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysPostVo.java index 69be547..7525087 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysPostVo.java @@ -1,14 +1,14 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.system.domain.SysPost; +import com.pusong.common.excel.annotation.ExcelDictFormat; +import com.pusong.common.excel.convert.ExcelDictConvert; +import com.pusong.common.translation.annotation.Translation; +import com.pusong.common.translation.constant.TransConstant; +import com.pusong.system.domain.SysPost; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysRoleVo.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysRoleVo.java index 1e5cd9e..021cc06 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysRoleVo.java @@ -1,11 +1,11 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysRole; +import com.pusong.common.core.constant.UserConstants; +import com.pusong.common.excel.annotation.ExcelDictFormat; +import com.pusong.common.excel.convert.ExcelDictConvert; +import com.pusong.system.domain.SysRole; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysSocialVo.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysSocialVo.java index 948dbcc..b353339 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysSocialVo.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.system.domain.SysSocial; +import com.pusong.system.domain.SysSocial; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysTenantPackageVo.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysTenantPackageVo.java index 070334b..f1aa03f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysTenantPackageVo.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysTenantPackage; +import com.pusong.common.excel.annotation.ExcelDictFormat; +import com.pusong.common.excel.convert.ExcelDictConvert; +import com.pusong.system.domain.SysTenantPackage; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysTenantVo.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysTenantVo.java index 6a45315..885a4b6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysTenantVo.java @@ -1,11 +1,11 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; import java.util.Date; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysTenant; +import com.pusong.common.excel.annotation.ExcelDictFormat; +import com.pusong.common.excel.convert.ExcelDictConvert; +import com.pusong.system.domain.SysTenant; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysUserExportVo.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysUserExportVo.java index 37ec6b7..efa1ee8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysUserExportVo.java @@ -1,10 +1,8 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import io.github.linpeilie.annotations.AutoMapper; -import io.github.linpeilie.annotations.ReverseAutoMapping; +import com.pusong.common.excel.annotation.ExcelDictFormat; +import com.pusong.common.excel.convert.ExcelDictConvert; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysUserImportVo.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysUserImportVo.java index c34a23c..b6bc7ca 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysUserImportVo.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; +import com.pusong.common.excel.annotation.ExcelDictFormat; +import com.pusong.common.excel.convert.ExcelDictConvert; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysUserInfoVo.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysUserInfoVo.java index e41355d..5d0fc41 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysUserInfoVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysUserVo.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysUserVo.java index d1f4059..28f5fcf 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/SysUserVo.java @@ -1,12 +1,12 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import org.dromara.common.sensitive.annotation.Sensitive; -import org.dromara.common.sensitive.core.SensitiveStrategy; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.system.domain.SysUser; +import com.pusong.common.sensitive.annotation.Sensitive; +import com.pusong.common.sensitive.core.SensitiveStrategy; +import com.pusong.common.translation.annotation.Translation; +import com.pusong.common.translation.constant.TransConstant; +import com.pusong.system.domain.SysUser; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/UserInfoVo.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/UserInfoVo.java index 48fa92a..d04ebd4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/domain/vo/UserInfoVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.vo; +package com.pusong.system.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/listener/SysUserImportListener.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/listener/SysUserImportListener.java index c20a4ec..574385c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/listener/SysUserImportListener.java @@ -1,21 +1,21 @@ -package org.dromara.system.listener; +package com.pusong.system.listener; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.crypto.digest.BCrypt; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.excel.core.ExcelListener; -import org.dromara.common.excel.core.ExcelResult; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.SysUserImportVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.service.ISysConfigService; -import org.dromara.system.service.ISysUserService; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.ValidatorUtils; +import com.pusong.common.excel.core.ExcelListener; +import com.pusong.common.excel.core.ExcelResult; +import com.pusong.common.satoken.utils.LoginHelper; +import com.pusong.system.domain.bo.SysUserBo; +import com.pusong.system.domain.vo.SysUserImportVo; +import com.pusong.system.domain.vo.SysUserVo; +import com.pusong.system.service.ISysConfigService; +import com.pusong.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; import java.util.List; diff --git a/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysClientMapper.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysClientMapper.java new file mode 100644 index 0000000..61a59b2 --- /dev/null +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysClientMapper.java @@ -0,0 +1,15 @@ +package com.pusong.system.mapper; + +import com.pusong.system.domain.SysClient; +import com.pusong.system.domain.vo.SysClientVo; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 授权管理Mapper接口 + * + * @author Michelle.Chung + * @date 2023-05-15 + */ +public interface SysClientMapper extends BaseMapperPlus { + +} diff --git a/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysConfigMapper.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysConfigMapper.java new file mode 100644 index 0000000..4b76255 --- /dev/null +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysConfigMapper.java @@ -0,0 +1,14 @@ +package com.pusong.system.mapper; + +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.system.domain.SysConfig; +import com.pusong.system.domain.vo.SysConfigVo; + +/** + * 参数配置 数据层 + * + * @author Lion Li + */ +public interface SysConfigMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysDeptMapper.java similarity index 78% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysDeptMapper.java index 08dda66..6087e7d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysDeptMapper.java @@ -1,12 +1,12 @@ -package org.dromara.system.mapper; +package com.pusong.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysDept; -import org.dromara.system.domain.vo.SysDeptVo; +import com.pusong.common.mybatis.annotation.DataColumn; +import com.pusong.common.mybatis.annotation.DataPermission; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.system.domain.SysDept; +import com.pusong.system.domain.vo.SysDeptVo; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysDictDataMapper.java similarity index 72% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysDictDataMapper.java index c2f1a7c..50561e6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysDictDataMapper.java @@ -1,9 +1,9 @@ -package org.dromara.system.mapper; +package com.pusong.system.mapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysDictData; -import org.dromara.system.domain.vo.SysDictDataVo; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.system.domain.SysDictData; +import com.pusong.system.domain.vo.SysDictDataVo; import java.util.List; diff --git a/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysDictTypeMapper.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysDictTypeMapper.java new file mode 100644 index 0000000..d04b15b --- /dev/null +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysDictTypeMapper.java @@ -0,0 +1,14 @@ +package com.pusong.system.mapper; + +import com.pusong.system.domain.SysDictType; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.system.domain.vo.SysDictTypeVo; + +/** + * 字典表 数据层 + * + * @author Lion Li + */ +public interface SysDictTypeMapper extends BaseMapperPlus { + +} diff --git a/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysLogininforMapper.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysLogininforMapper.java new file mode 100644 index 0000000..5d5af2a --- /dev/null +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysLogininforMapper.java @@ -0,0 +1,14 @@ +package com.pusong.system.mapper; + +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.system.domain.SysLogininfor; +import com.pusong.system.domain.vo.SysLogininforVo; + +/** + * 系统访问日志情况信息 数据层 + * + * @author Lion Li + */ +public interface SysLogininforMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysMenuMapper.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysMenuMapper.java index b2be0e9..1f587ce 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysMenuMapper.java @@ -1,12 +1,12 @@ -package org.dromara.system.mapper; +package com.pusong.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.system.domain.SysMenu; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.vo.SysMenuVo; +import com.pusong.common.core.constant.UserConstants; +import com.pusong.system.domain.SysMenu; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.system.domain.vo.SysMenuVo; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysNoticeMapper.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysNoticeMapper.java new file mode 100644 index 0000000..6288f39 --- /dev/null +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysNoticeMapper.java @@ -0,0 +1,14 @@ +package com.pusong.system.mapper; + +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.system.domain.SysNotice; +import com.pusong.system.domain.vo.SysNoticeVo; + +/** + * 通知公告表 数据层 + * + * @author Lion Li + */ +public interface SysNoticeMapper extends BaseMapperPlus { + +} diff --git a/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysOperLogMapper.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysOperLogMapper.java new file mode 100644 index 0000000..6758b2c --- /dev/null +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysOperLogMapper.java @@ -0,0 +1,14 @@ +package com.pusong.system.mapper; + +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.system.domain.SysOperLog; +import com.pusong.system.domain.vo.SysOperLogVo; + +/** + * 操作日志 数据层 + * + * @author Lion Li + */ +public interface SysOperLogMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssConfigMapper.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysOssConfigMapper.java similarity index 51% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssConfigMapper.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysOssConfigMapper.java index f93d34d..5d5845a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssConfigMapper.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysOssConfigMapper.java @@ -1,8 +1,8 @@ -package org.dromara.system.mapper; +package com.pusong.system.mapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysOssConfig; -import org.dromara.system.domain.vo.SysOssConfigVo; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.system.domain.SysOssConfig; +import com.pusong.system.domain.vo.SysOssConfigVo; /** * 对象存储配置Mapper接口 diff --git a/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysOssMapper.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysOssMapper.java new file mode 100644 index 0000000..5f7d65d --- /dev/null +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysOssMapper.java @@ -0,0 +1,13 @@ +package com.pusong.system.mapper; + +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.system.domain.SysOss; +import com.pusong.system.domain.vo.SysOssVo; + +/** + * 文件上传 数据层 + * + * @author Lion Li + */ +public interface SysOssMapper extends BaseMapperPlus { +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysPostMapper.java similarity index 73% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysPostMapper.java index f9bf134..dc2194e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysPostMapper.java @@ -1,14 +1,14 @@ -package org.dromara.system.mapper; +package com.pusong.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysPost; -import org.dromara.system.domain.vo.SysPostVo; +import com.pusong.common.mybatis.annotation.DataColumn; +import com.pusong.common.mybatis.annotation.DataPermission; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.system.domain.SysPost; +import com.pusong.system.domain.vo.SysPostVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysRoleDeptMapper.java similarity index 52% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysRoleDeptMapper.java index 3de0bb6..8cd7cf5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysRoleDeptMapper.java @@ -1,7 +1,7 @@ -package org.dromara.system.mapper; +package com.pusong.system.mapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysRoleDept; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.system.domain.SysRoleDept; /** * 角色与部门关联表 数据层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysRoleMapper.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysRoleMapper.java index ac5a47e..b69fcd9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysRoleMapper.java @@ -1,14 +1,14 @@ -package org.dromara.system.mapper; +package com.pusong.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysRole; -import org.dromara.system.domain.vo.SysRoleVo; +import com.pusong.common.mybatis.annotation.DataColumn; +import com.pusong.common.mybatis.annotation.DataPermission; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.system.domain.SysRole; +import com.pusong.system.domain.vo.SysRoleVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysRoleMenuMapper.java similarity index 52% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysRoleMenuMapper.java index 0a657b4..0408d5a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysRoleMenuMapper.java @@ -1,7 +1,7 @@ -package org.dromara.system.mapper; +package com.pusong.system.mapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysRoleMenu; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.system.domain.SysRoleMenu; /** * 角色与菜单关联表 数据层 diff --git a/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysSocialMapper.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysSocialMapper.java new file mode 100644 index 0000000..95934c7 --- /dev/null +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysSocialMapper.java @@ -0,0 +1,14 @@ +package com.pusong.system.mapper; + +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.system.domain.SysSocial; +import com.pusong.system.domain.vo.SysSocialVo; + +/** + * 社会化关系Mapper接口 + * + * @author thiszhc + */ +public interface SysSocialMapper extends BaseMapperPlus { + +} diff --git a/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysTenantMapper.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysTenantMapper.java new file mode 100644 index 0000000..baae99a --- /dev/null +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysTenantMapper.java @@ -0,0 +1,14 @@ +package com.pusong.system.mapper; + +import com.pusong.system.domain.SysTenant; +import com.pusong.system.domain.vo.SysTenantVo; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 租户Mapper接口 + * + * @author Michelle.Chung + */ +public interface SysTenantMapper extends BaseMapperPlus { + +} diff --git a/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysTenantPackageMapper.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysTenantPackageMapper.java new file mode 100644 index 0000000..dbafb46 --- /dev/null +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysTenantPackageMapper.java @@ -0,0 +1,14 @@ +package com.pusong.system.mapper; + +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.system.domain.SysTenantPackage; +import com.pusong.system.domain.vo.SysTenantPackageVo; + +/** + * 租户套餐Mapper接口 + * + * @author Michelle.Chung + */ +public interface SysTenantPackageMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysUserMapper.java similarity index 88% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysUserMapper.java index fc7fc6e..e1ca4b8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysUserMapper.java @@ -1,15 +1,15 @@ -package org.dromara.system.mapper; +package com.pusong.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.vo.SysUserExportVo; -import org.dromara.system.domain.vo.SysUserVo; +import com.pusong.common.mybatis.annotation.DataColumn; +import com.pusong.common.mybatis.annotation.DataPermission; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.system.domain.SysUser; +import com.pusong.system.domain.vo.SysUserExportVo; +import com.pusong.system.domain.vo.SysUserVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysUserPostMapper.java similarity index 52% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysUserPostMapper.java index 07c1371..bd413f3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysUserPostMapper.java @@ -1,7 +1,7 @@ -package org.dromara.system.mapper; +package com.pusong.system.mapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysUserPost; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.system.domain.SysUserPost; /** * 用户与岗位关联表 数据层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysUserRoleMapper.java similarity index 62% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysUserRoleMapper.java index e2f706c..9883e23 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/mapper/SysUserRoleMapper.java @@ -1,7 +1,7 @@ -package org.dromara.system.mapper; +package com.pusong.system.mapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysUserRole; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.system.domain.SysUserRole; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/runner/SystemApplicationRunner.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/runner/SystemApplicationRunner.java index 27dad7d..3d6018c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/runner/SystemApplicationRunner.java @@ -1,6 +1,6 @@ -package org.dromara.system.runner; +package com.pusong.system.runner; -import org.dromara.system.service.ISysOssConfigService; +import com.pusong.system.service.ISysOssConfigService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.ApplicationArguments; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysClientService.java similarity index 77% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysClientService.java index d0f8a3c..8dfc72b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysClientService.java @@ -1,10 +1,9 @@ -package org.dromara.system.service; +package com.pusong.system.service; -import org.dromara.system.domain.SysClient; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.bo.SysClientBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.pusong.system.domain.vo.SysClientVo; +import com.pusong.system.domain.bo.SysClientBo; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.mybatis.core.page.PageQuery; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysConfigService.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysConfigService.java index f7efda7..aca63c5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysConfigService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.pusong.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysConfigBo; -import org.dromara.system.domain.vo.SysConfigVo; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.system.domain.bo.SysConfigBo; +import com.pusong.system.domain.vo.SysConfigVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDataScopeService.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysDataScopeService.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDataScopeService.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysDataScopeService.java index 3f252f7..e5b72d4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDataScopeService.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysDataScopeService.java @@ -1,4 +1,4 @@ -package org.dromara.system.service; +package com.pusong.system.service; /** * 通用 数据权限 服务 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysDeptService.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysDeptService.java index cd984d8..0381ec8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysDeptService.java @@ -1,8 +1,8 @@ -package org.dromara.system.service; +package com.pusong.system.service; import cn.hutool.core.lang.tree.Tree; -import org.dromara.system.domain.bo.SysDeptBo; -import org.dromara.system.domain.vo.SysDeptVo; +import com.pusong.system.domain.bo.SysDeptBo; +import com.pusong.system.domain.vo.SysDeptVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysDictDataService.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysDictDataService.java index 0e697db..4f731cc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysDictDataService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.pusong.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysDictDataBo; -import org.dromara.system.domain.vo.SysDictDataVo; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.system.domain.bo.SysDictDataBo; +import com.pusong.system.domain.vo.SysDictDataVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysDictTypeService.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysDictTypeService.java index 3b32d6c..971ea6f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysDictTypeService.java @@ -1,10 +1,10 @@ -package org.dromara.system.service; +package com.pusong.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysDictTypeBo; -import org.dromara.system.domain.vo.SysDictDataVo; -import org.dromara.system.domain.vo.SysDictTypeVo; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.system.domain.bo.SysDictTypeBo; +import com.pusong.system.domain.vo.SysDictDataVo; +import com.pusong.system.domain.vo.SysDictTypeVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLogininforService.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysLogininforService.java similarity index 77% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLogininforService.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysLogininforService.java index 6b3b7a6..fc74c86 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLogininforService.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysLogininforService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.pusong.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysLogininforBo; -import org.dromara.system.domain.vo.SysLogininforVo; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.system.domain.bo.SysLogininforBo; +import com.pusong.system.domain.vo.SysLogininforVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysMenuService.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysMenuService.java index 72d705e..e66da79 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysMenuService.java @@ -1,10 +1,10 @@ -package org.dromara.system.service; +package com.pusong.system.service; import cn.hutool.core.lang.tree.Tree; -import org.dromara.system.domain.SysMenu; -import org.dromara.system.domain.bo.SysMenuBo; -import org.dromara.system.domain.vo.RouterVo; -import org.dromara.system.domain.vo.SysMenuVo; +import com.pusong.system.domain.SysMenu; +import com.pusong.system.domain.bo.SysMenuBo; +import com.pusong.system.domain.vo.RouterVo; +import com.pusong.system.domain.vo.SysMenuVo; import java.util.List; import java.util.Set; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysNoticeService.java similarity index 81% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysNoticeService.java index 8ec999d..c392b87 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysNoticeService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.pusong.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysNoticeBo; -import org.dromara.system.domain.vo.SysNoticeVo; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.system.domain.bo.SysNoticeBo; +import com.pusong.system.domain.vo.SysNoticeVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysOperLogService.java similarity index 79% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysOperLogService.java index 9573510..459dcef 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysOperLogService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.pusong.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysOperLogBo; -import org.dromara.system.domain.vo.SysOperLogVo; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.system.domain.bo.SysOperLogBo; +import com.pusong.system.domain.vo.SysOperLogVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysOssConfigService.java similarity index 82% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysOssConfigService.java index 2f6dfc9..db97a0d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysOssConfigService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.pusong.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysOssConfigBo; -import org.dromara.system.domain.vo.SysOssConfigVo; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.system.domain.bo.SysOssConfigBo; +import com.pusong.system.domain.vo.SysOssConfigVo; import java.util.Collection; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysOssService.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysOssService.java index 057c068..b61607d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysOssService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.pusong.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysOssBo; -import org.dromara.system.domain.vo.SysOssVo; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.system.domain.bo.SysOssBo; +import com.pusong.system.domain.vo.SysOssVo; import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPermissionService.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysPermissionService.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPermissionService.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysPermissionService.java index 0116df5..d9556bd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPermissionService.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysPermissionService.java @@ -1,4 +1,4 @@ -package org.dromara.system.service; +package com.pusong.system.service; import java.util.Set; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysPostService.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysPostService.java index c43f039..99ad0b2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysPostService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.pusong.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysPostBo; -import org.dromara.system.domain.vo.SysPostVo; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.system.domain.bo.SysPostBo; +import com.pusong.system.domain.vo.SysPostVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysRoleService.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysRoleService.java index 64740ae..392b5d9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysRoleService.java @@ -1,10 +1,10 @@ -package org.dromara.system.service; +package com.pusong.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.SysUserRole; -import org.dromara.system.domain.bo.SysRoleBo; -import org.dromara.system.domain.vo.SysRoleVo; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.system.domain.SysUserRole; +import com.pusong.system.domain.bo.SysRoleBo; +import com.pusong.system.domain.vo.SysRoleVo; import java.util.List; import java.util.Set; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysSocialService.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysSocialService.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysSocialService.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysSocialService.java index cc7016e..b82670f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysSocialService.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysSocialService.java @@ -1,7 +1,7 @@ -package org.dromara.system.service; +package com.pusong.system.service; -import org.dromara.system.domain.bo.SysSocialBo; -import org.dromara.system.domain.vo.SysSocialVo; +import com.pusong.system.domain.bo.SysSocialBo; +import com.pusong.system.domain.vo.SysSocialVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysTenantPackageService.java similarity index 79% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysTenantPackageService.java index cdb887c..196e7d1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysTenantPackageService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.pusong.system.service; -import org.dromara.system.domain.vo.SysTenantPackageVo; -import org.dromara.system.domain.bo.SysTenantPackageBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.pusong.system.domain.vo.SysTenantPackageVo; +import com.pusong.system.domain.bo.SysTenantPackageBo; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.mybatis.core.page.PageQuery; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysTenantService.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysTenantService.java index d12ed95..f736884 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysTenantService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.pusong.system.service; -import org.dromara.system.domain.vo.SysTenantVo; -import org.dromara.system.domain.bo.SysTenantBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.pusong.system.domain.vo.SysTenantVo; +import com.pusong.system.domain.bo.SysTenantBo; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.mybatis.core.page.PageQuery; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysUserService.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysUserService.java index 0325a25..c6a7819 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/ISysUserService.java @@ -1,10 +1,10 @@ -package org.dromara.system.service; +package com.pusong.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.SysUserExportVo; -import org.dromara.system.domain.vo.SysUserVo; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.system.domain.bo.SysUserBo; +import com.pusong.system.domain.vo.SysUserExportVo; +import com.pusong.system.domain.vo.SysUserVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysClientServiceImpl.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysClientServiceImpl.java index 26bc491..b6afc5f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysClientServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.pusong.system.service.impl; import cn.hutool.crypto.SecureUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -7,16 +7,16 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.SysClient; -import org.dromara.system.domain.bo.SysClientBo; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.mapper.SysClientMapper; -import org.dromara.system.service.ISysClientService; +import com.pusong.common.core.constant.CacheNames; +import com.pusong.common.core.utils.MapstructUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.system.domain.SysClient; +import com.pusong.system.domain.bo.SysClientBo; +import com.pusong.system.domain.vo.SysClientVo; +import com.pusong.system.mapper.SysClientMapper; +import com.pusong.system.service.ISysClientService; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysConfigServiceImpl.java similarity index 88% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysConfigServiceImpl.java index bebfdad..74114a3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysConfigServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.pusong.system.service.impl; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; @@ -6,22 +6,22 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.ConfigService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.domain.SysConfig; -import org.dromara.system.domain.bo.SysConfigBo; -import org.dromara.system.domain.vo.SysConfigVo; -import org.dromara.system.mapper.SysConfigMapper; -import org.dromara.system.service.ISysConfigService; +import com.pusong.common.core.constant.CacheNames; +import com.pusong.common.core.constant.UserConstants; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.service.ConfigService; +import com.pusong.common.core.utils.MapstructUtils; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.redis.utils.CacheUtils; +import com.pusong.common.tenant.helper.TenantHelper; +import com.pusong.system.domain.SysConfig; +import com.pusong.system.domain.bo.SysConfigBo; +import com.pusong.system.domain.vo.SysConfigVo; +import com.pusong.system.mapper.SysConfigMapper; +import com.pusong.system.service.ISysConfigService; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysDataScopeServiceImpl.java similarity index 80% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysDataScopeServiceImpl.java index d7ba934..ca5d2f8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysDataScopeServiceImpl.java @@ -1,15 +1,15 @@ -package org.dromara.system.service.impl; +package com.pusong.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.dromara.system.domain.SysDept; -import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.system.domain.SysRoleDept; -import org.dromara.system.mapper.SysDeptMapper; -import org.dromara.system.mapper.SysRoleDeptMapper; -import org.dromara.system.service.ISysDataScopeService; +import com.pusong.system.domain.SysDept; +import com.pusong.common.mybatis.helper.DataBaseHelper; +import com.pusong.common.core.utils.StreamUtils; +import com.pusong.system.domain.SysRoleDept; +import com.pusong.system.mapper.SysDeptMapper; +import com.pusong.system.mapper.SysRoleDeptMapper; +import com.pusong.system.service.ISysDataScopeService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysDeptServiceImpl.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysDeptServiceImpl.java index cb3f340..a6d20db 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysDeptServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.pusong.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; @@ -8,26 +8,26 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.DeptService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.TreeBuildUtils; -import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysDept; -import org.dromara.system.domain.SysRole; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.bo.SysDeptBo; -import org.dromara.system.domain.vo.SysDeptVo; -import org.dromara.system.mapper.SysDeptMapper; -import org.dromara.system.mapper.SysRoleMapper; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.system.service.ISysDeptService; +import com.pusong.common.core.constant.CacheNames; +import com.pusong.common.core.constant.UserConstants; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.service.DeptService; +import com.pusong.common.core.utils.MapstructUtils; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.core.utils.TreeBuildUtils; +import com.pusong.common.mybatis.helper.DataBaseHelper; +import com.pusong.common.redis.utils.CacheUtils; +import com.pusong.common.satoken.utils.LoginHelper; +import com.pusong.system.domain.SysDept; +import com.pusong.system.domain.SysRole; +import com.pusong.system.domain.SysUser; +import com.pusong.system.domain.bo.SysDeptBo; +import com.pusong.system.domain.vo.SysDeptVo; +import com.pusong.system.mapper.SysDeptMapper; +import com.pusong.system.mapper.SysRoleMapper; +import com.pusong.system.mapper.SysUserMapper; +import com.pusong.system.service.ISysDeptService; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysDictDataServiceImpl.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysDictDataServiceImpl.java index 1ab0faf..ef0ea1c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysDictDataServiceImpl.java @@ -1,21 +1,21 @@ -package org.dromara.system.service.impl; +package com.pusong.system.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.system.domain.SysDictData; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.system.domain.bo.SysDictDataBo; -import org.dromara.system.domain.vo.SysDictDataVo; -import org.dromara.system.mapper.SysDictDataMapper; -import org.dromara.system.service.ISysDictDataService; +import com.pusong.common.core.constant.CacheNames; +import com.pusong.common.core.utils.MapstructUtils; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.system.domain.SysDictData; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.redis.utils.CacheUtils; +import com.pusong.system.domain.bo.SysDictDataBo; +import com.pusong.system.domain.vo.SysDictDataVo; +import com.pusong.system.mapper.SysDictDataMapper; +import com.pusong.system.service.ISysDictDataService; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CachePut; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysDictTypeServiceImpl.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysDictTypeServiceImpl.java index bc6663f..ad85449 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysDictTypeServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.pusong.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -7,24 +7,24 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.DictService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.system.domain.SysDictData; -import org.dromara.system.domain.SysDictType; -import org.dromara.system.domain.bo.SysDictTypeBo; -import org.dromara.system.domain.vo.SysDictDataVo; -import org.dromara.system.domain.vo.SysDictTypeVo; -import org.dromara.system.mapper.SysDictDataMapper; -import org.dromara.system.mapper.SysDictTypeMapper; -import org.dromara.system.service.ISysDictTypeService; +import com.pusong.common.core.constant.CacheNames; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.service.DictService; +import com.pusong.common.core.utils.MapstructUtils; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.StreamUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.redis.utils.CacheUtils; +import com.pusong.system.domain.SysDictData; +import com.pusong.system.domain.SysDictType; +import com.pusong.system.domain.bo.SysDictTypeBo; +import com.pusong.system.domain.vo.SysDictDataVo; +import com.pusong.system.domain.vo.SysDictTypeVo; +import com.pusong.system.mapper.SysDictDataMapper; +import com.pusong.system.mapper.SysDictTypeMapper; +import com.pusong.system.service.ISysDictTypeService; import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysLogininforServiceImpl.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysLogininforServiceImpl.java index 9c930a0..5c2d273 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysLogininforServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.pusong.system.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.useragent.UserAgent; @@ -8,22 +8,22 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.ip.AddressUtils; -import org.dromara.common.log.event.LogininforEvent; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysLogininfor; -import org.dromara.system.domain.bo.SysLogininforBo; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.vo.SysLogininforVo; -import org.dromara.system.mapper.SysLogininforMapper; -import org.dromara.system.service.ISysClientService; -import org.dromara.system.service.ISysLogininforService; +import com.pusong.common.core.constant.Constants; +import com.pusong.common.core.utils.MapstructUtils; +import com.pusong.common.core.utils.ServletUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.core.utils.ip.AddressUtils; +import com.pusong.common.log.event.LogininforEvent; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.satoken.utils.LoginHelper; +import com.pusong.system.domain.SysLogininfor; +import com.pusong.system.domain.bo.SysLogininforBo; +import com.pusong.system.domain.vo.SysClientVo; +import com.pusong.system.domain.vo.SysLogininforVo; +import com.pusong.system.mapper.SysLogininforMapper; +import com.pusong.system.service.ISysClientService; +import com.pusong.system.service.ISysLogininforService; import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysMenuServiceImpl.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysMenuServiceImpl.java index 6e1765b..8e7ab52 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysMenuServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.pusong.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; @@ -8,25 +8,25 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.TreeBuildUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysMenu; -import org.dromara.system.domain.SysRole; -import org.dromara.system.domain.SysRoleMenu; -import org.dromara.system.domain.SysTenantPackage; -import org.dromara.system.domain.bo.SysMenuBo; -import org.dromara.system.domain.vo.MetaVo; -import org.dromara.system.domain.vo.RouterVo; -import org.dromara.system.domain.vo.SysMenuVo; -import org.dromara.system.mapper.SysMenuMapper; -import org.dromara.system.mapper.SysRoleMapper; -import org.dromara.system.mapper.SysRoleMenuMapper; -import org.dromara.system.mapper.SysTenantPackageMapper; -import org.dromara.system.service.ISysMenuService; +import com.pusong.common.core.constant.UserConstants; +import com.pusong.common.core.utils.MapstructUtils; +import com.pusong.common.core.utils.StreamUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.core.utils.TreeBuildUtils; +import com.pusong.common.satoken.utils.LoginHelper; +import com.pusong.system.domain.SysMenu; +import com.pusong.system.domain.SysRole; +import com.pusong.system.domain.SysRoleMenu; +import com.pusong.system.domain.SysTenantPackage; +import com.pusong.system.domain.bo.SysMenuBo; +import com.pusong.system.domain.vo.MetaVo; +import com.pusong.system.domain.vo.RouterVo; +import com.pusong.system.domain.vo.SysMenuVo; +import com.pusong.system.mapper.SysMenuMapper; +import com.pusong.system.mapper.SysRoleMapper; +import com.pusong.system.mapper.SysRoleMenuMapper; +import com.pusong.system.mapper.SysTenantPackageMapper; +import com.pusong.system.service.ISysMenuService; import org.springframework.stereotype.Service; import java.util.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysNoticeServiceImpl.java similarity index 83% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysNoticeServiceImpl.java index 18b7a08..90bbf85 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysNoticeServiceImpl.java @@ -1,21 +1,21 @@ -package org.dromara.system.service.impl; +package com.pusong.system.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.SysNotice; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.bo.SysNoticeBo; -import org.dromara.system.domain.vo.SysNoticeVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.mapper.SysNoticeMapper; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.system.service.ISysNoticeService; +import com.pusong.common.core.utils.MapstructUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.system.domain.SysNotice; +import com.pusong.system.domain.SysUser; +import com.pusong.system.domain.bo.SysNoticeBo; +import com.pusong.system.domain.vo.SysNoticeVo; +import com.pusong.system.domain.vo.SysUserVo; +import com.pusong.system.mapper.SysNoticeMapper; +import com.pusong.system.mapper.SysUserMapper; +import com.pusong.system.service.ISysNoticeService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysOperLogServiceImpl.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysOperLogServiceImpl.java index 2a76b82..3ed309f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysOperLogServiceImpl.java @@ -1,19 +1,19 @@ -package org.dromara.system.service.impl; +package com.pusong.system.service.impl; import cn.hutool.core.util.ArrayUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.ip.AddressUtils; -import org.dromara.common.log.event.OperLogEvent; -import org.dromara.system.domain.SysOperLog; -import org.dromara.system.domain.bo.SysOperLogBo; -import org.dromara.system.domain.vo.SysOperLogVo; -import org.dromara.system.mapper.SysOperLogMapper; -import org.dromara.system.service.ISysOperLogService; +import com.pusong.common.core.utils.MapstructUtils; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.core.utils.ip.AddressUtils; +import com.pusong.common.log.event.OperLogEvent; +import com.pusong.system.domain.SysOperLog; +import com.pusong.system.domain.bo.SysOperLogBo; +import com.pusong.system.domain.vo.SysOperLogVo; +import com.pusong.system.mapper.SysOperLogMapper; +import com.pusong.system.service.ISysOperLogService; import lombok.RequiredArgsConstructor; import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysOssConfigServiceImpl.java similarity index 88% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysOssConfigServiceImpl.java index 2ecd592..011e92f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysOssConfigServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.pusong.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -8,21 +8,21 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.oss.constant.OssConstant; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.system.domain.SysOssConfig; -import org.dromara.system.domain.bo.SysOssConfigBo; -import org.dromara.system.domain.vo.SysOssConfigVo; -import org.dromara.system.mapper.SysOssConfigMapper; -import org.dromara.system.service.ISysOssConfigService; +import com.pusong.common.core.constant.CacheNames; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.utils.MapstructUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.json.utils.JsonUtils; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.oss.constant.OssConstant; +import com.pusong.common.redis.utils.CacheUtils; +import com.pusong.common.redis.utils.RedisUtils; +import com.pusong.system.domain.SysOssConfig; +import com.pusong.system.domain.bo.SysOssConfigBo; +import com.pusong.system.domain.vo.SysOssConfigVo; +import com.pusong.system.mapper.SysOssConfigMapper; +import com.pusong.system.service.ISysOssConfigService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysOssServiceImpl.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysOssServiceImpl.java index aa094b2..5430b0f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysOssServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.pusong.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.convert.Convert; @@ -8,26 +8,26 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.domain.dto.OssDTO; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.OssService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.file.FileUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.oss.core.OssClient; -import org.dromara.common.oss.entity.UploadResult; -import org.dromara.common.oss.enumd.AccessPolicyType; -import org.dromara.common.oss.factory.OssFactory; -import org.dromara.system.domain.SysOss; -import org.dromara.system.domain.bo.SysOssBo; -import org.dromara.system.domain.vo.SysOssVo; -import org.dromara.system.mapper.SysOssMapper; -import org.dromara.system.service.ISysOssService; +import com.pusong.common.core.constant.CacheNames; +import com.pusong.common.core.domain.dto.OssDTO; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.service.OssService; +import com.pusong.common.core.utils.MapstructUtils; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.StreamUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.core.utils.file.FileUtils; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.oss.core.OssClient; +import com.pusong.common.oss.entity.UploadResult; +import com.pusong.common.oss.enumd.AccessPolicyType; +import com.pusong.common.oss.factory.OssFactory; +import com.pusong.system.domain.SysOss; +import com.pusong.system.domain.bo.SysOssBo; +import com.pusong.system.domain.vo.SysOssVo; +import com.pusong.system.mapper.SysOssMapper; +import com.pusong.system.service.ISysOssService; import org.jetbrains.annotations.NotNull; import org.springframework.cache.annotation.Cacheable; import org.springframework.http.MediaType; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysPermissionServiceImpl.java similarity index 81% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysPermissionServiceImpl.java index 9852821..30e6350 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysPermissionServiceImpl.java @@ -1,10 +1,10 @@ -package org.dromara.system.service.impl; +package com.pusong.system.service.impl; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.service.ISysMenuService; -import org.dromara.system.service.ISysPermissionService; -import org.dromara.system.service.ISysRoleService; +import com.pusong.common.core.constant.TenantConstants; +import com.pusong.common.satoken.utils.LoginHelper; +import com.pusong.system.service.ISysMenuService; +import com.pusong.system.service.ISysPermissionService; +import com.pusong.system.service.ISysRoleService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysPostServiceImpl.java similarity index 88% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysPostServiceImpl.java index 17cd5ca..dcabf2f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysPostServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.pusong.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -6,23 +6,23 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.system.domain.SysDept; -import org.dromara.system.domain.SysPost; -import org.dromara.system.domain.SysUserPost; -import org.dromara.system.domain.bo.SysPostBo; -import org.dromara.system.domain.vo.SysPostVo; -import org.dromara.system.mapper.SysDeptMapper; -import org.dromara.system.mapper.SysPostMapper; -import org.dromara.system.mapper.SysUserPostMapper; -import org.dromara.system.service.ISysPostService; +import com.pusong.common.core.constant.UserConstants; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.utils.MapstructUtils; +import com.pusong.common.core.utils.StreamUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.mybatis.helper.DataBaseHelper; +import com.pusong.system.domain.SysDept; +import com.pusong.system.domain.SysPost; +import com.pusong.system.domain.SysUserPost; +import com.pusong.system.domain.bo.SysPostBo; +import com.pusong.system.domain.vo.SysPostVo; +import com.pusong.system.mapper.SysDeptMapper; +import com.pusong.system.mapper.SysPostMapper; +import com.pusong.system.mapper.SysUserPostMapper; +import com.pusong.system.service.ISysPostService; import org.springframework.stereotype.Service; import java.util.Arrays; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysRoleServiceImpl.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysRoleServiceImpl.java index abd294f..2495341 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysRoleServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.pusong.system.service.impl; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.stp.StpUtil; @@ -12,27 +12,27 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysRole; -import org.dromara.system.domain.SysRoleDept; -import org.dromara.system.domain.SysRoleMenu; -import org.dromara.system.domain.SysUserRole; -import org.dromara.system.domain.bo.SysRoleBo; -import org.dromara.system.domain.vo.SysRoleVo; -import org.dromara.system.mapper.SysRoleDeptMapper; -import org.dromara.system.mapper.SysRoleMapper; -import org.dromara.system.mapper.SysRoleMenuMapper; -import org.dromara.system.mapper.SysUserRoleMapper; -import org.dromara.system.service.ISysRoleService; +import com.pusong.common.core.constant.TenantConstants; +import com.pusong.common.core.constant.UserConstants; +import com.pusong.common.core.domain.model.LoginUser; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.utils.MapstructUtils; +import com.pusong.common.core.utils.StreamUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.satoken.utils.LoginHelper; +import com.pusong.system.domain.SysRole; +import com.pusong.system.domain.SysRoleDept; +import com.pusong.system.domain.SysRoleMenu; +import com.pusong.system.domain.SysUserRole; +import com.pusong.system.domain.bo.SysRoleBo; +import com.pusong.system.domain.vo.SysRoleVo; +import com.pusong.system.mapper.SysRoleDeptMapper; +import com.pusong.system.mapper.SysRoleMapper; +import com.pusong.system.mapper.SysRoleMenuMapper; +import com.pusong.system.mapper.SysUserRoleMapper; +import com.pusong.system.service.ISysRoleService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysSensitiveServiceImpl.java similarity index 81% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysSensitiveServiceImpl.java index 5f4d121..7b23fb6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysSensitiveServiceImpl.java @@ -1,10 +1,10 @@ -package org.dromara.system.service.impl; +package com.pusong.system.service.impl; import cn.dev33.satoken.stp.StpUtil; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.sensitive.core.SensitiveService; -import org.dromara.common.tenant.helper.TenantHelper; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.satoken.utils.LoginHelper; +import com.pusong.common.sensitive.core.SensitiveService; +import com.pusong.common.tenant.helper.TenantHelper; import org.springframework.stereotype.Service; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysSocialServiceImpl.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysSocialServiceImpl.java index 9c54cbc..b002d0b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysSocialServiceImpl.java @@ -1,15 +1,15 @@ -package org.dromara.system.service.impl; +package com.pusong.system.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.system.domain.SysSocial; -import org.dromara.system.domain.bo.SysSocialBo; -import org.dromara.system.domain.vo.SysSocialVo; -import org.dromara.system.mapper.SysSocialMapper; -import org.dromara.system.service.ISysSocialService; +import com.pusong.common.core.utils.MapstructUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.system.domain.SysSocial; +import com.pusong.system.domain.bo.SysSocialBo; +import com.pusong.system.domain.vo.SysSocialVo; +import com.pusong.system.mapper.SysSocialMapper; +import com.pusong.system.service.ISysSocialService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysTenantPackageServiceImpl.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysTenantPackageServiceImpl.java index f7f8d46..db3679f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysTenantPackageServiceImpl.java @@ -1,23 +1,23 @@ -package org.dromara.system.service.impl; +package com.pusong.system.service.impl; 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 lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.SysTenant; -import org.dromara.system.domain.SysTenantPackage; -import org.dromara.system.domain.bo.SysTenantPackageBo; -import org.dromara.system.domain.vo.SysTenantPackageVo; -import org.dromara.system.mapper.SysTenantMapper; -import org.dromara.system.mapper.SysTenantPackageMapper; -import org.dromara.system.service.ISysTenantPackageService; +import com.pusong.common.core.constant.TenantConstants; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.utils.MapstructUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.system.domain.SysTenant; +import com.pusong.system.domain.SysTenantPackage; +import com.pusong.system.domain.bo.SysTenantPackageBo; +import com.pusong.system.domain.vo.SysTenantPackageVo; +import com.pusong.system.mapper.SysTenantMapper; +import com.pusong.system.mapper.SysTenantPackageMapper; +import com.pusong.system.service.ISysTenantPackageService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysTenantServiceImpl.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysTenantServiceImpl.java index 516149f..c41fec5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysTenantServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.pusong.system.service.impl; import cn.dev33.satoken.secure.BCrypt; import cn.hutool.core.convert.Convert; @@ -7,21 +7,23 @@ import cn.hutool.core.util.RandomUtil; 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.pusong.system.domain.*; +import com.pusong.system.mapper.*; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.*; -import org.dromara.system.domain.bo.SysTenantBo; -import org.dromara.system.domain.vo.SysTenantVo; -import org.dromara.system.mapper.*; -import org.dromara.system.service.ISysTenantService; +import com.pusong.common.core.constant.CacheNames; +import com.pusong.common.core.constant.Constants; +import com.pusong.common.core.constant.TenantConstants; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.utils.MapstructUtils; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.system.domain.*; +import com.pusong.system.domain.bo.SysTenantBo; +import com.pusong.system.domain.vo.SysTenantVo; +import com.pusong.system.mapper.*; +import com.pusong.system.service.ISysTenantService; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysUserServiceImpl.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java rename to pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysUserServiceImpl.java index d8f481d..0f61dab 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysUserServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.pusong.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -11,32 +11,33 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.pusong.system.mapper.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.domain.dto.UserDTO; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.UserService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysDept; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.SysUserPost; -import org.dromara.system.domain.SysUserRole; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.SysPostVo; -import org.dromara.system.domain.vo.SysRoleVo; -import org.dromara.system.domain.vo.SysUserExportVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.mapper.*; -import org.dromara.system.service.ISysUserService; +import com.pusong.common.core.constant.CacheNames; +import com.pusong.common.core.constant.UserConstants; +import com.pusong.common.core.domain.dto.UserDTO; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.service.UserService; +import com.pusong.common.core.utils.MapstructUtils; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.StreamUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.mybatis.helper.DataBaseHelper; +import com.pusong.common.satoken.utils.LoginHelper; +import com.pusong.system.domain.SysDept; +import com.pusong.system.domain.SysUser; +import com.pusong.system.domain.SysUserPost; +import com.pusong.system.domain.SysUserRole; +import com.pusong.system.domain.bo.SysUserBo; +import com.pusong.system.domain.vo.SysPostVo; +import com.pusong.system.domain.vo.SysRoleVo; +import com.pusong.system.domain.vo.SysUserExportVo; +import com.pusong.system.domain.vo.SysUserVo; +import com.pusong.system.mapper.*; +import com.pusong.system.service.ISysUserService; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/package-info.md b/pusong-modules/pusong-system/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/package-info.md rename to pusong-modules/pusong-system/src/main/resources/mapper/package-info.md diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysClientMapper.xml b/pusong-modules/pusong-system/src/main/resources/mapper/system/SysClientMapper.xml similarity index 72% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysClientMapper.xml rename to pusong-modules/pusong-system/src/main/resources/mapper/system/SysClientMapper.xml index fd150ad..2c5c7af 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysClientMapper.xml +++ b/pusong-modules/pusong-system/src/main/resources/mapper/system/SysClientMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/pusong-modules/pusong-system/src/main/resources/mapper/system/SysConfigMapper.xml similarity index 73% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml rename to pusong-modules/pusong-system/src/main/resources/mapper/system/SysConfigMapper.xml index e542a10..0a964c3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/pusong-modules/pusong-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/pusong-modules/pusong-system/src/main/resources/mapper/system/SysDeptMapper.xml similarity index 88% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml rename to pusong-modules/pusong-system/src/main/resources/mapper/system/SysDeptMapper.xml index 6ad866f..82d5d94 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/pusong-modules/pusong-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/pusong-modules/pusong-system/src/main/resources/mapper/system/SysNoticeMapper.xml similarity index 73% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml rename to pusong-modules/pusong-system/src/main/resources/mapper/system/SysNoticeMapper.xml index 43f494d..4e6824b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/pusong-modules/pusong-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/pusong-modules/pusong-system/src/main/resources/mapper/system/SysOperLogMapper.xml similarity index 73% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml rename to pusong-modules/pusong-system/src/main/resources/mapper/system/SysOperLogMapper.xml index 5ef14ee..0b662bc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/pusong-modules/pusong-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml b/pusong-modules/pusong-system/src/main/resources/mapper/system/SysOssConfigMapper.xml similarity index 70% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml rename to pusong-modules/pusong-system/src/main/resources/mapper/system/SysOssConfigMapper.xml index 8c2c080..60780de 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml +++ b/pusong-modules/pusong-system/src/main/resources/mapper/system/SysOssConfigMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml b/pusong-modules/pusong-system/src/main/resources/mapper/system/SysOssMapper.xml similarity index 72% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml rename to pusong-modules/pusong-system/src/main/resources/mapper/system/SysOssMapper.xml index d9b25bd..6438134 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml +++ b/pusong-modules/pusong-system/src/main/resources/mapper/system/SysOssMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/pusong-modules/pusong-system/src/main/resources/mapper/system/SysPostMapper.xml similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml rename to pusong-modules/pusong-system/src/main/resources/mapper/system/SysPostMapper.xml index 322403f..0b583dd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/pusong-modules/pusong-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -2,9 +2,9 @@ - + - + select u.user_id from sys_user u diff --git a/ruoyi-modules/ruoyi-workflow/README.md b/pusong-modules/pusong-workflow/README.md similarity index 100% rename from ruoyi-modules/ruoyi-workflow/README.md rename to pusong-modules/pusong-workflow/README.md diff --git a/ruoyi-modules/ruoyi-workflow/pom.xml b/pusong-modules/pusong-workflow/pom.xml similarity index 67% rename from ruoyi-modules/ruoyi-workflow/pom.xml rename to pusong-modules/pusong-workflow/pom.xml index 9ed4097..5d75c8d 100644 --- a/ruoyi-modules/ruoyi-workflow/pom.xml +++ b/pusong-modules/pusong-workflow/pom.xml @@ -3,14 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-modules + com.pusong + pusong-modules ${revision} ../pom.xml 4.0.0 jar - ruoyi-workflow + pusong-workflow 工作流模块 @@ -67,51 +67,51 @@ - org.dromara - ruoyi-common-websocket + com.pusong + pusong-common-websocket - org.dromara - ruoyi-common-mail + com.pusong + pusong-common-mail - org.dromara - ruoyi-common-sms + com.pusong + pusong-common-sms - org.dromara - ruoyi-common-mybatis + com.pusong + pusong-common-mybatis - org.dromara - ruoyi-common-web + com.pusong + pusong-common-web - org.dromara - ruoyi-common-log + com.pusong + pusong-common-log - org.dromara - ruoyi-common-idempotent + com.pusong + pusong-common-idempotent - org.dromara - ruoyi-common-excel + com.pusong + pusong-common-excel - org.dromara - ruoyi-common-translation + com.pusong + pusong-common-translation - org.dromara - ruoyi-common-tenant + com.pusong + pusong-common-tenant - org.dromara - ruoyi-common-security + com.pusong + pusong-common-security diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/common/constant/FlowConstant.java similarity index 98% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/common/constant/FlowConstant.java index c3fcafa..5f2b436 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/common/constant/FlowConstant.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.common.constant; +package com.pusong.workflow.common.constant; /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/FormTypeEnum.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/common/enums/FormTypeEnum.java similarity index 95% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/FormTypeEnum.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/common/enums/FormTypeEnum.java index 083ab7b..1c4d842 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/FormTypeEnum.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/common/enums/FormTypeEnum.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.common.enums; +package com.pusong.workflow.common.enums; import cn.hutool.core.util.StrUtil; import lombok.AllArgsConstructor; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/common/enums/MessageTypeEnum.java similarity index 96% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/common/enums/MessageTypeEnum.java index a282958..b12e5fe 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/common/enums/MessageTypeEnum.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.common.enums; +package com.pusong.workflow.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/common/enums/TaskStatusEnum.java similarity index 97% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/common/enums/TaskStatusEnum.java index 7b2f55c..57bba7d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/common/enums/TaskStatusEnum.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.common.enums; +package com.pusong.workflow.common.enums; import cn.hutool.core.util.StrUtil; import lombok.AllArgsConstructor; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/controller/ActModelController.java similarity index 85% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/controller/ActModelController.java index 3332f86..aaacba6 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/controller/ActModelController.java @@ -1,21 +1,21 @@ -package org.dromara.workflow.controller; +package com.pusong.workflow.controller; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.workflow.domain.bo.ModelBo; -import org.dromara.workflow.domain.vo.ModelVo; -import org.dromara.workflow.service.IActModelService; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.core.validate.EditGroup; +import com.pusong.common.idempotent.annotation.RepeatSubmit; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.web.core.BaseController; +import com.pusong.workflow.domain.bo.ModelBo; +import com.pusong.workflow.domain.vo.ModelVo; +import com.pusong.workflow.service.IActModelService; import org.flowable.engine.RepositoryService; import org.flowable.engine.repository.Model; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/controller/ActProcessDefinitionController.java similarity index 89% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/controller/ActProcessDefinitionController.java index 5198bd1..0db5856 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/controller/ActProcessDefinitionController.java @@ -1,19 +1,19 @@ -package org.dromara.workflow.controller; +package com.pusong.workflow.controller; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.workflow.domain.bo.ProcessDefinitionBo; -import org.dromara.workflow.domain.vo.ProcessDefinitionVo; -import org.dromara.workflow.service.IActProcessDefinitionService; +import com.pusong.common.core.domain.R; +import com.pusong.common.idempotent.annotation.RepeatSubmit; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.web.core.BaseController; +import com.pusong.workflow.domain.bo.ProcessDefinitionBo; +import com.pusong.workflow.domain.vo.ProcessDefinitionVo; +import com.pusong.workflow.service.IActProcessDefinitionService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessInstanceController.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/controller/ActProcessInstanceController.java similarity index 86% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessInstanceController.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/controller/ActProcessInstanceController.java index 931b9f5..550e216 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessInstanceController.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/controller/ActProcessInstanceController.java @@ -1,22 +1,22 @@ -package org.dromara.workflow.controller; +package com.pusong.workflow.controller; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.workflow.domain.bo.ProcessInstanceBo; -import org.dromara.workflow.domain.bo.ProcessInvalidBo; -import org.dromara.workflow.domain.bo.TaskUrgingBo; -import org.dromara.workflow.domain.vo.ActHistoryInfoVo; -import org.dromara.workflow.domain.vo.ProcessInstanceVo; -import org.dromara.workflow.service.IActProcessInstanceService; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.idempotent.annotation.RepeatSubmit; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.web.core.BaseController; +import com.pusong.workflow.domain.bo.ProcessInstanceBo; +import com.pusong.workflow.domain.bo.ProcessInvalidBo; +import com.pusong.workflow.domain.bo.TaskUrgingBo; +import com.pusong.workflow.domain.vo.ActHistoryInfoVo; +import com.pusong.workflow.domain.vo.ProcessInstanceVo; +import com.pusong.workflow.service.IActProcessInstanceService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/controller/ActTaskController.java similarity index 90% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/controller/ActTaskController.java index 75f9d9b..05a2767 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/controller/ActTaskController.java @@ -1,25 +1,26 @@ -package org.dromara.workflow.controller; +package com.pusong.workflow.controller; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; +import com.pusong.workflow.domain.bo.*; import jakarta.validation.constraints.NotBlank; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.workflow.domain.WfTaskBackNode; -import org.dromara.workflow.domain.bo.*; -import org.dromara.workflow.domain.vo.TaskVo; -import org.dromara.workflow.domain.vo.VariableVo; -import org.dromara.workflow.service.IActTaskService; -import org.dromara.workflow.service.IWfTaskBackNodeService; -import org.dromara.workflow.utils.QueryUtils; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.idempotent.annotation.RepeatSubmit; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.satoken.utils.LoginHelper; +import com.pusong.common.web.core.BaseController; +import com.pusong.workflow.domain.WfTaskBackNode; +import com.pusong.workflow.domain.bo.*; +import com.pusong.workflow.domain.vo.TaskVo; +import com.pusong.workflow.domain.vo.VariableVo; +import com.pusong.workflow.service.IActTaskService; +import com.pusong.workflow.service.IWfTaskBackNodeService; +import com.pusong.workflow.utils.QueryUtils; import org.flowable.engine.TaskService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/SysUserLeaveController.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/controller/SysUserLeaveController.java similarity index 79% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/SysUserLeaveController.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/controller/SysUserLeaveController.java index 02d1d96..dd84b62 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/SysUserLeaveController.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/controller/SysUserLeaveController.java @@ -1,23 +1,23 @@ -package org.dromara.workflow.controller; +package com.pusong.workflow.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.workflow.domain.bo.SysUserLeaveBo; -import org.dromara.workflow.domain.vo.SysUserLeaveVo; -import org.dromara.workflow.service.ISysUserLeaveService; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.core.validate.EditGroup; +import com.pusong.common.excel.utils.ExcelUtil; +import com.pusong.common.idempotent.annotation.RepeatSubmit; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.web.core.BaseController; +import com.pusong.workflow.domain.bo.SysUserLeaveBo; +import com.pusong.workflow.domain.vo.SysUserLeaveVo; +import com.pusong.workflow.service.ISysUserLeaveService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfCategoryController.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/controller/WfCategoryController.java similarity index 82% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfCategoryController.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/controller/WfCategoryController.java index 8dced89..86efd6f 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfCategoryController.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/controller/WfCategoryController.java @@ -1,21 +1,21 @@ -package org.dromara.workflow.controller; +package com.pusong.workflow.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.web.core.BaseController; -import org.dromara.workflow.domain.bo.WfCategoryBo; -import org.dromara.workflow.domain.vo.WfCategoryVo; -import org.dromara.workflow.service.IWfCategoryService; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.core.validate.EditGroup; +import com.pusong.common.excel.utils.ExcelUtil; +import com.pusong.common.idempotent.annotation.RepeatSubmit; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.common.web.core.BaseController; +import com.pusong.workflow.domain.bo.WfCategoryBo; +import com.pusong.workflow.domain.vo.WfCategoryVo; +import com.pusong.workflow.service.IWfCategoryService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/controller/WfDefinitionConfigController.java similarity index 81% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/controller/WfDefinitionConfigController.java index 176aba2..2238b25 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/controller/WfDefinitionConfigController.java @@ -1,20 +1,20 @@ -package org.dromara.workflow.controller; +package com.pusong.workflow.controller; import java.util.List; import lombok.RequiredArgsConstructor; import jakarta.validation.constraints.*; -import org.dromara.workflow.domain.bo.WfDefinitionConfigBo; +import com.pusong.workflow.domain.bo.WfDefinitionConfigBo; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.workflow.domain.vo.WfDefinitionConfigVo; -import org.dromara.workflow.service.IWfDefinitionConfigService; +import com.pusong.common.idempotent.annotation.RepeatSubmit; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.web.core.BaseController; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.workflow.domain.vo.WfDefinitionConfigVo; +import com.pusong.workflow.service.IWfDefinitionConfigService; /** * 流程定义配置 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfFormManageController.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/controller/WfFormManageController.java similarity index 80% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfFormManageController.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/controller/WfFormManageController.java index 198e233..57ca037 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfFormManageController.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/controller/WfFormManageController.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.controller; +package com.pusong.workflow.controller; import java.util.List; @@ -8,19 +8,19 @@ import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.workflow.domain.vo.WfFormManageVo; -import org.dromara.workflow.domain.bo.WfFormManageBo; -import org.dromara.workflow.service.IWfFormManageService; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.idempotent.annotation.RepeatSubmit; +import com.pusong.common.log.annotation.Log; +import com.pusong.common.web.core.BaseController; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.core.domain.R; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.core.validate.EditGroup; +import com.pusong.common.log.enums.BusinessType; +import com.pusong.common.excel.utils.ExcelUtil; +import com.pusong.workflow.domain.vo.WfFormManageVo; +import com.pusong.workflow.domain.bo.WfFormManageBo; +import com.pusong.workflow.service.IWfFormManageService; +import com.pusong.common.mybatis.core.page.TableDataInfo; /** * 表单管理 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/ActHiProcinst.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/ActHiProcinst.java similarity index 98% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/ActHiProcinst.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/ActHiProcinst.java index e87fb92..e616d20 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/ActHiProcinst.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/ActHiProcinst.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain; +package com.pusong.workflow.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/ActHiTaskinst.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/ActHiTaskinst.java similarity index 98% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/ActHiTaskinst.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/ActHiTaskinst.java index abc17b5..fd4539a 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/ActHiTaskinst.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/ActHiTaskinst.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain; +package com.pusong.workflow.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/SysUserLeave.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/SysUserLeave.java similarity index 90% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/SysUserLeave.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/SysUserLeave.java index 51a73a2..526332f 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/SysUserLeave.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/SysUserLeave.java @@ -1,10 +1,10 @@ -package org.dromara.workflow.domain; +package com.pusong.workflow.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.pusong.common.mybatis.core.domain.BaseEntity; import java.io.Serial; import java.util.Date; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfCategory.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/WfCategory.java similarity index 89% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfCategory.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/WfCategory.java index 94a7cf5..856c726 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfCategory.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/WfCategory.java @@ -1,10 +1,10 @@ -package org.dromara.workflow.domain; +package com.pusong.workflow.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.tenant.core.TenantEntity; +import com.pusong.common.tenant.core.TenantEntity; import java.io.Serial; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfDefinitionConfig.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/WfDefinitionConfig.java similarity index 89% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfDefinitionConfig.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/WfDefinitionConfig.java index 11dcaa0..b45bbf8 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfDefinitionConfig.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/WfDefinitionConfig.java @@ -1,6 +1,6 @@ -package org.dromara.workflow.domain; +package com.pusong.workflow.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.pusong.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfFormManage.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/WfFormManage.java similarity index 89% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfFormManage.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/WfFormManage.java index 47f0d7a..152a739 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfFormManage.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/WfFormManage.java @@ -1,6 +1,6 @@ -package org.dromara.workflow.domain; +package com.pusong.workflow.domain; -import org.dromara.common.tenant.core.TenantEntity; +import com.pusong.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfNodeConfig.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/WfNodeConfig.java similarity index 90% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfNodeConfig.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/WfNodeConfig.java index 999425f..6f81ee8 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfNodeConfig.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/WfNodeConfig.java @@ -1,6 +1,6 @@ -package org.dromara.workflow.domain; +package com.pusong.workflow.domain; -import org.dromara.common.tenant.core.TenantEntity; +import com.pusong.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfTaskBackNode.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/WfTaskBackNode.java similarity index 91% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfTaskBackNode.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/WfTaskBackNode.java index 6f59727..24ef2e7 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfTaskBackNode.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/WfTaskBackNode.java @@ -1,10 +1,10 @@ -package org.dromara.workflow.domain; +package com.pusong.workflow.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.tenant.core.TenantEntity; +import com.pusong.common.tenant.core.TenantEntity; import java.io.Serial; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/AddMultiBo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/AddMultiBo.java similarity index 89% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/AddMultiBo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/AddMultiBo.java index 320ec64..1d1318d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/AddMultiBo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/AddMultiBo.java @@ -1,9 +1,9 @@ -package org.dromara.workflow.domain.bo; +package com.pusong.workflow.domain.bo; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; +import com.pusong.common.core.validate.AddGroup; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/BackProcessBo.java similarity index 89% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/BackProcessBo.java index d0f4369..b2c16f5 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/BackProcessBo.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.domain.bo; +package com.pusong.workflow.domain.bo; import jakarta.validation.constraints.NotBlank; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; +import com.pusong.common.core.validate.AddGroup; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/CompleteTaskBo.java similarity index 89% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/CompleteTaskBo.java index 0623905..78a08cc 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/CompleteTaskBo.java @@ -1,9 +1,9 @@ -package org.dromara.workflow.domain.bo; +package com.pusong.workflow.domain.bo; +import com.pusong.workflow.domain.vo.WfCopy; import jakarta.validation.constraints.NotBlank; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.workflow.domain.vo.WfCopy; +import com.pusong.common.core.validate.AddGroup; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/DelegateBo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/DelegateBo.java similarity index 88% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/DelegateBo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/DelegateBo.java index a6846a6..35e9e30 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/DelegateBo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/DelegateBo.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.domain.bo; +package com.pusong.workflow.domain.bo; import jakarta.validation.constraints.NotBlank; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; +import com.pusong.common.core.validate.AddGroup; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/DeleteMultiBo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/DeleteMultiBo.java similarity index 92% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/DeleteMultiBo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/DeleteMultiBo.java index e533167..a3c551e 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/DeleteMultiBo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/DeleteMultiBo.java @@ -1,9 +1,9 @@ -package org.dromara.workflow.domain.bo; +package com.pusong.workflow.domain.bo; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; +import com.pusong.common.core.validate.AddGroup; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/ModelBo.java similarity index 87% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/ModelBo.java index efe9acd..9868f92 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/ModelBo.java @@ -1,11 +1,11 @@ -package org.dromara.workflow.domain.bo; +package com.pusong.workflow.domain.bo; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.workflow.common.constant.FlowConstant; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.core.validate.EditGroup; +import com.pusong.workflow.common.constant.FlowConstant; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessDefinitionBo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/ProcessDefinitionBo.java similarity index 92% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessDefinitionBo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/ProcessDefinitionBo.java index 2025932..5147fa5 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessDefinitionBo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/ProcessDefinitionBo.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.bo; +package com.pusong.workflow.domain.bo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInstanceBo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/ProcessInstanceBo.java similarity index 93% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInstanceBo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/ProcessInstanceBo.java index 2833b3e..d498b5f 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInstanceBo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/ProcessInstanceBo.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.bo; +package com.pusong.workflow.domain.bo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInvalidBo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/ProcessInvalidBo.java similarity index 85% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInvalidBo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/ProcessInvalidBo.java index 41e51c2..175c052 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInvalidBo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/ProcessInvalidBo.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.domain.bo; +package com.pusong.workflow.domain.bo; import jakarta.validation.constraints.NotBlank; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; +import com.pusong.common.core.validate.AddGroup; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/StartProcessBo.java similarity index 92% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/StartProcessBo.java index 7af7935..c328c9d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/StartProcessBo.java @@ -1,9 +1,9 @@ -package org.dromara.workflow.domain.bo; +package com.pusong.workflow.domain.bo; import jakarta.validation.constraints.NotBlank; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; +import com.pusong.common.core.validate.AddGroup; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/SysUserLeaveBo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/SysUserLeaveBo.java similarity index 86% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/SysUserLeaveBo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/SysUserLeaveBo.java index 797e789..80cf71b 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/SysUserLeaveBo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/SysUserLeaveBo.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.bo; +package com.pusong.workflow.domain.bo; import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; @@ -6,10 +6,10 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.workflow.domain.SysUserLeave; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.core.validate.EditGroup; +import com.pusong.common.mybatis.core.domain.BaseEntity; +import com.pusong.workflow.domain.SysUserLeave; import java.util.Date; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/SysUserMultiBo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/SysUserMultiBo.java similarity index 92% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/SysUserMultiBo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/SysUserMultiBo.java index e4d99e4..666e15e 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/SysUserMultiBo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/SysUserMultiBo.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.bo; +package com.pusong.workflow.domain.bo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskBo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/TaskBo.java similarity index 92% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskBo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/TaskBo.java index 3037479..5f3f4db 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskBo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/TaskBo.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.bo; +package com.pusong.workflow.domain.bo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskUrgingBo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/TaskUrgingBo.java similarity index 92% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskUrgingBo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/TaskUrgingBo.java index 20856ef..78a1e56 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskUrgingBo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/TaskUrgingBo.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.bo; +package com.pusong.workflow.domain.bo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TerminationBo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/TerminationBo.java similarity index 84% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TerminationBo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/TerminationBo.java index 8f2206e..2ea4b97 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TerminationBo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/TerminationBo.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.domain.bo; +package com.pusong.workflow.domain.bo; import jakarta.validation.constraints.NotBlank; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; +import com.pusong.common.core.validate.AddGroup; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TransmitBo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/TransmitBo.java similarity index 87% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TransmitBo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/TransmitBo.java index 3eb6609..56ed6a5 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TransmitBo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/TransmitBo.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.domain.bo; +package com.pusong.workflow.domain.bo; import jakarta.validation.constraints.NotBlank; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; +import com.pusong.common.core.validate.AddGroup; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfCategoryBo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/WfCategoryBo.java similarity index 81% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfCategoryBo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/WfCategoryBo.java index 69608fd..3bca7f3 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfCategoryBo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/WfCategoryBo.java @@ -1,14 +1,14 @@ -package org.dromara.workflow.domain.bo; +package com.pusong.workflow.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.workflow.domain.WfCategory; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.core.validate.EditGroup; +import com.pusong.common.mybatis.core.domain.BaseEntity; +import com.pusong.workflow.domain.WfCategory; /** * 流程分类业务对象 wf_category diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfDefinitionConfigBo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/WfDefinitionConfigBo.java similarity index 82% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfDefinitionConfigBo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/WfDefinitionConfigBo.java index fac1770..cbc7cd8 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfDefinitionConfigBo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/WfDefinitionConfigBo.java @@ -1,9 +1,9 @@ -package org.dromara.workflow.domain.bo; +package com.pusong.workflow.domain.bo; -import org.dromara.workflow.domain.WfDefinitionConfig; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import com.pusong.workflow.domain.WfDefinitionConfig; +import com.pusong.common.mybatis.core.domain.BaseEntity; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfFormManageBo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/WfFormManageBo.java similarity index 81% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfFormManageBo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/WfFormManageBo.java index 8afc286..5bc6f64 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfFormManageBo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/WfFormManageBo.java @@ -1,9 +1,9 @@ -package org.dromara.workflow.domain.bo; +package com.pusong.workflow.domain.bo; -import org.dromara.workflow.domain.WfFormManage; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import com.pusong.workflow.domain.WfFormManage; +import com.pusong.common.mybatis.core.domain.BaseEntity; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfNodeConfigBo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/WfNodeConfigBo.java similarity index 84% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfNodeConfigBo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/WfNodeConfigBo.java index de518d3..f249fa0 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfNodeConfigBo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/bo/WfNodeConfigBo.java @@ -1,9 +1,9 @@ -package org.dromara.workflow.domain.bo; +package com.pusong.workflow.domain.bo; -import org.dromara.workflow.domain.WfNodeConfig; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import com.pusong.workflow.domain.WfNodeConfig; +import com.pusong.common.mybatis.core.domain.BaseEntity; +import com.pusong.common.core.validate.AddGroup; +import com.pusong.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ActHistoryInfoVo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/ActHistoryInfoVo.java similarity index 89% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ActHistoryInfoVo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/ActHistoryInfoVo.java index e4c1142..1e7959f 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ActHistoryInfoVo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/ActHistoryInfoVo.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.domain.vo; +package com.pusong.workflow.domain.vo; import lombok.Data; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; +import com.pusong.common.translation.annotation.Translation; +import com.pusong.common.translation.constant.TransConstant; import org.flowable.engine.task.Attachment; import java.io.Serial; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/GraphicInfoVo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/GraphicInfoVo.java similarity index 93% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/GraphicInfoVo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/GraphicInfoVo.java index 7636131..deedeb1 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/GraphicInfoVo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/GraphicInfoVo.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.vo; +package com.pusong.workflow.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ModelVo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/ModelVo.java similarity index 93% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ModelVo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/ModelVo.java index b2ce811..c2aa206 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ModelVo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/ModelVo.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.vo; +package com.pusong.workflow.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/MultiInstanceVo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/MultiInstanceVo.java similarity index 92% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/MultiInstanceVo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/MultiInstanceVo.java index b998396..4d16c74 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/MultiInstanceVo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/MultiInstanceVo.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.vo; +package com.pusong.workflow.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ParticipantVo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/ParticipantVo.java similarity index 95% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ParticipantVo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/ParticipantVo.java index c5876f6..f2aa209 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ParticipantVo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/ParticipantVo.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.vo; +package com.pusong.workflow.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessDefinitionVo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/ProcessDefinitionVo.java similarity index 96% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessDefinitionVo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/ProcessDefinitionVo.java index 034adbb..4acb944 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessDefinitionVo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/ProcessDefinitionVo.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.vo; +package com.pusong.workflow.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/ProcessInstanceVo.java similarity index 97% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/ProcessInstanceVo.java index ab3e7a1..62ffcdb 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/ProcessInstanceVo.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.vo; +package com.pusong.workflow.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/SysUserLeaveVo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/SysUserLeaveVo.java similarity index 93% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/SysUserLeaveVo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/SysUserLeaveVo.java index 815a4b4..ab931a6 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/SysUserLeaveVo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/SysUserLeaveVo.java @@ -1,10 +1,10 @@ -package org.dromara.workflow.domain.vo; +package com.pusong.workflow.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.workflow.domain.SysUserLeave; +import com.pusong.workflow.domain.SysUserLeave; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/TaskVo.java similarity index 93% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/TaskVo.java index 466e776..1c6efe9 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/TaskVo.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.domain.vo; +package com.pusong.workflow.domain.vo; import lombok.Data; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; +import com.pusong.common.translation.annotation.Translation; +import com.pusong.common.translation.constant.TransConstant; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/VariableVo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/VariableVo.java similarity index 89% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/VariableVo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/VariableVo.java index 6a26c82..8b6aac0 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/VariableVo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/VariableVo.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.vo; +package com.pusong.workflow.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCategoryVo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/WfCategoryVo.java similarity index 92% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCategoryVo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/WfCategoryVo.java index 362f646..41d5a0e 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCategoryVo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/WfCategoryVo.java @@ -1,10 +1,10 @@ -package org.dromara.workflow.domain.vo; +package com.pusong.workflow.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.workflow.domain.WfCategory; +import com.pusong.workflow.domain.WfCategory; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCopy.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/WfCopy.java similarity index 89% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCopy.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/WfCopy.java index 88a5a21..5194e11 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCopy.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/WfCopy.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.vo; +package com.pusong.workflow.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfDefinitionConfigVo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/WfDefinitionConfigVo.java similarity index 92% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfDefinitionConfigVo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/WfDefinitionConfigVo.java index 9c7b0d7..8c05b3c 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfDefinitionConfigVo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/WfDefinitionConfigVo.java @@ -1,6 +1,6 @@ -package org.dromara.workflow.domain.vo; +package com.pusong.workflow.domain.vo; -import org.dromara.workflow.domain.WfDefinitionConfig; +import com.pusong.workflow.domain.WfDefinitionConfig; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfFormManageVo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/WfFormManageVo.java similarity index 92% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfFormManageVo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/WfFormManageVo.java index 302df23..6de07ef 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfFormManageVo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/WfFormManageVo.java @@ -1,6 +1,6 @@ -package org.dromara.workflow.domain.vo; +package com.pusong.workflow.domain.vo; -import org.dromara.workflow.domain.WfFormManage; +import com.pusong.workflow.domain.WfFormManage; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfNodeConfigVo.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/WfNodeConfigVo.java similarity index 93% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfNodeConfigVo.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/WfNodeConfigVo.java index 89e9d9b..ba51a63 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfNodeConfigVo.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/domain/vo/WfNodeConfigVo.java @@ -1,6 +1,6 @@ -package org.dromara.workflow.domain.vo; +package com.pusong.workflow.domain.vo; -import org.dromara.workflow.domain.WfNodeConfig; +import com.pusong.workflow.domain.WfNodeConfig; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramCanvas.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/CustomDefaultProcessDiagramCanvas.java similarity index 99% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramCanvas.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/CustomDefaultProcessDiagramCanvas.java index 39fd9d3..c2d48c6 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramCanvas.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/CustomDefaultProcessDiagramCanvas.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.flowable; +package com.pusong.workflow.flowable; import org.flowable.bpmn.model.AssociationDirection; import org.flowable.image.impl.DefaultProcessDiagramCanvas; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramGenerator.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/CustomDefaultProcessDiagramGenerator.java similarity index 99% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramGenerator.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/CustomDefaultProcessDiagramGenerator.java index e4793a2..db47ebc 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramGenerator.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/CustomDefaultProcessDiagramGenerator.java @@ -11,7 +11,7 @@ * limitations under the License. */ -package org.dromara.workflow.flowable; +package com.pusong.workflow.flowable; import org.flowable.bpmn.model.Event; import org.flowable.bpmn.model.Process; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/AddSequenceMultiInstanceCmd.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/cmd/AddSequenceMultiInstanceCmd.java similarity index 93% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/AddSequenceMultiInstanceCmd.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/cmd/AddSequenceMultiInstanceCmd.java index 3cdfcf4..51c28f6 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/AddSequenceMultiInstanceCmd.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/cmd/AddSequenceMultiInstanceCmd.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.flowable.cmd; +package com.pusong.workflow.flowable.cmd; import cn.hutool.core.collection.CollUtil; import org.flowable.common.engine.impl.interceptor.Command; @@ -11,7 +11,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.dromara.workflow.common.constant.FlowConstant.NUMBER_OF_INSTANCES; +import static com.pusong.workflow.common.constant.FlowConstant.NUMBER_OF_INSTANCES; /** * 串行加签 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/AttachmentCmd.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/cmd/AttachmentCmd.java similarity index 90% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/AttachmentCmd.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/cmd/AttachmentCmd.java index 20a0a5f..eb9ad2e 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/AttachmentCmd.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/cmd/AttachmentCmd.java @@ -1,10 +1,10 @@ -package org.dromara.workflow.flowable.cmd; +package com.pusong.workflow.flowable.cmd; import cn.hutool.core.collection.CollUtil; -import org.dromara.common.core.domain.dto.OssDTO; -import org.dromara.common.core.service.OssService; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.satoken.utils.LoginHelper; +import com.pusong.common.core.domain.dto.OssDTO; +import com.pusong.common.core.service.OssService; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.satoken.utils.LoginHelper; import org.flowable.common.engine.impl.interceptor.Command; import org.flowable.common.engine.impl.interceptor.CommandContext; import org.flowable.engine.impl.persistence.entity.AttachmentEntity; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/DeleteExecutionCmd.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/cmd/DeleteExecutionCmd.java similarity index 96% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/DeleteExecutionCmd.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/cmd/DeleteExecutionCmd.java index 215d310..6685a9d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/DeleteExecutionCmd.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/cmd/DeleteExecutionCmd.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.flowable.cmd; +package com.pusong.workflow.flowable.cmd; import org.flowable.common.engine.impl.interceptor.Command; import org.flowable.common.engine.impl.interceptor.CommandContext; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/DeleteSequenceMultiInstanceCmd.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/cmd/DeleteSequenceMultiInstanceCmd.java similarity index 92% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/DeleteSequenceMultiInstanceCmd.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/cmd/DeleteSequenceMultiInstanceCmd.java index 6773eef..730ac95 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/DeleteSequenceMultiInstanceCmd.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/cmd/DeleteSequenceMultiInstanceCmd.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.flowable.cmd; +package com.pusong.workflow.flowable.cmd; import cn.hutool.core.util.ObjectUtil; import lombok.AllArgsConstructor; @@ -13,8 +13,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.dromara.workflow.common.constant.FlowConstant.LOOP_COUNTER; -import static org.dromara.workflow.common.constant.FlowConstant.NUMBER_OF_INSTANCES; +import static com.pusong.workflow.common.constant.FlowConstant.LOOP_COUNTER; +import static com.pusong.workflow.common.constant.FlowConstant.NUMBER_OF_INSTANCES; /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/ExecutionChildByExecutionIdCmd.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/cmd/ExecutionChildByExecutionIdCmd.java similarity index 93% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/ExecutionChildByExecutionIdCmd.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/cmd/ExecutionChildByExecutionIdCmd.java index 1f3088b..5d153a1 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/ExecutionChildByExecutionIdCmd.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/cmd/ExecutionChildByExecutionIdCmd.java @@ -1,6 +1,6 @@ -package org.dromara.workflow.flowable.cmd; +package com.pusong.workflow.flowable.cmd; -import org.dromara.common.core.utils.StreamUtils; +import com.pusong.common.core.utils.StreamUtils; import org.flowable.common.engine.impl.interceptor.Command; import org.flowable.common.engine.impl.interceptor.CommandContext; import org.flowable.engine.impl.persistence.entity.ExecutionEntity; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/UpdateBusinessStatusCmd.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/cmd/UpdateBusinessStatusCmd.java similarity index 92% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/UpdateBusinessStatusCmd.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/cmd/UpdateBusinessStatusCmd.java index 3ba120a..4d0fa32 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/UpdateBusinessStatusCmd.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/cmd/UpdateBusinessStatusCmd.java @@ -1,6 +1,6 @@ -package org.dromara.workflow.flowable.cmd; +package com.pusong.workflow.flowable.cmd; -import org.dromara.common.core.exception.ServiceException; +import com.pusong.common.core.exception.ServiceException; import org.flowable.common.engine.impl.interceptor.Command; import org.flowable.common.engine.impl.interceptor.CommandContext; import org.flowable.engine.impl.persistence.entity.HistoricProcessInstanceEntity; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/UpdateHiTaskInstCmd.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/cmd/UpdateHiTaskInstCmd.java similarity index 94% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/UpdateHiTaskInstCmd.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/cmd/UpdateHiTaskInstCmd.java index 42f6d1c..cf69339 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/UpdateHiTaskInstCmd.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/cmd/UpdateHiTaskInstCmd.java @@ -1,6 +1,6 @@ -package org.dromara.workflow.flowable.cmd; +package com.pusong.workflow.flowable.cmd; -import org.dromara.common.core.exception.ServiceException; +import com.pusong.common.core.exception.ServiceException; import org.flowable.common.engine.impl.interceptor.Command; import org.flowable.common.engine.impl.interceptor.CommandContext; import org.flowable.engine.impl.util.CommandContextUtil; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/config/FlowableConfig.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/config/FlowableConfig.java similarity index 90% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/config/FlowableConfig.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/config/FlowableConfig.java index 1494bf3..92e9005 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/config/FlowableConfig.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/config/FlowableConfig.java @@ -1,7 +1,7 @@ -package org.dromara.workflow.flowable.config; +package com.pusong.workflow.flowable.config; import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; -import org.dromara.workflow.flowable.handler.TaskTimeoutJobHandler; +import com.pusong.workflow.flowable.handler.TaskTimeoutJobHandler; import org.flowable.spring.SpringProcessEngineConfiguration; import org.flowable.spring.boot.EngineConfigurationConfigurer; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/config/GlobalFlowableListener.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/config/GlobalFlowableListener.java similarity index 94% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/config/GlobalFlowableListener.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/config/GlobalFlowableListener.java index 9bb971a..8183fda 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/config/GlobalFlowableListener.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/config/GlobalFlowableListener.java @@ -1,11 +1,11 @@ -package org.dromara.workflow.flowable.config; +package com.pusong.workflow.flowable.config; import cn.hutool.core.collection.CollUtil; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.workflow.common.enums.TaskStatusEnum; -import org.dromara.workflow.flowable.handler.TaskTimeoutJobHandler; -import org.dromara.workflow.utils.QueryUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.tenant.helper.TenantHelper; +import com.pusong.workflow.flowable.handler.TaskTimeoutJobHandler; +import com.pusong.workflow.common.enums.TaskStatusEnum; +import com.pusong.workflow.utils.QueryUtils; import org.flowable.bpmn.model.BoundaryEvent; import org.flowable.bpmn.model.BpmnModel; import org.flowable.bpmn.model.FlowElement; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/handler/FlowProcessEventHandler.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/handler/FlowProcessEventHandler.java similarity index 87% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/handler/FlowProcessEventHandler.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/handler/FlowProcessEventHandler.java index 69ae70a..beea072 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/handler/FlowProcessEventHandler.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/handler/FlowProcessEventHandler.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.flowable.handler; +package com.pusong.workflow.flowable.handler; -import org.dromara.common.core.domain.event.ProcessEvent; -import org.dromara.common.core.domain.event.ProcessTaskEvent; -import org.dromara.common.core.utils.SpringUtils; +import com.pusong.common.core.domain.event.ProcessEvent; +import com.pusong.common.core.domain.event.ProcessTaskEvent; +import com.pusong.common.core.utils.SpringUtils; import org.springframework.stereotype.Component; /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/handler/TaskTimeoutJobHandler.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/handler/TaskTimeoutJobHandler.java similarity index 92% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/handler/TaskTimeoutJobHandler.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/handler/TaskTimeoutJobHandler.java index 61c9388..8eeb19b 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/handler/TaskTimeoutJobHandler.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/flowable/handler/TaskTimeoutJobHandler.java @@ -1,6 +1,6 @@ -package org.dromara.workflow.flowable.handler; +package com.pusong.workflow.flowable.handler; -import org.dromara.workflow.common.enums.TaskStatusEnum; +import com.pusong.workflow.common.enums.TaskStatusEnum; import org.flowable.common.engine.impl.interceptor.CommandContext; import org.flowable.engine.TaskService; import org.flowable.engine.impl.jobexecutor.TimerEventHandler; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listening/leaveWorkFlowOutcome.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/listening/leaveWorkFlowOutcome.java similarity index 97% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listening/leaveWorkFlowOutcome.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/listening/leaveWorkFlowOutcome.java index c52a14d..6f7f254 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listening/leaveWorkFlowOutcome.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/listening/leaveWorkFlowOutcome.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.listening; +package com.pusong.workflow.listening; import org.flowable.engine.ProcessEngine; import org.flowable.engine.ProcessEngines; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/ActHiProcinstMapper.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/ActHiProcinstMapper.java similarity index 64% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/ActHiProcinstMapper.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/ActHiProcinstMapper.java index a3a41c9..00e34d5 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/ActHiProcinstMapper.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/ActHiProcinstMapper.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.mapper; +package com.pusong.workflow.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.workflow.domain.ActHiProcinst; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.workflow.domain.ActHiProcinst; /** * 流程实例Mapper接口 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/ActHiTaskinstMapper.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/ActHiTaskinstMapper.java similarity index 65% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/ActHiTaskinstMapper.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/ActHiTaskinstMapper.java index 63b394b..04bba42 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/ActHiTaskinstMapper.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/ActHiTaskinstMapper.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.mapper; +package com.pusong.workflow.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import org.dromara.workflow.domain.ActHiTaskinst; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.workflow.domain.ActHiTaskinst; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; /** * 流程历史任务Mapper接口 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/ActTaskMapper.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/ActTaskMapper.java similarity index 90% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/ActTaskMapper.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/ActTaskMapper.java index 63c5ecb..6b779dd 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/ActTaskMapper.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/ActTaskMapper.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.mapper; +package com.pusong.workflow.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.workflow.domain.vo.TaskVo; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.workflow.domain.vo.TaskVo; /** diff --git a/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/SysUserLeaveMapper.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/SysUserLeaveMapper.java new file mode 100644 index 0000000..02a2f9e --- /dev/null +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/SysUserLeaveMapper.java @@ -0,0 +1,15 @@ +package com.pusong.workflow.mapper; + +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.workflow.domain.SysUserLeave; +import com.pusong.workflow.domain.vo.SysUserLeaveVo; + +/** + * 请假Mapper接口 + * + * @author may + * @date 2023-07-21 + */ +public interface SysUserLeaveMapper extends BaseMapperPlus { + +} diff --git a/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/WfCategoryMapper.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/WfCategoryMapper.java new file mode 100644 index 0000000..cdf489d --- /dev/null +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/WfCategoryMapper.java @@ -0,0 +1,15 @@ +package com.pusong.workflow.mapper; + +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.workflow.domain.WfCategory; +import com.pusong.workflow.domain.vo.WfCategoryVo; + +/** + * 流程分类Mapper接口 + * + * @author may + * @date 2023-06-27 + */ +public interface WfCategoryMapper extends BaseMapperPlus { + +} diff --git a/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/WfDefinitionConfigMapper.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/WfDefinitionConfigMapper.java new file mode 100644 index 0000000..695cc10 --- /dev/null +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/WfDefinitionConfigMapper.java @@ -0,0 +1,15 @@ +package com.pusong.workflow.mapper; + +import com.pusong.workflow.domain.WfDefinitionConfig; +import com.pusong.workflow.domain.vo.WfDefinitionConfigVo; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 流程定义配置Mapper接口 + * + * @author may + * @date 2024-03-18 + */ +public interface WfDefinitionConfigMapper extends BaseMapperPlus { + +} diff --git a/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/WfFormManageMapper.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/WfFormManageMapper.java new file mode 100644 index 0000000..2a7dc36 --- /dev/null +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/WfFormManageMapper.java @@ -0,0 +1,15 @@ +package com.pusong.workflow.mapper; + +import com.pusong.workflow.domain.WfFormManage; +import com.pusong.workflow.domain.vo.WfFormManageVo; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 表单管理Mapper接口 + * + * @author may + * @date 2024-03-29 + */ +public interface WfFormManageMapper extends BaseMapperPlus { + +} diff --git a/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/WfNodeConfigMapper.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/WfNodeConfigMapper.java new file mode 100644 index 0000000..202e6b2 --- /dev/null +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/WfNodeConfigMapper.java @@ -0,0 +1,15 @@ +package com.pusong.workflow.mapper; + +import com.pusong.workflow.domain.WfNodeConfig; +import com.pusong.workflow.domain.vo.WfNodeConfigVo; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 节点配置Mapper接口 + * + * @author may + * @date 2024-03-30 + */ +public interface WfNodeConfigMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfTaskBackNodeMapper.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/WfTaskBackNodeMapper.java similarity index 54% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfTaskBackNodeMapper.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/WfTaskBackNodeMapper.java index 9b291fe..b49b618 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfTaskBackNodeMapper.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/mapper/WfTaskBackNodeMapper.java @@ -1,7 +1,7 @@ -package org.dromara.workflow.mapper; +package com.pusong.workflow.mapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.workflow.domain.WfTaskBackNode; +import com.pusong.common.mybatis.core.mapper.BaseMapperPlus; +import com.pusong.workflow.domain.WfTaskBackNode; /** * 节点驳回记录Mapper接口 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActHiProcinstService.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IActHiProcinstService.java similarity index 84% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActHiProcinstService.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IActHiProcinstService.java index e802c69..09e149c 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActHiProcinstService.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IActHiProcinstService.java @@ -1,7 +1,7 @@ -package org.dromara.workflow.service; +package com.pusong.workflow.service; -import org.dromara.workflow.domain.ActHiProcinst; +import com.pusong.workflow.domain.ActHiProcinst; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActHiTaskinstService.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IActHiTaskinstService.java similarity index 76% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActHiTaskinstService.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IActHiTaskinstService.java index ad286e2..46d703d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActHiTaskinstService.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IActHiTaskinstService.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.service; +package com.pusong.workflow.service; /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActModelService.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IActModelService.java similarity index 85% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActModelService.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IActModelService.java index 4a6d170..bc56357 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActModelService.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IActModelService.java @@ -1,10 +1,10 @@ -package org.dromara.workflow.service; +package com.pusong.workflow.service; import jakarta.servlet.http.HttpServletResponse; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.workflow.domain.bo.ModelBo; -import org.dromara.workflow.domain.vo.ModelVo; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.workflow.domain.bo.ModelBo; +import com.pusong.workflow.domain.vo.ModelVo; import org.flowable.engine.repository.Model; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessDefinitionService.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IActProcessDefinitionService.java similarity index 88% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessDefinitionService.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IActProcessDefinitionService.java index 5d00e41..f0e75f1 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessDefinitionService.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IActProcessDefinitionService.java @@ -1,9 +1,9 @@ -package org.dromara.workflow.service; +package com.pusong.workflow.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.workflow.domain.bo.ProcessDefinitionBo; -import org.dromara.workflow.domain.vo.ProcessDefinitionVo; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.workflow.domain.bo.ProcessDefinitionBo; +import com.pusong.workflow.domain.vo.ProcessDefinitionVo; import org.springframework.web.multipart.MultipartFile; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IActProcessInstanceService.java similarity index 86% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IActProcessInstanceService.java index ca3b6fb..e01ec77 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IActProcessInstanceService.java @@ -1,12 +1,12 @@ -package org.dromara.workflow.service; +package com.pusong.workflow.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.workflow.domain.bo.ProcessInstanceBo; -import org.dromara.workflow.domain.bo.ProcessInvalidBo; -import org.dromara.workflow.domain.bo.TaskUrgingBo; -import org.dromara.workflow.domain.vo.ActHistoryInfoVo; -import org.dromara.workflow.domain.vo.ProcessInstanceVo; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.workflow.domain.bo.ProcessInstanceBo; +import com.pusong.workflow.domain.bo.ProcessInvalidBo; +import com.pusong.workflow.domain.bo.TaskUrgingBo; +import com.pusong.workflow.domain.vo.ActHistoryInfoVo; +import com.pusong.workflow.domain.vo.ProcessInstanceVo; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IActTaskService.java similarity index 91% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IActTaskService.java index 8e9f763..d6b7db5 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IActTaskService.java @@ -1,10 +1,11 @@ -package org.dromara.workflow.service; +package com.pusong.workflow.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.workflow.domain.bo.*; -import org.dromara.workflow.domain.vo.TaskVo; -import org.dromara.workflow.domain.vo.VariableVo; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.workflow.domain.bo.*; +import com.pusong.workflow.domain.bo.*; +import com.pusong.workflow.domain.vo.TaskVo; +import com.pusong.workflow.domain.vo.VariableVo; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ISysUserLeaveService.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/ISysUserLeaveService.java similarity index 74% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ISysUserLeaveService.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/ISysUserLeaveService.java index e3e0015..13822cb 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ISysUserLeaveService.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/ISysUserLeaveService.java @@ -1,9 +1,9 @@ -package org.dromara.workflow.service; +package com.pusong.workflow.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.workflow.domain.bo.SysUserLeaveBo; -import org.dromara.workflow.domain.vo.SysUserLeaveVo; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.workflow.domain.bo.SysUserLeaveBo; +import com.pusong.workflow.domain.vo.SysUserLeaveVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfCategoryService.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IWfCategoryService.java similarity index 81% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfCategoryService.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IWfCategoryService.java index acf0aa2..5374dcb 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfCategoryService.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IWfCategoryService.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.service; +package com.pusong.workflow.service; -import org.dromara.workflow.domain.WfCategory; -import org.dromara.workflow.domain.bo.WfCategoryBo; -import org.dromara.workflow.domain.vo.WfCategoryVo; +import com.pusong.workflow.domain.WfCategory; +import com.pusong.workflow.domain.bo.WfCategoryBo; +import com.pusong.workflow.domain.vo.WfCategoryVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfDefinitionConfigService.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IWfDefinitionConfigService.java similarity index 91% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfDefinitionConfigService.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IWfDefinitionConfigService.java index fe5cf7a..3bc739d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfDefinitionConfigService.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IWfDefinitionConfigService.java @@ -1,7 +1,7 @@ -package org.dromara.workflow.service; +package com.pusong.workflow.service; -import org.dromara.workflow.domain.vo.WfDefinitionConfigVo; -import org.dromara.workflow.domain.bo.WfDefinitionConfigBo; +import com.pusong.workflow.domain.vo.WfDefinitionConfigVo; +import com.pusong.workflow.domain.bo.WfDefinitionConfigBo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfFormManageService.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IWfFormManageService.java similarity index 84% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfFormManageService.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IWfFormManageService.java index 2ca2264..df11ea2 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfFormManageService.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IWfFormManageService.java @@ -1,9 +1,9 @@ -package org.dromara.workflow.service; +package com.pusong.workflow.service; -import org.dromara.workflow.domain.vo.WfFormManageVo; -import org.dromara.workflow.domain.bo.WfFormManageBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.pusong.workflow.domain.vo.WfFormManageVo; +import com.pusong.workflow.domain.bo.WfFormManageBo; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.mybatis.core.page.PageQuery; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfNodeConfigService.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IWfNodeConfigService.java similarity index 87% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfNodeConfigService.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IWfNodeConfigService.java index 5e64d64..cf37734 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfNodeConfigService.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IWfNodeConfigService.java @@ -1,7 +1,7 @@ -package org.dromara.workflow.service; +package com.pusong.workflow.service; -import org.dromara.workflow.domain.WfNodeConfig; -import org.dromara.workflow.domain.vo.WfNodeConfigVo; +import com.pusong.workflow.domain.WfNodeConfig; +import com.pusong.workflow.domain.vo.WfNodeConfigVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfTaskBackNodeService.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IWfTaskBackNodeService.java similarity index 93% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfTaskBackNodeService.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IWfTaskBackNodeService.java index 97f9406..67ec7ed 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfTaskBackNodeService.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/IWfTaskBackNodeService.java @@ -1,7 +1,7 @@ -package org.dromara.workflow.service; +package com.pusong.workflow.service; -import org.dromara.workflow.domain.WfTaskBackNode; +import com.pusong.workflow.domain.WfTaskBackNode; import org.flowable.task.api.Task; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActHiProcinstServiceImpl.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/ActHiProcinstServiceImpl.java similarity index 82% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActHiProcinstServiceImpl.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/ActHiProcinstServiceImpl.java index 06d607b..eca308b 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActHiProcinstServiceImpl.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/ActHiProcinstServiceImpl.java @@ -1,12 +1,12 @@ -package org.dromara.workflow.service.impl; +package com.pusong.workflow.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.workflow.domain.ActHiProcinst; -import org.dromara.workflow.mapper.ActHiProcinstMapper; -import org.dromara.workflow.service.IActHiProcinstService; +import com.pusong.common.tenant.helper.TenantHelper; +import com.pusong.workflow.domain.ActHiProcinst; +import com.pusong.workflow.mapper.ActHiProcinstMapper; +import com.pusong.workflow.service.IActHiProcinstService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActHiTaskinstServiceImpl.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/ActHiTaskinstServiceImpl.java similarity index 73% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActHiTaskinstServiceImpl.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/ActHiTaskinstServiceImpl.java index 5548f22..1929ee7 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActHiTaskinstServiceImpl.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/ActHiTaskinstServiceImpl.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.service.impl; +package com.pusong.workflow.service.impl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import org.dromara.workflow.service.IActHiTaskinstService; +import com.pusong.workflow.service.IActHiTaskinstService; /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/ActModelServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/ActModelServiceImpl.java index d4f696b..54097ee 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/ActModelServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.service.impl; +package com.pusong.workflow.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Validator; @@ -14,21 +14,21 @@ import lombok.extern.slf4j.Slf4j; import org.apache.batik.transcoder.TranscoderInput; import org.apache.batik.transcoder.TranscoderOutput; import org.apache.batik.transcoder.image.PNGTranscoder; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.workflow.common.constant.FlowConstant; -import org.dromara.workflow.domain.WfNodeConfig; -import org.dromara.workflow.domain.bo.ModelBo; -import org.dromara.workflow.domain.bo.WfDefinitionConfigBo; -import org.dromara.workflow.domain.vo.ModelVo; -import org.dromara.workflow.domain.vo.WfDefinitionConfigVo; -import org.dromara.workflow.service.IActModelService; -import org.dromara.workflow.service.IWfDefinitionConfigService; -import org.dromara.workflow.service.IWfNodeConfigService; -import org.dromara.workflow.utils.ModelUtils; -import org.dromara.workflow.utils.QueryUtils; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.tenant.helper.TenantHelper; +import com.pusong.workflow.common.constant.FlowConstant; +import com.pusong.workflow.domain.WfNodeConfig; +import com.pusong.workflow.domain.bo.ModelBo; +import com.pusong.workflow.domain.bo.WfDefinitionConfigBo; +import com.pusong.workflow.domain.vo.ModelVo; +import com.pusong.workflow.domain.vo.WfDefinitionConfigVo; +import com.pusong.workflow.service.IActModelService; +import com.pusong.workflow.service.IWfDefinitionConfigService; +import com.pusong.workflow.service.IWfNodeConfigService; +import com.pusong.workflow.utils.ModelUtils; +import com.pusong.workflow.utils.QueryUtils; import org.flowable.bpmn.converter.BpmnXMLConverter; import org.flowable.bpmn.model.BpmnModel; import org.flowable.bpmn.model.Process; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/ActProcessDefinitionServiceImpl.java similarity index 94% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/ActProcessDefinitionServiceImpl.java index 59aa3cd..abbc641 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/ActProcessDefinitionServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.service.impl; +package com.pusong.workflow.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.codec.Base64; @@ -10,27 +10,27 @@ import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.workflow.common.constant.FlowConstant; -import org.dromara.workflow.domain.WfCategory; -import org.dromara.workflow.domain.WfDefinitionConfig; -import org.dromara.workflow.domain.WfNodeConfig; -import org.dromara.workflow.domain.bo.ProcessDefinitionBo; -import org.dromara.workflow.domain.bo.WfDefinitionConfigBo; -import org.dromara.workflow.domain.vo.ProcessDefinitionVo; -import org.dromara.workflow.domain.vo.WfDefinitionConfigVo; -import org.dromara.workflow.mapper.WfDefinitionConfigMapper; -import org.dromara.workflow.service.IActProcessDefinitionService; -import org.dromara.workflow.service.IWfCategoryService; -import org.dromara.workflow.service.IWfDefinitionConfigService; -import org.dromara.workflow.service.IWfNodeConfigService; -import org.dromara.workflow.utils.ModelUtils; -import org.dromara.workflow.utils.QueryUtils; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.utils.StreamUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.tenant.helper.TenantHelper; +import com.pusong.workflow.common.constant.FlowConstant; +import com.pusong.workflow.domain.WfCategory; +import com.pusong.workflow.domain.WfDefinitionConfig; +import com.pusong.workflow.domain.WfNodeConfig; +import com.pusong.workflow.domain.bo.ProcessDefinitionBo; +import com.pusong.workflow.domain.bo.WfDefinitionConfigBo; +import com.pusong.workflow.domain.vo.ProcessDefinitionVo; +import com.pusong.workflow.domain.vo.WfDefinitionConfigVo; +import com.pusong.workflow.mapper.WfDefinitionConfigMapper; +import com.pusong.workflow.service.IActProcessDefinitionService; +import com.pusong.workflow.service.IWfCategoryService; +import com.pusong.workflow.service.IWfDefinitionConfigService; +import com.pusong.workflow.service.IWfNodeConfigService; +import com.pusong.workflow.utils.ModelUtils; +import com.pusong.workflow.utils.QueryUtils; import org.flowable.bpmn.model.UserTask; import org.flowable.engine.ProcessMigrationService; import org.flowable.engine.RepositoryService; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/ActProcessInstanceServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/ActProcessInstanceServiceImpl.java index b833bcc..338e3b2 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/ActProcessInstanceServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.service.impl; +package com.pusong.workflow.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.codec.Base64; @@ -6,34 +6,35 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.ObjectUtil; +import com.pusong.workflow.domain.vo.*; +import com.pusong.workflow.flowable.CustomDefaultProcessDiagramGenerator; +import com.pusong.workflow.flowable.cmd.DeleteExecutionCmd; +import com.pusong.workflow.flowable.cmd.ExecutionChildByExecutionIdCmd; +import com.pusong.workflow.flowable.handler.FlowProcessEventHandler; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.UserService; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.workflow.common.constant.FlowConstant; -import org.dromara.common.core.enums.BusinessStatusEnum; -import org.dromara.workflow.common.enums.TaskStatusEnum; -import org.dromara.workflow.domain.ActHiProcinst; -import org.dromara.workflow.domain.bo.ProcessInstanceBo; -import org.dromara.workflow.domain.bo.ProcessInvalidBo; -import org.dromara.workflow.domain.bo.TaskUrgingBo; -import org.dromara.workflow.domain.vo.*; -import org.dromara.workflow.flowable.CustomDefaultProcessDiagramGenerator; -import org.dromara.workflow.flowable.cmd.DeleteExecutionCmd; -import org.dromara.workflow.flowable.cmd.ExecutionChildByExecutionIdCmd; -import org.dromara.workflow.flowable.handler.FlowProcessEventHandler; -import org.dromara.workflow.service.IActHiProcinstService; -import org.dromara.workflow.service.IActProcessInstanceService; -import org.dromara.workflow.service.IWfNodeConfigService; -import org.dromara.workflow.service.IWfTaskBackNodeService; -import org.dromara.workflow.utils.QueryUtils; -import org.dromara.workflow.utils.WorkflowUtils; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.service.UserService; +import com.pusong.common.core.utils.StreamUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.satoken.utils.LoginHelper; +import com.pusong.workflow.common.constant.FlowConstant; +import com.pusong.common.core.enums.BusinessStatusEnum; +import com.pusong.workflow.common.enums.TaskStatusEnum; +import com.pusong.workflow.domain.ActHiProcinst; +import com.pusong.workflow.domain.bo.ProcessInstanceBo; +import com.pusong.workflow.domain.bo.ProcessInvalidBo; +import com.pusong.workflow.domain.bo.TaskUrgingBo; +import com.pusong.workflow.domain.vo.*; +import com.pusong.workflow.service.IActHiProcinstService; +import com.pusong.workflow.service.IActProcessInstanceService; +import com.pusong.workflow.service.IWfNodeConfigService; +import com.pusong.workflow.service.IWfTaskBackNodeService; +import com.pusong.workflow.utils.QueryUtils; +import com.pusong.workflow.utils.WorkflowUtils; import org.flowable.bpmn.model.*; import org.flowable.engine.*; import org.flowable.engine.history.HistoricActivityInstance; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/ActTaskServiceImpl.java similarity index 96% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/ActTaskServiceImpl.java index 6fe0b4e..9320956 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/ActTaskServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.service.impl; +package com.pusong.workflow.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -6,37 +6,40 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.pusong.workflow.domain.bo.*; +import com.pusong.workflow.domain.vo.*; +import com.pusong.workflow.flowable.cmd.*; +import com.pusong.workflow.flowable.handler.FlowProcessEventHandler; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.dto.RoleDTO; -import org.dromara.common.core.domain.dto.UserDTO; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.OssService; -import org.dromara.common.core.service.UserService; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.workflow.common.constant.FlowConstant; -import org.dromara.common.core.enums.BusinessStatusEnum; -import org.dromara.workflow.common.enums.TaskStatusEnum; -import org.dromara.workflow.domain.ActHiTaskinst; -import org.dromara.workflow.domain.WfTaskBackNode; -import org.dromara.workflow.domain.bo.*; -import org.dromara.workflow.domain.vo.*; -import org.dromara.workflow.flowable.cmd.*; -import org.dromara.workflow.flowable.handler.FlowProcessEventHandler; -import org.dromara.workflow.mapper.ActHiTaskinstMapper; -import org.dromara.workflow.mapper.ActTaskMapper; -import org.dromara.workflow.service.IActTaskService; -import org.dromara.workflow.service.IWfDefinitionConfigService; -import org.dromara.workflow.service.IWfNodeConfigService; -import org.dromara.workflow.service.IWfTaskBackNodeService; -import org.dromara.workflow.utils.ModelUtils; -import org.dromara.workflow.utils.QueryUtils; -import org.dromara.workflow.utils.WorkflowUtils; +import com.pusong.common.core.domain.dto.RoleDTO; +import com.pusong.common.core.domain.dto.UserDTO; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.service.OssService; +import com.pusong.common.core.service.UserService; +import com.pusong.common.core.utils.StreamUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.satoken.utils.LoginHelper; +import com.pusong.common.tenant.helper.TenantHelper; +import com.pusong.workflow.common.constant.FlowConstant; +import com.pusong.common.core.enums.BusinessStatusEnum; +import com.pusong.workflow.common.enums.TaskStatusEnum; +import com.pusong.workflow.domain.ActHiTaskinst; +import com.pusong.workflow.domain.WfTaskBackNode; +import com.pusong.workflow.domain.bo.*; +import com.pusong.workflow.domain.vo.*; +import com.pusong.workflow.flowable.cmd.*; +import com.pusong.workflow.mapper.ActHiTaskinstMapper; +import com.pusong.workflow.mapper.ActTaskMapper; +import com.pusong.workflow.service.IActTaskService; +import com.pusong.workflow.service.IWfDefinitionConfigService; +import com.pusong.workflow.service.IWfNodeConfigService; +import com.pusong.workflow.service.IWfTaskBackNodeService; +import com.pusong.workflow.utils.ModelUtils; +import com.pusong.workflow.utils.QueryUtils; +import com.pusong.workflow.utils.WorkflowUtils; import org.flowable.common.engine.api.FlowableObjectNotFoundException; import org.flowable.common.engine.impl.identity.Authentication; import org.flowable.engine.*; @@ -59,7 +62,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.*; import java.util.stream.Collectors; -import static org.dromara.workflow.common.constant.FlowConstant.*; +import static com.pusong.workflow.common.constant.FlowConstant.*; /** * 任务 服务层实现 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/SysUserLeaveServiceImpl.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/SysUserLeaveServiceImpl.java similarity index 84% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/SysUserLeaveServiceImpl.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/SysUserLeaveServiceImpl.java index 690f1d1..05d3981 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/SysUserLeaveServiceImpl.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/SysUserLeaveServiceImpl.java @@ -1,25 +1,25 @@ -package org.dromara.workflow.service.impl; +package com.pusong.workflow.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.event.ProcessEvent; -import org.dromara.common.core.domain.event.ProcessTaskEvent; -import org.dromara.common.core.enums.BusinessStatusEnum; -import org.dromara.common.core.service.WorkflowService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.workflow.domain.SysUserLeave; -import org.dromara.workflow.domain.bo.SysUserLeaveBo; -import org.dromara.workflow.domain.vo.SysUserLeaveVo; -import org.dromara.workflow.mapper.SysUserLeaveMapper; -import org.dromara.workflow.service.ISysUserLeaveService; +import com.pusong.common.core.domain.event.ProcessEvent; +import com.pusong.common.core.domain.event.ProcessTaskEvent; +import com.pusong.common.core.enums.BusinessStatusEnum; +import com.pusong.common.core.service.WorkflowService; +import com.pusong.common.core.utils.MapstructUtils; +import com.pusong.common.core.utils.StreamUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.mybatis.core.domain.BaseEntity; +import com.pusong.common.mybatis.core.page.PageQuery; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.workflow.domain.SysUserLeave; +import com.pusong.workflow.domain.bo.SysUserLeaveBo; +import com.pusong.workflow.domain.vo.SysUserLeaveVo; +import com.pusong.workflow.mapper.SysUserLeaveMapper; +import com.pusong.workflow.service.ISysUserLeaveService; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfCategoryServiceImpl.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/WfCategoryServiceImpl.java similarity index 89% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfCategoryServiceImpl.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/WfCategoryServiceImpl.java index c5cb288..8ab38d8 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfCategoryServiceImpl.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/WfCategoryServiceImpl.java @@ -1,16 +1,16 @@ -package org.dromara.workflow.service.impl; +package com.pusong.workflow.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.workflow.domain.WfCategory; -import org.dromara.workflow.domain.bo.WfCategoryBo; -import org.dromara.workflow.domain.vo.WfCategoryVo; -import org.dromara.workflow.mapper.WfCategoryMapper; -import org.dromara.workflow.service.IWfCategoryService; -import org.dromara.workflow.utils.QueryUtils; +import com.pusong.common.core.utils.MapstructUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.workflow.domain.WfCategory; +import com.pusong.workflow.domain.bo.WfCategoryBo; +import com.pusong.workflow.domain.vo.WfCategoryVo; +import com.pusong.workflow.mapper.WfCategoryMapper; +import com.pusong.workflow.service.IWfCategoryService; +import com.pusong.workflow.utils.QueryUtils; import org.flowable.engine.RepositoryService; import org.flowable.engine.repository.Deployment; import org.flowable.engine.repository.Model; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfDefinitionConfigServiceImpl.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/WfDefinitionConfigServiceImpl.java similarity index 90% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfDefinitionConfigServiceImpl.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/WfDefinitionConfigServiceImpl.java index 9478825..6fac911 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfDefinitionConfigServiceImpl.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/WfDefinitionConfigServiceImpl.java @@ -1,15 +1,15 @@ -package org.dromara.workflow.service.impl; +package com.pusong.workflow.service.impl; import cn.hutool.core.collection.CollUtil; -import org.dromara.common.core.utils.MapstructUtils; +import com.pusong.common.core.utils.MapstructUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; -import org.dromara.workflow.domain.WfDefinitionConfig; -import org.dromara.workflow.domain.bo.WfDefinitionConfigBo; -import org.dromara.workflow.domain.vo.WfDefinitionConfigVo; -import org.dromara.workflow.service.IWfDefinitionConfigService; +import com.pusong.workflow.domain.WfDefinitionConfig; +import com.pusong.workflow.domain.bo.WfDefinitionConfigBo; +import com.pusong.workflow.domain.vo.WfDefinitionConfigVo; +import com.pusong.workflow.service.IWfDefinitionConfigService; import org.springframework.stereotype.Service; -import org.dromara.workflow.mapper.WfDefinitionConfigMapper; +import com.pusong.workflow.mapper.WfDefinitionConfigMapper; import org.springframework.transaction.annotation.Transactional; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfFormManageServiceImpl.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/WfFormManageServiceImpl.java similarity index 83% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfFormManageServiceImpl.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/WfFormManageServiceImpl.java index e0850d7..bc1a669 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfFormManageServiceImpl.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/WfFormManageServiceImpl.java @@ -1,20 +1,20 @@ -package org.dromara.workflow.service.impl; +package com.pusong.workflow.service.impl; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.pusong.common.core.utils.MapstructUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.mybatis.core.page.TableDataInfo; +import com.pusong.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; -import org.dromara.workflow.common.enums.FormTypeEnum; +import com.pusong.workflow.common.enums.FormTypeEnum; import org.springframework.stereotype.Service; -import org.dromara.workflow.domain.bo.WfFormManageBo; -import org.dromara.workflow.domain.vo.WfFormManageVo; -import org.dromara.workflow.domain.WfFormManage; -import org.dromara.workflow.mapper.WfFormManageMapper; -import org.dromara.workflow.service.IWfFormManageService; +import com.pusong.workflow.domain.bo.WfFormManageBo; +import com.pusong.workflow.domain.vo.WfFormManageVo; +import com.pusong.workflow.domain.WfFormManage; +import com.pusong.workflow.mapper.WfFormManageMapper; +import com.pusong.workflow.service.IWfFormManageService; import java.util.List; import java.util.Collection; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfNodeConfigServiceImpl.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/WfNodeConfigServiceImpl.java similarity index 83% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfNodeConfigServiceImpl.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/WfNodeConfigServiceImpl.java index c677102..2b69d44 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfNodeConfigServiceImpl.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/WfNodeConfigServiceImpl.java @@ -1,17 +1,17 @@ -package org.dromara.workflow.service.impl; +package com.pusong.workflow.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.workflow.domain.vo.WfFormManageVo; -import org.dromara.workflow.service.IWfFormManageService; +import com.pusong.common.core.utils.StreamUtils; +import com.pusong.workflow.domain.vo.WfFormManageVo; +import com.pusong.workflow.service.IWfFormManageService; import org.springframework.stereotype.Service; -import org.dromara.workflow.domain.vo.WfNodeConfigVo; -import org.dromara.workflow.domain.WfNodeConfig; -import org.dromara.workflow.mapper.WfNodeConfigMapper; -import org.dromara.workflow.service.IWfNodeConfigService; +import com.pusong.workflow.domain.vo.WfNodeConfigVo; +import com.pusong.workflow.domain.WfNodeConfig; +import com.pusong.workflow.mapper.WfNodeConfigMapper; +import com.pusong.workflow.service.IWfNodeConfigService; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfTaskBackNodeServiceImpl.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/WfTaskBackNodeServiceImpl.java similarity index 89% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfTaskBackNodeServiceImpl.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/WfTaskBackNodeServiceImpl.java index 55d9883..1f8038f 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfTaskBackNodeServiceImpl.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/WfTaskBackNodeServiceImpl.java @@ -1,18 +1,18 @@ -package org.dromara.workflow.service.impl; +package com.pusong.workflow.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.workflow.domain.WfTaskBackNode; -import org.dromara.workflow.domain.vo.MultiInstanceVo; -import org.dromara.workflow.mapper.WfTaskBackNodeMapper; -import org.dromara.workflow.service.IWfTaskBackNodeService; -import org.dromara.workflow.utils.WorkflowUtils; +import com.pusong.common.core.exception.ServiceException; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.satoken.utils.LoginHelper; +import com.pusong.workflow.domain.WfTaskBackNode; +import com.pusong.workflow.domain.vo.MultiInstanceVo; +import com.pusong.workflow.mapper.WfTaskBackNodeMapper; +import com.pusong.workflow.service.IWfTaskBackNodeService; +import com.pusong.workflow.utils.WorkflowUtils; import org.flowable.task.api.Task; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -20,8 +20,8 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; -import static org.dromara.workflow.common.constant.FlowConstant.MULTI_INSTANCE; -import static org.dromara.workflow.common.constant.FlowConstant.USER_TASK; +import static com.pusong.workflow.common.constant.FlowConstant.MULTI_INSTANCE; +import static com.pusong.workflow.common.constant.FlowConstant.USER_TASK; /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/WorkflowServiceImpl.java similarity index 90% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/WorkflowServiceImpl.java index 11f6ef1..f55d466 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/service/impl/WorkflowServiceImpl.java @@ -1,12 +1,12 @@ -package org.dromara.workflow.service.impl; +package com.pusong.workflow.service.impl; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.service.WorkflowService; -import org.dromara.workflow.domain.ActHiProcinst; -import org.dromara.workflow.service.IActHiProcinstService; -import org.dromara.workflow.service.IActProcessInstanceService; -import org.dromara.workflow.utils.WorkflowUtils; +import com.pusong.common.core.service.WorkflowService; +import com.pusong.workflow.domain.ActHiProcinst; +import com.pusong.workflow.service.IActHiProcinstService; +import com.pusong.workflow.service.IActProcessInstanceService; +import com.pusong.workflow.utils.WorkflowUtils; import org.flowable.engine.RuntimeService; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/ModelUtils.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/utils/ModelUtils.java similarity index 97% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/ModelUtils.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/utils/ModelUtils.java index 7c5377e..ee755c3 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/ModelUtils.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/utils/ModelUtils.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.utils; +package com.pusong.workflow.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; @@ -7,13 +7,13 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import com.pusong.workflow.domain.vo.MultiInstanceVo; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.workflow.domain.vo.MultiInstanceVo; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.StreamUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.json.utils.JsonUtils; import org.flowable.bpmn.converter.BpmnXMLConverter; import org.flowable.bpmn.model.*; import org.flowable.bpmn.model.Process; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/QueryUtils.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/utils/QueryUtils.java similarity index 97% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/QueryUtils.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/utils/QueryUtils.java index df928dc..7beb847 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/QueryUtils.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/utils/QueryUtils.java @@ -1,11 +1,11 @@ -package org.dromara.workflow.utils; +package com.pusong.workflow.utils; import cn.hutool.core.bean.BeanUtil; +import com.pusong.workflow.domain.vo.TaskVo; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.workflow.domain.vo.TaskVo; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.tenant.helper.TenantHelper; import org.flowable.engine.ProcessEngine; import org.flowable.engine.history.HistoricActivityInstanceQuery; import org.flowable.engine.history.HistoricProcessInstanceQuery; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/utils/WorkflowUtils.java similarity index 92% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java rename to pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/utils/WorkflowUtils.java index d7c4472..a80ff4d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java +++ b/pusong-modules/pusong-workflow/src/main/java/com/pusong/workflow/utils/WorkflowUtils.java @@ -1,30 +1,30 @@ -package org.dromara.workflow.utils; +package com.pusong.workflow.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.pusong.workflow.common.constant.FlowConstant; +import com.pusong.workflow.common.enums.MessageTypeEnum; +import com.pusong.workflow.common.enums.TaskStatusEnum; +import com.pusong.workflow.domain.ActHiTaskinst; +import com.pusong.workflow.domain.vo.MultiInstanceVo; +import com.pusong.workflow.domain.vo.ParticipantVo; +import com.pusong.workflow.flowable.cmd.UpdateHiTaskInstCmd; +import com.pusong.workflow.mapper.ActHiTaskinstMapper; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.domain.dto.RoleDTO; -import org.dromara.common.core.domain.dto.UserDTO; -import org.dromara.common.core.service.UserService; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mail.utils.MailUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.common.websocket.dto.WebSocketMessageDto; -import org.dromara.common.websocket.utils.WebSocketUtils; -import org.dromara.workflow.common.constant.FlowConstant; -import org.dromara.workflow.common.enums.MessageTypeEnum; -import org.dromara.workflow.common.enums.TaskStatusEnum; -import org.dromara.workflow.domain.ActHiTaskinst; -import org.dromara.workflow.domain.vo.MultiInstanceVo; -import org.dromara.workflow.domain.vo.ParticipantVo; -import org.dromara.workflow.flowable.cmd.UpdateHiTaskInstCmd; -import org.dromara.workflow.mapper.ActHiTaskinstMapper; +import com.pusong.common.core.domain.dto.RoleDTO; +import com.pusong.common.core.domain.dto.UserDTO; +import com.pusong.common.core.service.UserService; +import com.pusong.common.core.utils.SpringUtils; +import com.pusong.common.core.utils.StreamUtils; +import com.pusong.common.core.utils.StringUtils; +import com.pusong.common.mail.utils.MailUtils; +import com.pusong.common.satoken.utils.LoginHelper; +import com.pusong.common.tenant.helper.TenantHelper; +import com.pusong.common.websocket.dto.WebSocketMessageDto; +import com.pusong.common.websocket.utils.WebSocketUtils; import org.flowable.bpmn.model.BpmnModel; import org.flowable.bpmn.model.FlowNode; import org.flowable.common.engine.api.delegate.Expression; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/package-info.md b/pusong-modules/pusong-workflow/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/package-info.md rename to pusong-modules/pusong-workflow/src/main/resources/mapper/package-info.md diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfFormManageMapper.xml b/pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/ActHiProcinstMapper.xml similarity index 72% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfFormManageMapper.xml rename to pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/ActHiProcinstMapper.xml index 59221f8..00aca85 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfFormManageMapper.xml +++ b/pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/ActHiProcinstMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfNodeConfigMapper.xml b/pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/ActHiTaskinstMapper.xml similarity index 72% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfNodeConfigMapper.xml rename to pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/ActHiTaskinstMapper.xml index b65194f..b743d1c 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfNodeConfigMapper.xml +++ b/pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/ActHiTaskinstMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml b/pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml similarity index 96% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml rename to pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml index d1508ab..bd5a6e6 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml +++ b/pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml @@ -2,8 +2,8 @@ - - + + diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml b/pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml similarity index 71% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml rename to pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml index 26b7fc4..7717908 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml +++ b/pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfCategoryMapper.xml b/pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/WfCategoryMapper.xml similarity index 71% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfCategoryMapper.xml rename to pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/WfCategoryMapper.xml index 4375cb2..36dfd27 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfCategoryMapper.xml +++ b/pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/WfCategoryMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActHiTaskinstMapper.xml b/pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/WfDefinitionConfigMapper.xml similarity index 69% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActHiTaskinstMapper.xml rename to pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/WfDefinitionConfigMapper.xml index 7e73b60..2ffc137 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActHiTaskinstMapper.xml +++ b/pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/WfDefinitionConfigMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/WfFormManageMapper.xml b/pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/WfFormManageMapper.xml new file mode 100644 index 0000000..4ffbbfb --- /dev/null +++ b/pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/WfFormManageMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/WfNodeConfigMapper.xml b/pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/WfNodeConfigMapper.xml new file mode 100644 index 0000000..08bc072 --- /dev/null +++ b/pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/WfNodeConfigMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActHiProcinstMapper.xml b/pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/WfTaskBackNodeMapper.xml similarity index 72% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActHiProcinstMapper.xml rename to pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/WfTaskBackNodeMapper.xml index dd05785..1a2b2fc 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActHiProcinstMapper.xml +++ b/pusong-modules/pusong-workflow/src/main/resources/mapper/workflow/WfTaskBackNodeMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml deleted file mode 100644 index 45493d3..0000000 --- a/ruoyi-common/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - ruoyi-vue-plus - org.dromara - ${revision} - - 4.0.0 - - - ruoyi-common-bom - ruoyi-common-social - ruoyi-common-core - ruoyi-common-doc - ruoyi-common-excel - ruoyi-common-idempotent - ruoyi-common-job - ruoyi-common-log - ruoyi-common-mail - ruoyi-common-mybatis - ruoyi-common-oss - ruoyi-common-ratelimiter - ruoyi-common-redis - ruoyi-common-satoken - ruoyi-common-security - ruoyi-common-sms - ruoyi-common-web - ruoyi-common-translation - ruoyi-common-sensitive - ruoyi-common-json - ruoyi-common-encrypt - ruoyi-common-tenant - ruoyi-common-websocket - - - ruoyi-common - pom - - - common 通用模块 - - - diff --git a/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 3395e73..0000000 --- a/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,6 +0,0 @@ -org.dromara.common.core.config.ApplicationConfig -org.dromara.common.core.config.AsyncConfig -org.dromara.common.core.config.RuoYiConfig -org.dromara.common.core.config.ThreadPoolConfig -org.dromara.common.core.config.ValidatorConfig -org.dromara.common.core.utils.SpringUtils diff --git a/ruoyi-common/ruoyi-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index fe11e76..0000000 --- a/ruoyi-common/ruoyi-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.doc.config.SpringDocConfig diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 132cf29..0000000 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,3 +0,0 @@ -org.dromara.common.encrypt.config.EncryptorAutoConfiguration -org.dromara.common.encrypt.config.ApiDecryptAutoConfiguration - diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index f2fa958..0000000 --- a/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.idempotent.config.IdempotentConfig diff --git a/ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 3aa1881..0000000 --- a/ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.job.config.SnailJobConfig diff --git a/ruoyi-common/ruoyi-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 1625397..0000000 --- a/ruoyi-common/ruoyi-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.json.config.JacksonConfig diff --git a/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 6893020..0000000 --- a/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.log.aspect.LogAspect diff --git a/ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index ef0cf11..0000000 --- a/ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.mail.config.MailConfig diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index cc625da..0000000 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.mybatis.config.MybatisPlusConfig diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 3b95432..0000000 --- a/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.ratelimiter.config.RateLimiterConfig diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/spel-extension.json b/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/spel-extension.json deleted file mode 100644 index 64a0e1b..0000000 --- a/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/spel-extension.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "org.dromara.common.ratelimiter.annotation.RateLimiter@key": { - "method": { - "parameters": true - } - } -} diff --git a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 0475b19..0000000 --- a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -org.dromara.common.redis.config.RedisConfig -org.dromara.common.redis.config.CacheConfig diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 6dd284f..0000000 --- a/ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.satoken.config.SaTokenConfig diff --git a/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 6def724..0000000 --- a/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -org.dromara.common.security.handler.AllUrlHandler -org.dromara.common.security.config.SecurityConfig diff --git a/ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 5919ce3..0000000 --- a/ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.sms.config.SmsAutoConfiguration diff --git a/ruoyi-common/ruoyi-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index fc544a0..0000000 --- a/ruoyi-common/ruoyi-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.social.config.SocialAutoConfiguration diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index f837191..0000000 --- a/ruoyi-common/ruoyi-common-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.tenant.config.TenantConfig diff --git a/ruoyi-common/ruoyi-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index ad40205..0000000 --- a/ruoyi-common/ruoyi-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,6 +0,0 @@ -org.dromara.common.translation.config.TranslationConfig -org.dromara.common.translation.core.impl.DeptNameTranslationImpl -org.dromara.common.translation.core.impl.DictTypeTranslationImpl -org.dromara.common.translation.core.impl.OssUrlTranslationImpl -org.dromara.common.translation.core.impl.UserNameTranslationImpl -org.dromara.common.translation.core.impl.NicknameTranslationImpl diff --git a/ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index fc10a36..0000000 --- a/ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,5 +0,0 @@ -org.dromara.common.web.config.CaptchaConfig -org.dromara.common.web.config.FilterConfig -org.dromara.common.web.config.I18nConfig -org.dromara.common.web.config.ResourcesConfig -org.dromara.common.web.config.UndertowConfig diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index c3a7305..0000000 --- a/ruoyi-common/ruoyi-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.websocket.config.WebSocketConfig diff --git a/ruoyi-modules/ruoyi-demo/pom.xml b/ruoyi-modules/ruoyi-demo/pom.xml deleted file mode 100644 index 119fe61..0000000 --- a/ruoyi-modules/ruoyi-demo/pom.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - org.dromara - ruoyi-modules - ${revision} - - 4.0.0 - - ruoyi-demo - - - demo模块 - - - - - - - org.dromara - ruoyi-common-core - - - - org.dromara - ruoyi-common-doc - - - - org.dromara - ruoyi-common-sms - - - - org.dromara - ruoyi-common-mail - - - - org.dromara - ruoyi-common-redis - - - - org.dromara - ruoyi-common-idempotent - - - - org.dromara - ruoyi-common-mybatis - - - - org.dromara - ruoyi-common-log - - - - org.dromara - ruoyi-common-excel - - - - org.dromara - ruoyi-common-security - - - - org.dromara - ruoyi-common-web - - - - org.dromara - ruoyi-common-ratelimiter - - - - org.dromara - ruoyi-common-translation - - - - org.dromara - ruoyi-common-sensitive - - - - org.dromara - ruoyi-common-encrypt - - - - org.dromara - ruoyi-common-tenant - - - - org.dromara - ruoyi-common-websocket - - - - - diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/package-info.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/package-info.java deleted file mode 100644 index 16c30f8..0000000 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package org.dromara.demo.controller; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/package-info.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/package-info.java deleted file mode 100644 index cb7d83f..0000000 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package org.dromara.demo.domain; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestTreeMapper.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestTreeMapper.java deleted file mode 100644 index e5f4c44..0000000 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestTreeMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.dromara.demo.mapper; - -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.demo.domain.TestTree; -import org.dromara.demo.domain.vo.TestTreeVo; - -/** - * 测试树表Mapper接口 - * - * @author Lion Li - * @date 2021-07-26 - */ -@DataPermission({ - @DataColumn(key = "deptName", value = "dept_id"), - @DataColumn(key = "userName", value = "user_id") -}) -public interface TestTreeMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/package-info.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/package-info.java deleted file mode 100644 index ff1c4df..0000000 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package org.dromara.demo.mapper; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/package-info.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/package-info.java deleted file mode 100644 index 7011984..0000000 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package org.dromara.demo.service.impl; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/package-info.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/package-info.java deleted file mode 100644 index 16727ff..0000000 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package org.dromara.demo.service; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/package-info.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/package-info.java deleted file mode 100644 index 2f118b0..0000000 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package org.dromara.job; diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml deleted file mode 100644 index acf33ce..0000000 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - org.dromara - ruoyi-modules - ${revision} - - 4.0.0 - - ruoyi-system - - - system系统模块 - - - - - - org.dromara - ruoyi-common-core - - - - org.dromara - ruoyi-common-doc - - - - org.dromara - ruoyi-common-mybatis - - - - org.dromara - ruoyi-common-translation - - - - - org.dromara - ruoyi-common-oss - - - - org.dromara - ruoyi-common-log - - - - - org.dromara - ruoyi-common-excel - - - - - org.dromara - ruoyi-common-sms - - - - org.dromara - ruoyi-common-tenant - - - - org.dromara - ruoyi-common-security - - - - org.dromara - ruoyi-common-web - - - - org.dromara - ruoyi-common-idempotent - - - - org.dromara - ruoyi-common-sensitive - - - - org.dromara - ruoyi-common-encrypt - - - - org.dromara - ruoyi-common-websocket - - - - - diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java deleted file mode 100644 index 15bcfb4..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.system.domain.SysClient; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 授权管理Mapper接口 - * - * @author Michelle.Chung - * @date 2023-05-15 - */ -public interface SysClientMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java deleted file mode 100644 index 0eaaee8..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysConfig; -import org.dromara.system.domain.vo.SysConfigVo; - -/** - * 参数配置 数据层 - * - * @author Lion Li - */ -public interface SysConfigMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java deleted file mode 100644 index 9a9bdd5..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.system.domain.SysDictType; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.vo.SysDictTypeVo; - -/** - * 字典表 数据层 - * - * @author Lion Li - */ -public interface SysDictTypeMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java deleted file mode 100644 index 85edd1d..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysLogininfor; -import org.dromara.system.domain.vo.SysLogininforVo; - -/** - * 系统访问日志情况信息 数据层 - * - * @author Lion Li - */ -public interface SysLogininforMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java deleted file mode 100644 index 1e27b77..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysNotice; -import org.dromara.system.domain.vo.SysNoticeVo; - -/** - * 通知公告表 数据层 - * - * @author Lion Li - */ -public interface SysNoticeMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java deleted file mode 100644 index 5d20404..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysOperLog; -import org.dromara.system.domain.vo.SysOperLogVo; - -/** - * 操作日志 数据层 - * - * @author Lion Li - */ -public interface SysOperLogMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssMapper.java deleted file mode 100644 index 3da621d..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysOss; -import org.dromara.system.domain.vo.SysOssVo; - -/** - * 文件上传 数据层 - * - * @author Lion Li - */ -public interface SysOssMapper extends BaseMapperPlus { -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java deleted file mode 100644 index b942061..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysSocial; -import org.dromara.system.domain.vo.SysSocialVo; - -/** - * 社会化关系Mapper接口 - * - * @author thiszhc - */ -public interface SysSocialMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java deleted file mode 100644 index 7e1167a..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.system.domain.SysTenant; -import org.dromara.system.domain.vo.SysTenantVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 租户Mapper接口 - * - * @author Michelle.Chung - */ -public interface SysTenantMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java deleted file mode 100644 index 10ca170..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysTenantPackage; -import org.dromara.system.domain.vo.SysTenantPackageVo; - -/** - * 租户套餐Mapper接口 - * - * @author Michelle.Chung - */ -public interface SysTenantPackageMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml deleted file mode 100644 index c64b551..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml deleted file mode 100644 index 79cf4c5..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/SysUserLeaveMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/SysUserLeaveMapper.java deleted file mode 100644 index 583756b..0000000 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/SysUserLeaveMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.workflow.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.workflow.domain.SysUserLeave; -import org.dromara.workflow.domain.vo.SysUserLeaveVo; - -/** - * 请假Mapper接口 - * - * @author may - * @date 2023-07-21 - */ -public interface SysUserLeaveMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfCategoryMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfCategoryMapper.java deleted file mode 100644 index 98aea02..0000000 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfCategoryMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.workflow.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.workflow.domain.WfCategory; -import org.dromara.workflow.domain.vo.WfCategoryVo; - -/** - * 流程分类Mapper接口 - * - * @author may - * @date 2023-06-27 - */ -public interface WfCategoryMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfDefinitionConfigMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfDefinitionConfigMapper.java deleted file mode 100644 index ee20882..0000000 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfDefinitionConfigMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.workflow.mapper; - -import org.dromara.workflow.domain.WfDefinitionConfig; -import org.dromara.workflow.domain.vo.WfDefinitionConfigVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 流程定义配置Mapper接口 - * - * @author may - * @date 2024-03-18 - */ -public interface WfDefinitionConfigMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfFormManageMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfFormManageMapper.java deleted file mode 100644 index acf8111..0000000 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfFormManageMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.workflow.mapper; - -import org.dromara.workflow.domain.WfFormManage; -import org.dromara.workflow.domain.vo.WfFormManageVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 表单管理Mapper接口 - * - * @author may - * @date 2024-03-29 - */ -public interface WfFormManageMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfNodeConfigMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfNodeConfigMapper.java deleted file mode 100644 index d2aecac..0000000 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfNodeConfigMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.workflow.mapper; - -import org.dromara.workflow.domain.WfNodeConfig; -import org.dromara.workflow.domain.vo.WfNodeConfigVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 节点配置Mapper接口 - * - * @author may - * @date 2024-03-30 - */ -public interface WfNodeConfigMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfDefinitionConfigMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfDefinitionConfigMapper.xml deleted file mode 100644 index 8d579f7..0000000 --- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfDefinitionConfigMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfTaskBackNodeMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfTaskBackNodeMapper.xml deleted file mode 100644 index 4a9179b..0000000 --- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfTaskBackNodeMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/script/sql/oracle/oracle_ry_vue_5.X.sql b/script/sql/oracle/oracle_ry_vue_5.X.sql index 0aed89d..36a59ca 100644 --- a/script/sql/oracle/oracle_ry_vue_5.X.sql +++ b/script/sql/oracle/oracle_ry_vue_5.X.sql @@ -429,7 +429,7 @@ insert into sys_menu values('1', '系统管理', '0', '1', 'system', n insert into sys_menu values('6', '租户管理', '0', '2', 'tenant', null, '', 1, 0, 'M', '0', '0', '', 'chart', 103, 1, sysdate, null, null, '租户管理目录'); insert into sys_menu values('2', '系统监控', '0', '3', 'monitor', null, '', 1, 0, 'M', '0', '0', '', 'monitor', 103, 1, sysdate, null, null, '系统监控目录'); insert into sys_menu values('3', '系统工具', '0', '4', 'tool', null, '', 1, 0, 'M', '0', '0', '', 'tool', 103, 1, sysdate, null, null, '系统工具目录'); -insert into sys_menu values('4', 'PLUS官网', '0', '5', 'https://gitee.com/dromara/RuoYi-Vue-Plus', null, '', 0, 0, 'M', '0', '0', '', 'guide', 103, 1, sysdate, null, null, 'RuoYi-Vue-Plus官网地址'); +insert into sys_menu values('4', 'PLUS官网', '0', '5', 'https://gitee.com/dromara/RuoYi-Vue-Plus', null, '', 0, 0, 'M', '0', '0', '', 'guide', 103, 1, sysdate, null, null, 'PuSong-Vue-Plus官网地址'); insert into sys_menu values('5', '测试菜单', '0', '5', 'demo', null, '', 1, 0, 'M', '0', '0', null, 'star', 103, 1, sysdate, null, null, ''); -- 二级菜单 insert into sys_menu values('100', '用户管理', '1', '1', 'user', 'system/user/index', '', 1, 0, 'C', '0', '0', 'system:user:list', 'user', 103, 1, sysdate, null, null, '用户管理菜单'); diff --git a/script/sql/postgres/postgres_ry_vue_5.X.sql b/script/sql/postgres/postgres_ry_vue_5.X.sql index 995d738..3135534 100644 --- a/script/sql/postgres/postgres_ry_vue_5.X.sql +++ b/script/sql/postgres/postgres_ry_vue_5.X.sql @@ -430,7 +430,7 @@ insert into sys_menu values('1', '系统管理', '0', '1', 'system', n insert into sys_menu values('6', '系统管理', '0', '2', 'tenant', null, '', '1', '0', 'M', '0', '0', '', 'chart', 103, 1, now(), null, null, '租户管理目录'); insert into sys_menu values('2', '系统监控', '0', '3', 'monitor', null, '', '1', '0', 'M', '0', '0', '', 'monitor', 103, 1, now(), null, null, '系统监控目录'); insert into sys_menu values('3', '系统工具', '0', '4', 'tool', null, '', '1', '0', 'M', '0', '0', '', 'tool', 103, 1, now(), null, null, '系统工具目录'); -insert into sys_menu values('4', 'PLUS官网', '0', '5', 'https://gitee.com/dromara/RuoYi-Vue-Plus', null, '', '0', '0', 'M', '0', '0', '', 'guide', 103, 1, now(), null, null, 'RuoYi-Vue-Plus官网地址'); +insert into sys_menu values('4', 'PLUS官网', '0', '5', 'https://gitee.com/dromara/PuSong-Vue-Plus', null, '', '0', '0', 'M', '0', '0', '', 'guide', 103, 1, now(), null, null, 'PuSong-Vue-Plus官网地址'); insert into sys_menu VALUES('5', '测试菜单', '0', '5', 'demo', null, '', '1', '0', 'M', '0', '0', null, 'star', 103, 1, now(), null, null, '测试菜单'); -- 二级菜单 insert into sys_menu values('100', '用户管理', '1', '1', 'user', 'system/user/index', '', '1', '0', 'C', '0', '0', 'system:user:list', 'user', 103, 1, now(), null, null, '用户管理菜单'); diff --git a/script/sql/ry_vue_5.X.sql b/script/sql/ry_vue_5.X.sql index 3e3562d..0561f9e 100644 --- a/script/sql/ry_vue_5.X.sql +++ b/script/sql/ry_vue_5.X.sql @@ -264,7 +264,7 @@ insert into sys_menu values('1', '系统管理', '0', '1', 'system', n insert into sys_menu values('6', '租户管理', '0', '2', 'tenant', null, '', 1, 0, 'M', '0', '0', '', 'chart', 103, 1, sysdate(), null, null, '租户管理目录'); insert into sys_menu values('2', '系统监控', '0', '3', 'monitor', null, '', 1, 0, 'M', '0', '0', '', 'monitor', 103, 1, sysdate(), null, null, '系统监控目录'); insert into sys_menu values('3', '系统工具', '0', '4', 'tool', null, '', 1, 0, 'M', '0', '0', '', 'tool', 103, 1, sysdate(), null, null, '系统工具目录'); -insert into sys_menu values('4', 'PLUS官网', '0', '5', 'https://gitee.com/dromara/RuoYi-Vue-Plus', null, '', 0, 0, 'M', '0', '0', '', 'guide', 103, 1, sysdate(), null, null, 'RuoYi-Vue-Plus官网地址'); +insert into sys_menu values('4', 'PLUS官网', '0', '5', 'https://gitee.com/dromara/PuSong-Vue-Plus', null, '', 0, 0, 'M', '0', '0', '', 'guide', 103, 1, sysdate(), null, null, 'PuSong-Vue-Plus官网地址'); insert into sys_menu values('5', '测试菜单', '0', '5', 'demo', null, '', 1, 0, 'M', '0', '0', '', 'star', 103, 1, sysdate(), null, null, '测试菜单'); -- 二级菜单 insert into sys_menu values('100', '用户管理', '1', '1', 'user', 'system/user/index', '', 1, 0, 'C', '0', '0', 'system:user:list', 'user', 103, 1, sysdate(), null, null, '用户管理菜单'); diff --git a/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql b/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql index ad9a0b5..332c1a5 100644 --- a/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql +++ b/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql @@ -1652,7 +1652,7 @@ INSERT sys_menu VALUES (2, N'系统监控', 0, 3, N'monitor', NULL, N'', 1, 0, N GO INSERT sys_menu VALUES (3, N'系统工具', 0, 4, N'tool', NULL, N'', 1, 0, N'M', N'0', N'0', N'', N'tool', 103, 1, getdate(), NULL, NULL, N'系统工具目录') GO -INSERT sys_menu VALUES (4, N'PLUS官网', 0, 5, N'https://gitee.com/dromara/RuoYi-Vue-Plus', null, N'', 0, 0, N'M', N'0', N'0', N'', N'guide', 103, 1, getdate(), null, null, N'RuoYi-Vue-Plus官网地址'); +INSERT sys_menu VALUES (4, N'PLUS官网', 0, 5, N'https://gitee.com/dromara/PuSong-Vue-Plus', null, N'', 0, 0, N'M', N'0', N'0', N'', N'guide', 103, 1, getdate(), null, null, N'PuSong-Vue-Plus官网地址'); GO INSERT sys_menu VALUES (5, N'测试菜单', 0, 5, N'demo', NULL, N'', 1, 0, N'M', N'0', N'0', NULL, N'star', 103, 1, getdate(), NULL, NULL, N''); GO