mengxu/pusong-crm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码包名修改

Browse Source
This commit is contained in:
1073413548 2024-07-25 08:39:09 +08:00
parent 81375d3471
commit b7f6f85bf4
781 changed files with 3486 additions and 3491 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pom.xml
View File

@ -4,13 +4,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-vue-plus</artifactId>
<version>${revision}</version>
<name>RuoYi-Vue-Plus</name>
<name>PuSong-Vue-Plus</name>
<url>https://gitee.com/dromara/RuoYi-Vue-Plus</url>
<description>RuoYi-Vue-Plus多租户管理系统</description>
<description>PuSong-Vue-Plus多租户管理系统</description>
<properties>
<revision>5.2.0</revision>
@ -130,8 +130,8 @@
<!-- common 的依赖配置-->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-bom</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-bom</artifactId>
<version>${revision}</version>
<type>pom</type>
<scope>import</scope>
@ -340,33 +340,33 @@
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-system</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-system</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-job</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-job</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-generator</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-generator</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-demo</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-demo</artifactId>
<version>${revision}</version>
</dependency>
<!-- 工作流模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-workflow</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-workflow</artifactId>
<version>${revision}</version>
</dependency>
@ -374,10 +374,10 @@
</dependencyManagement>
<modules>
<module>ruoyi-admin</module>
<module>ruoyi-common</module>
<module>ruoyi-extend</module>
<module>ruoyi-modules</module>
<module>pusong-admin</module>
<module>pusong-common</module>
<module>pusong-extend</module>
<module>pusong-modules</module>
</modules>
<packaging>pom</packaging>

0
ruoyi-admin/Dockerfile → pusong-admin/Dockerfile
View File

42
ruoyi-admin/pom.xml → pusong-admin/pom.xml
View File

@ -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">
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>org.dromara</groupId>
<artifactId>pusong-vue-plus</artifactId>
<groupId>com.pusong</groupId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<artifactId>ruoyi-admin</artifactId>
<artifactId>pusong-admin</artifactId>
<description>
web服务入口
@ -39,51 +39,51 @@
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-doc</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-doc</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-social</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-social</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-ratelimiter</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-ratelimiter</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-mail</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-mail</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-system</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-system</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-job</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-job</artifactId>
</dependency>
<!-- 代码生成-->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-generator</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-generator</artifactId>
</dependency>
<!-- demo模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-demo</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-demo</artifactId>
</dependency>
<!-- 工作流模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-workflow</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-workflow</artifactId>
</dependency>
<dependency>

4
ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java → pusong-admin/src/main/java/com/pusong/DromaraApplication.java
View File

@ -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启动成功 ლ(´ڡ`ლ)ﾞ");
}
}

2
ruoyi-admin/src/main/java/org/dromara/DromaraServletInitializer.java → pusong-admin/src/main/java/com/pusong/DromaraServletInitializer.java
View File

@ -1,4 +1,4 @@
package org.dromara;
package com.pusong;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;

62
ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java → pusong-admin/src/main/java/com/pusong/web/controller/AuthController.java
View File

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

30
ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java → pusong-admin/src/main/java/com/pusong/web/controller/CaptchaController.java
View File

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

6
ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java → pusong-admin/src/main/java/com/pusong/web/controller/IndexController.java
View File

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

2
ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java → pusong-admin/src/main/java/com/pusong/web/domain/vo/CaptchaVo.java
View File

@ -1,4 +1,4 @@
package org.dromara.web.domain.vo;
package com.pusong.web.domain.vo;
import lombok.Data;

2
ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java → pusong-admin/src/main/java/com/pusong/web/domain/vo/LoginTenantVo.java
View File

@ -1,4 +1,4 @@
package org.dromara.web.domain.vo;
package com.pusong.web.domain.vo;
import lombok.Data;

2
ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java → pusong-admin/src/main/java/com/pusong/web/domain/vo/LoginVo.java
View File

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

4
ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java → pusong-admin/src/main/java/com/pusong/web/domain/vo/TenantListVo.java
View File

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

26
ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java → pusong-admin/src/main/java/com/pusong/web/listener/UserActionListener.java
View File

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

11
ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java → pusong-admin/src/main/java/com/pusong/web/service/IAuthStrategy.java
View File

@ -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;
/**
* 授权策略

47
ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java → pusong-admin/src/main/java/com/pusong/web/service/SysLoginService.java
View File

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

40
ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java → pusong-admin/src/main/java/com/pusong/web/service/SysRegisterService.java
View File

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

47
ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java → pusong-admin/src/main/java/com/pusong/web/service/impl/EmailAuthStrategy.java
View File

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

51
ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java → pusong-admin/src/main/java/com/pusong/web/service/impl/PasswordAuthStrategy.java
View File

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

47
ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java → pusong-admin/src/main/java/com/pusong/web/service/impl/SmsAuthStrategy.java
View File

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

40
ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java → pusong-admin/src/main/java/com/pusong/web/service/impl/SocialAuthStrategy.java
View File

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

25
ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java → pusong-admin/src/main/java/com/pusong/web/service/impl/XcxAuthStrategy.java
View File

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

44
ruoyi-admin/src/main/resources/application-dev.yml → pusong-admin/src/main/resources/application-dev.yml
View File

@ -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 两个不同的阿里短信账号 也可用于区分租户

0
ruoyi-admin/src/main/resources/application-prod.yml → pusong-admin/src/main/resources/application-prod.yml
View File

16
ruoyi-admin/src/main/resources/application.yml → pusong-admin/src/main/resources/application.yml
View File

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

0
ruoyi-admin/src/main/resources/banner.txt → pusong-admin/src/main/resources/banner.txt
View File

0
ruoyi-admin/src/main/resources/i18n/messages.properties → pusong-admin/src/main/resources/i18n/messages.properties
View File

0
ruoyi-admin/src/main/resources/i18n/messages_en_US.properties → pusong-admin/src/main/resources/i18n/messages_en_US.properties
View File

0
ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties → pusong-admin/src/main/resources/i18n/messages_zh_CN.properties
View File

0
ruoyi-admin/src/main/resources/ip2region.xdb → pusong-admin/src/main/resources/ip2region.xdb
View File

0
ruoyi-admin/src/main/resources/logback-plus.xml → pusong-admin/src/main/resources/logback-plus.xml
View File

2
ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java → pusong-admin/src/test/java/com/pusong/test/AssertUnitTest.java
View File

@ -1,4 +1,4 @@
package org.dromara.test;
package com.pusong.test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.DisplayName;

4
ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java → pusong-admin/src/test/java/com/pusong/test/DemoUnitTest.java
View File

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

4
ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java → pusong-admin/src/test/java/com/pusong/test/ParamUnitTest.java
View File

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

2
ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java → pusong-admin/src/test/java/com/pusong/test/TagUnitTest.java
View File

@ -1,4 +1,4 @@
package org.dromara.test;
package com.pusong.test;
import org.junit.jupiter.api.*;
import org.springframework.boot.test.context.SpringBootTest;

45
pusong-common/pom.xml Normal file
View File

@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>pusong-vue-plus</artifactId>
<groupId>com.pusong</groupId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<modules>
<module>pusong-common-bom</module>
<module>pusong-common-social</module>
<module>pusong-common-core</module>
<module>pusong-common-doc</module>
<module>pusong-common-excel</module>
<module>pusong-common-idempotent</module>
<module>pusong-common-job</module>
<module>pusong-common-log</module>
<module>pusong-common-mail</module>
<module>pusong-common-mybatis</module>
<module>pusong-common-oss</module>
<module>pusong-common-ratelimiter</module>
<module>pusong-common-redis</module>
<module>pusong-common-satoken</module>
<module>pusong-common-security</module>
<module>pusong-common-sms</module>
<module>pusong-common-web</module>
<module>pusong-common-translation</module>
<module>pusong-common-sensitive</module>
<module>pusong-common-json</module>
<module>pusong-common-encrypt</module>
<module>pusong-common-tenant</module>
<module>pusong-common-websocket</module>
</modules>
<artifactId>pusong-common</artifactId>
<packaging>pom</packaging>
<description>
common 通用模块
</description>
</project>

92
ruoyi-common/ruoyi-common-bom/pom.xml → pusong-common/pusong-common-bom/pom.xml
View File

@ -4,8 +4,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-bom</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-bom</artifactId>
<version>${revision}</version>
<packaging>pom</packaging>
@ -21,154 +21,154 @@
<dependencies>
<!-- 核心模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-core</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-core</artifactId>
<version>${revision}</version>
</dependency>
<!-- 接口模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-doc</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-doc</artifactId>
<version>${revision}</version>
</dependency>
<!-- excel -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-excel</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-excel</artifactId>
<version>${revision}</version>
</dependency>
<!-- 幂等 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-idempotent</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-idempotent</artifactId>
<version>${revision}</version>
</dependency>
<!-- 调度模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-job</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-job</artifactId>
<version>${revision}</version>
</dependency>
<!-- 日志记录 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-log</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-log</artifactId>
<version>${revision}</version>
</dependency>
<!-- 邮件服务 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-mail</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-mail</artifactId>
<version>${revision}</version>
</dependency>
<!-- 数据库服务 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-mybatis</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-mybatis</artifactId>
<version>${revision}</version>
</dependency>
<!-- OSS -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-oss</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-oss</artifactId>
<version>${revision}</version>
</dependency>
<!-- 限流 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-ratelimiter</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-ratelimiter</artifactId>
<version>${revision}</version>
</dependency>
<!-- 缓存服务 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-redis</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-redis</artifactId>
<version>${revision}</version>
</dependency>
<!-- satoken -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-satoken</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-satoken</artifactId>
<version>${revision}</version>
</dependency>
<!-- 安全模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-security</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-security</artifactId>
<version>${revision}</version>
</dependency>
<!-- 短信模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-sms</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-sms</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-social</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-social</artifactId>
<version>${revision}</version>
</dependency>
<!-- web服务 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-web</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-web</artifactId>
<version>${revision}</version>
</dependency>
<!-- 翻译模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-translation</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-translation</artifactId>
<version>${revision}</version>
</dependency>
<!-- 脱敏模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-sensitive</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-sensitive</artifactId>
<version>${revision}</version>
</dependency>
<!-- 序列化模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-json</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-json</artifactId>
<version>${revision}</version>
</dependency>
<!-- 数据库加解密模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-encrypt</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-encrypt</artifactId>
<version>${revision}</version>
</dependency>
<!-- 租户模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-tenant</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-tenant</artifactId>
<version>${revision}</version>
</dependency>
<!-- WebSocket模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-websocket</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common-websocket</artifactId>
<version>${revision}</version>
</dependency>

6
ruoyi-common/ruoyi-common-core/pom.xml → pusong-common/pusong-common-core/pom.xml
View File

@ -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">
<parent>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common</artifactId>
<groupId>com.pusong</groupId>
<artifactId>pusong-common</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-common-core</artifactId>
<artifactId>pusong-common-core</artifactId>
<description>
ruoyi-common-core 核心模块

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/config/ApplicationConfig.java
View File

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

6
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/config/AsyncConfig.java
View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/RuoYiConfig.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/config/RuoYiConfig.java
View File

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

6
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/config/ThreadPoolConfig.java
View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/config/ValidatorConfig.java
View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/config/properties/ThreadPoolProperties.java
View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/CacheConstants.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.constant;
package com.pusong.common.core.constant;
/**
* 缓存的key 常量

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/CacheNames.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.constant;
package com.pusong.common.core.constant;
/**
* 缓存组名称常量

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/Constants.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.constant;
package com.pusong.common.core.constant;
/**
* 通用常量信息

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/GlobalConstants.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.constant;
package com.pusong.common.core.constant;
/**
* 全局的key常量 (业务无关的key)

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/HttpStatus.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.constant;
package com.pusong.common.core.constant;
/**
* 返回状态码

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/RegexConstants.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.constant;
package com.pusong.common.core.constant;
import cn.hutool.core.lang.RegexPool;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/TenantConstants.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.constant;
package com.pusong.common.core.constant;
/**
* 租户常量信息

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/UserConstants.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.constant;
package com.pusong.common.core.constant;
/**
* 用户常量信息

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/R.java
View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/dto/OssDTO.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.domain.dto;
package com.pusong.common.core.domain.dto;
import lombok.Data;
import lombok.NoArgsConstructor;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/dto/RoleDTO.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.domain.dto;
package com.pusong.common.core.domain.dto;
import lombok.Data;
import lombok.NoArgsConstructor;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/dto/UserDTO.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.domain.dto;
package com.pusong.common.core.domain.dto;
import lombok.Data;
import lombok.NoArgsConstructor;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/dto/UserOnlineDTO.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.domain.dto;
package com.pusong.common.core.domain.dto;
import lombok.Data;
import lombok.NoArgsConstructor;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/event/ProcessEvent.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.domain.event;
package com.pusong.common.core.domain.event;
import lombok.Data;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/event/ProcessTaskEvent.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.domain.event;
package com.pusong.common.core.domain.event;
import lombok.Data;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/EmailLoginBody.java
View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/LoginBody.java
View File

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

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/LoginUser.java
View File

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

9
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/PasswordLoginBody.java
View File

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

9
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/RegisterBody.java
View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/SmsLoginBody.java
View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/SocialLoginBody.java
View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/XcxLoginBody.java
View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/domain/model/XcxLoginUser.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.domain.model;
package com.pusong.common.core.domain.model;
import lombok.Data;
import lombok.EqualsAndHashCode;

6
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/enums/BusinessStatusEnum.java
View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/enums/DeviceType.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.enums;
package com.pusong.common.core.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/enums/LoginType.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.enums;
package com.pusong.common.core.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/TenantStatus.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/enums/TenantStatus.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.enums;
package com.pusong.common.core.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/enums/UserStatus.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.enums;
package com.pusong.common.core.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/enums/UserType.java
View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/ServiceException.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.exception;
package com.pusong.common.core.exception;
import lombok.*;

6
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/base/BaseException.java
View File

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

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/file/FileException.java
View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/file/FileNameLengthLimitExceededException.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.exception.file;
package com.pusong.common.core.exception.file;
import java.io.Serial;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/file/FileSizeLimitExceededException.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.exception.file;
package com.pusong.common.core.exception.file;
import java.io.Serial;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/user/CaptchaException.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.exception.user;
package com.pusong.common.core.exception.user;
import java.io.Serial;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/user/CaptchaExpireException.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.exception.user;
package com.pusong.common.core.exception.user;
import java.io.Serial;

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/exception/user/UserException.java
View File

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

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/factory/RegexPatternPoolFactory.java
View File

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

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/factory/YmlPropertySourceFactory.java
View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/ConfigService.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/service/ConfigService.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.service;
package com.pusong.common.core.service;
/**
* 通用 参数配置服务

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/service/DeptService.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.service;
package com.pusong.common.core.service;
/**
* 通用 部门服务

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/service/DictService.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.service;
package com.pusong.common.core.service;
import java.util.Map;

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/OssService.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/service/OssService.java
View File

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

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/service/UserService.java
View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/service/WorkflowService.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.service;
package com.pusong.common.core.service;
import java.util.List;
import java.util.Map;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/DateUtils.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.utils;
package com.pusong.common.core.utils;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/MapstructUtils.java
View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/MessageUtils.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.utils;
package com.pusong.common.core.utils;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/ServletUtils.java
View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/SpringUtils.java
View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/StreamUtils.java
View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/StringUtils.java
View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/Threads.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/Threads.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.utils;
package com.pusong.common.core.utils;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/TreeBuildUtils.java
View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/ValidatorUtils.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.utils;
package com.pusong.common.core.utils;
import jakarta.validation.ConstraintViolation;
import jakarta.validation.ConstraintViolationException;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java → pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/file/FileUtils.java
View File

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

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