fys/fys-Multi-tenant
1
0
Fork 0
forked from dyf/fys-Multi-tenant
Code Pull Requests Activity

fys

Browse Source
This commit is contained in:
daiyongfei
2025-06-27 10:23:57 +08:00
parent 15d7ef8771
commit b94549185c
774 changed files with 3543 additions and 3558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE
View File

@ -1,6 +1,6 @@
The MIT License (MIT)
Copyright (c) 2019 RuoYi-Vue-Plus
Copyright (c) 2019 fys-Vue-Plus
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in

38
README.md
View File

@ -4,18 +4,18 @@
- - -
## 平台简介
[![码云Gitee](https://gitee.com/dromara/RuoYi-Vue-Plus/badge/star.svg?theme=blue)](https://gitee.com/dromara/RuoYi-Vue-Plus)
[![GitHub](https://img.shields.io/github/stars/dromara/RuoYi-Vue-Plus.svg?style=social&label=Stars)](https://github.com/dromara/RuoYi-Vue-Plus)
[![Star](https://gitcode.com/dromara/RuoYi-Vue-Plus/star/badge.svg)](https://gitcode.com/dromara/RuoYi-Vue-Plus)
[![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/dromara/RuoYi-Vue-Plus/blob/5.X/LICENSE)
[![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=RuoYi-Vue-Plus)
[![码云Gitee](https://gitee.com/dromara/fys-Vue-Plus/badge/star.svg?theme=blue)](https://gitee.com/dromara/fys-Vue-Plus)
[![GitHub](https://img.shields.io/github/stars/dromara/fys-Vue-Plus.svg?style=social&label=Stars)](https://github.com/dromara/fys-Vue-Plus)
[![Star](https://gitcode.com/dromara/fys-Vue-Plus/star/badge.svg)](https://gitcode.com/dromara/fys-Vue-Plus)
[![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/dromara/fys-Vue-Plus/blob/5.X/LICENSE)
[![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=fys-Vue-Plus)
<br>
[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-5.4.0-success.svg)](https://gitee.com/dromara/RuoYi-Vue-Plus)
[![fys-Vue-Plus](https://img.shields.io/badge/fys_Vue_Plus-5.4.0-success.svg)](https://gitee.com/dromara/fys-Vue-Plus)
[![Spring Boot](https://img.shields.io/badge/Spring%20Boot-3.4-blue.svg)]()
[![JDK-17](https://img.shields.io/badge/JDK-17-green.svg)]()
[![JDK-21](https://img.shields.io/badge/JDK-21-green.svg)]()
> Dromara RuoYi-Vue-Plus 是重写 RuoYi-Vue 针对 `分布式集群与多租户` 场景全方位升级(不兼容原框架)
> Dromara fys-Vue-Plus 是重写 fys-Vue 针对 `分布式集群与多租户` 场景全方位升级(不兼容原框架)
> 项目代码、文档 均开源免费可商用 遵循开源协议在项目中保留开源协议文件即可<br>
活到老写到老 为兴趣而开源 为学习而开源 为让大家真正可以学到技术而开源
@ -23,25 +23,25 @@
> 系统演示: [传送门](https://plus-doc.dromara.org/#/common/demo_system)
> 官方前端项目地址: [gitee](https://gitee.com/JavaLionLi/plus-ui) - [github](https://github.com/JavaLionLi/plus-ui) - [gitcode](https://gitcode.com/dromara/plus-ui)<br>
> 成员前端项目地址: 基于vben5 [ruoyi-plus-vben5](https://gitee.com/dapppp/ruoyi-plus-vben5)<br>
> 成员前端项目地址: 基于soybean [ruoyi-plus-soybean](https://gitee.com/xlsea/ruoyi-plus-soybean)<br>
> 成员项目地址: 删除多租户与工作流 [RuoYi-Vue-Plus-Single](https://gitee.com/ColorDreams/RuoYi-Vue-Plus-Single)<br>
> 成员前端项目地址: 基于vben5 [fys-plus-vben5](https://gitee.com/dapppp/fys-plus-vben5)<br>
> 成员前端项目地址: 基于soybean [fys-plus-soybean](https://gitee.com/xlsea/fys-plus-soybean)<br>
> 成员项目地址: 删除多租户与工作流 [fys-Vue-Plus-Single](https://gitee.com/ColorDreams/fys-Vue-Plus-Single)<br>
> 文档地址: [plus-doc](https://plus-doc.dromara.org) 文档在华为云上如果打不开大概率是DNS问题 可以尝试切换网络等方式(或者科学上网)
## 赞助商
MaxKey 业界领先单点登录产品 - https://gitee.com/dromara/MaxKey <br>
CCFlow 驰聘低代码-流程-表单 - https://gitee.com/opencc/RuoYi-JFlow <br>
CCFlow 驰聘低代码-流程-表单 - https://gitee.com/opencc/fys-JFlow <br>
数舵科技 软件定制开发APP小程序等 - http://www.shuduokeji.com/ <br>
引迈信息 软件开发平台 - https://www.jnpfsoft.com/index.html?from=plus-doc <br>
<font color="red">**启山商城系统 多租户商城源码可免费商用可二次开发 - https://www.73app.cn/** </font><br>
Mall4J 高质量Java商城系统 - https://www.mall4j.com/cn/?statId=11 <br>
[如何成为赞助商 加群联系作者详谈](https://plus-doc.dromara.org/#/common/add_group)
# 本框架与RuoYi的功能差异
# 本框架与fys的功能差异
| 功能 | 本框架 | RuoYi |
| 功能 | 本框架 | fys |
|-------------|-------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------|
| 前端项目 | 采用 Vue3 + TS + ElementPlus 重写 | 基于Vue2/Vue3 + JS |
| 后端项目结构 | 采用插件化 + 扩展包形式 结构解耦 易于扩展 | 模块相互注入耦合严重难以扩展 |
@ -91,9 +91,9 @@ Mall4J 高质量Java商城系统 - https://www.mall4j.com/cn/?statId=11 <br>
| Demo案例 | 提供框架功能的实际使用案例 单独一个模块提供了很多很全 | 无 |
## 本框架与RuoYi的业务差异
## 本框架与fys的业务差异
| 业务 | 功能说明 | 本框架 | RuoYi |
| 业务 | 功能说明 | 本框架 | fys |
|--------|----------------------------------------------------------------------|-----|------------------|
| 租户管理 | 系统内租户的管理 如:租户套餐、过期时间、用户数量、企业信息等 | 支持 | 无 |
| 租户套餐管理 | 系统内租户所能使用的套餐管理 如:套餐内所包含的菜单等 | 支持 | 无 |
@ -122,14 +122,14 @@ Mall4J 高质量Java商城系统 - https://www.mall4j.com/cn/?statId=11 <br>
使用框架前请仔细阅读文档重点注意事项
<br>
>[初始化项目 必看](https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/init)
>>[https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/init](https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/init)
>[初始化项目 必看](https://plus-doc.dromara.org/#/fys-vue-plus/quickstart/init)
>>[https://plus-doc.dromara.org/#/fys-vue-plus/quickstart/init](https://plus-doc.dromara.org/#/fys-vue-plus/quickstart/init)
>
>[专栏与视频 入门必看](https://plus-doc.dromara.org/#/common/column)
>>[https://plus-doc.dromara.org/#/common/column](https://plus-doc.dromara.org/#/common/column)
>
>[部署项目 必看](https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/deploy)
>>[https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/deploy](https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/deploy)
>[部署项目 必看](https://plus-doc.dromara.org/#/fys-vue-plus/quickstart/deploy)
>>[https://plus-doc.dromara.org/#/fys-vue-plus/quickstart/deploy](https://plus-doc.dromara.org/#/fys-vue-plus/quickstart/deploy)
>
>[如何加群](https://plus-doc.dromara.org/#/common/add_group)
>>[https://plus-doc.dromara.org/#/common/add_group](https://plus-doc.dromara.org/#/common/add_group)

14
ruoyi-admin/Dockerfile → fys-admin/Dockerfile
View File

@ -5,11 +5,11 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
LABEL maintainer="Lion Li"
RUN mkdir -p /ruoyi/server/logs \
/ruoyi/server/temp \
/ruoyi/skywalking/agent
RUN mkdir -p /fys/server/logs \
/fys/server/temp \
/fys/skywalking/agent
WORKDIR /ruoyi/server
WORKDIR /fys/server
ENV SERVER_PORT=8080 SNAIL_PORT=28080 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
@ -17,15 +17,15 @@ EXPOSE ${SERVER_PORT}
# 暴露 snail job 客户端端口 用于定时任务调度中心通信
EXPOSE ${SNAIL_PORT}
ADD ./target/ruoyi-admin.jar ./app.jar
ADD ./target/fys-admin.jar ./app.jar
SHELL ["/bin/bash", "-c"]
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \
-Dsnail-job.port=${SNAIL_PORT} \
# 应用名称 如果想区分集群节点监控 改成不同的名称即可
#-Dskywalking.agent.service_name=ruoyi-server \
#-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar \
#-Dskywalking.agent.service_name=fys-server \
#-javaagent:/fys/skywalking/agent/skywalking-agent.jar \
-XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC ${JAVA_OPTS} \
-jar app.jar

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

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

@ -1,4 +1,4 @@
package org.dromara;
package com.fuyuanshen;
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("(♥◠‿◠)ﾉﾞ fys-Vue-Plus启动成功 ლ(´ڡ`ლ)ﾞ");
}
}

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

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

60
ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java → fys-admin/src/main/java/com/fuyuanshen/web/controller/AuthController.java
View File

@ -1,4 +1,4 @@
package org.dromara.web.controller;
package com.fuyuanshen.web.controller;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.dev33.satoken.exception.NotLoginException;
@ -13,34 +13,34 @@ 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.SystemConstants;
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.sse.dto.SseMessageDto;
import org.dromara.common.sse.utils.SseMessageUtils;
import org.dromara.common.tenant.helper.TenantHelper;
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.fuyuanshen.common.core.constant.SystemConstants;
import com.fuyuanshen.common.core.domain.R;
import com.fuyuanshen.common.core.domain.model.LoginBody;
import com.fuyuanshen.common.core.domain.model.RegisterBody;
import com.fuyuanshen.common.core.domain.model.SocialLoginBody;
import com.fuyuanshen.common.core.utils.*;
import com.fuyuanshen.common.encrypt.annotation.ApiEncrypt;
import com.fuyuanshen.common.json.utils.JsonUtils;
import com.fuyuanshen.common.satoken.utils.LoginHelper;
import com.fuyuanshen.common.social.config.properties.SocialLoginConfigProperties;
import com.fuyuanshen.common.social.config.properties.SocialProperties;
import com.fuyuanshen.common.social.utils.SocialUtils;
import com.fuyuanshen.common.sse.dto.SseMessageDto;
import com.fuyuanshen.common.sse.utils.SseMessageUtils;
import com.fuyuanshen.common.tenant.helper.TenantHelper;
import com.fuyuanshen.system.domain.bo.SysTenantBo;
import com.fuyuanshen.system.domain.vo.SysClientVo;
import com.fuyuanshen.system.domain.vo.SysTenantVo;
import com.fuyuanshen.system.service.ISysClientService;
import com.fuyuanshen.system.service.ISysConfigService;
import com.fuyuanshen.system.service.ISysSocialService;
import com.fuyuanshen.system.service.ISysTenantService;
import com.fuyuanshen.web.domain.vo.LoginTenantVo;
import com.fuyuanshen.web.domain.vo.LoginVo;
import com.fuyuanshen.web.domain.vo.TenantListVo;
import com.fuyuanshen.web.service.IAuthStrategy;
import com.fuyuanshen.web.service.SysLoginService;
import com.fuyuanshen.web.service.SysRegisterService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -104,7 +104,7 @@ public class AuthController {
Long userId = LoginHelper.getUserId();
scheduledExecutorService.schedule(() -> {
SseMessageDto dto = new SseMessageDto();
dto.setMessage("欢迎登录RuoYi-Vue-Plus后台管理系统");
dto.setMessage("欢迎登录fys-Vue-Plus后台管理系统");
dto.setUserIds(List.of(userId));
SseMessageUtils.publishMessage(dto);
}, 5, TimeUnit.SECONDS);

32
ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java → fys-admin/src/main/java/com/fuyuanshen/web/controller/CaptchaController.java
View File

@ -1,4 +1,4 @@
package org.dromara.web.controller;
package com.fuyuanshen.web.controller;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.captcha.AbstractCaptcha;
@ -8,24 +8,24 @@ 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.exception.ServiceException;
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.fuyuanshen.common.core.constant.Constants;
import com.fuyuanshen.common.core.constant.GlobalConstants;
import com.fuyuanshen.common.core.domain.R;
import com.fuyuanshen.common.core.exception.ServiceException;
import com.fuyuanshen.common.core.utils.SpringUtils;
import com.fuyuanshen.common.core.utils.StringUtils;
import com.fuyuanshen.common.core.utils.reflect.ReflectUtils;
import com.fuyuanshen.common.mail.config.properties.MailProperties;
import com.fuyuanshen.common.mail.utils.MailUtils;
import com.fuyuanshen.common.ratelimiter.annotation.RateLimiter;
import com.fuyuanshen.common.ratelimiter.enums.LimitType;
import com.fuyuanshen.common.redis.utils.RedisUtils;
import com.fuyuanshen.common.web.config.properties.CaptchaProperties;
import com.fuyuanshen.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.fuyuanshen.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 → fys-admin/src/main/java/com/fuyuanshen/web/controller/IndexController.java
View File

@ -1,9 +1,9 @@
package org.dromara.web.controller;
package com.fuyuanshen.web.controller;
import cn.dev33.satoken.annotation.SaIgnore;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StringUtils;
import com.fuyuanshen.common.core.utils.SpringUtils;
import com.fuyuanshen.common.core.utils.StringUtils;
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 → fys-admin/src/main/java/com/fuyuanshen/web/domain/vo/CaptchaVo.java
View File

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

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

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

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

@ -1,4 +1,4 @@
package org.dromara.web.domain.vo;
package com.fuyuanshen.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 → fys-admin/src/main/java/com/fuyuanshen/web/domain/vo/TenantListVo.java
View File

@ -1,6 +1,6 @@
package org.dromara.web.domain.vo;
package com.fuyuanshen.web.domain.vo;
import org.dromara.system.domain.vo.SysTenantVo;
import com.fuyuanshen.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 → fys-admin/src/main/java/com/fuyuanshen/web/listener/UserActionListener.java
View File

@ -1,4 +1,4 @@
package org.dromara.web.listener;
package com.fuyuanshen.web.listener;
import cn.dev33.satoken.listener.SaTokenListener;
import cn.dev33.satoken.stp.StpUtil;
@ -8,18 +8,18 @@ import cn.hutool.http.useragent.UserAgent;
import cn.hutool.http.useragent.UserAgentUtil;
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.fuyuanshen.common.core.constant.CacheConstants;
import com.fuyuanshen.common.core.constant.Constants;
import com.fuyuanshen.common.core.domain.dto.UserOnlineDTO;
import com.fuyuanshen.common.core.utils.MessageUtils;
import com.fuyuanshen.common.core.utils.ServletUtils;
import com.fuyuanshen.common.core.utils.SpringUtils;
import com.fuyuanshen.common.core.utils.ip.AddressUtils;
import com.fuyuanshen.common.log.event.LogininforEvent;
import com.fuyuanshen.common.redis.utils.RedisUtils;
import com.fuyuanshen.common.satoken.utils.LoginHelper;
import com.fuyuanshen.common.tenant.helper.TenantHelper;
import com.fuyuanshen.web.service.SysLoginService;
import org.springframework.stereotype.Component;
import java.time.Duration;

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

@ -1,11 +1,10 @@
package org.dromara.web.service;
package com.fuyuanshen.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.fuyuanshen.common.core.exception.ServiceException;
import com.fuyuanshen.common.core.utils.SpringUtils;
import com.fuyuanshen.system.domain.vo.SysClientVo;
import com.fuyuanshen.web.domain.vo.LoginVo;
/**
* 授权策略

46
ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java → fys-admin/src/main/java/com/fuyuanshen/web/service/SysLoginService.java
View File

@ -1,4 +1,4 @@
package org.dromara.web.service;
package com.fuyuanshen.web.service;
import cn.dev33.satoken.exception.NotLoginException;
import cn.dev33.satoken.stp.StpUtil;
@ -10,28 +10,28 @@ import com.baomidou.lock.annotation.Lock4j;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import me.zhyd.oauth.model.AuthUser;
import org.dromara.common.core.constant.CacheConstants;
import org.dromara.common.core.constant.Constants;
import org.dromara.common.core.constant.SystemConstants;
import org.dromara.common.core.constant.TenantConstants;
import org.dromara.common.core.domain.dto.PostDTO;
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.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.fuyuanshen.common.core.constant.CacheConstants;
import com.fuyuanshen.common.core.constant.Constants;
import com.fuyuanshen.common.core.constant.SystemConstants;
import com.fuyuanshen.common.core.constant.TenantConstants;
import com.fuyuanshen.common.core.domain.dto.PostDTO;
import com.fuyuanshen.common.core.domain.dto.RoleDTO;
import com.fuyuanshen.common.core.domain.model.LoginUser;
import com.fuyuanshen.common.core.enums.LoginType;
import com.fuyuanshen.common.core.exception.ServiceException;
import com.fuyuanshen.common.core.exception.user.UserException;
import com.fuyuanshen.common.core.utils.*;
import com.fuyuanshen.common.log.event.LogininforEvent;
import com.fuyuanshen.common.mybatis.helper.DataPermissionHelper;
import com.fuyuanshen.common.redis.utils.RedisUtils;
import com.fuyuanshen.common.satoken.utils.LoginHelper;
import com.fuyuanshen.common.tenant.exception.TenantException;
import com.fuyuanshen.common.tenant.helper.TenantHelper;
import com.fuyuanshen.system.domain.SysUser;
import com.fuyuanshen.system.domain.bo.SysSocialBo;
import com.fuyuanshen.system.domain.vo.*;
import com.fuyuanshen.system.mapper.SysUserMapper;
import com.fuyuanshen.system.service.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

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

@ -1,27 +1,27 @@
package org.dromara.web.service;
package com.fuyuanshen.web.service;
import cn.hutool.crypto.digest.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.fuyuanshen.common.core.constant.Constants;
import com.fuyuanshen.common.core.constant.GlobalConstants;
import com.fuyuanshen.common.core.domain.model.RegisterBody;
import com.fuyuanshen.common.core.enums.UserType;
import com.fuyuanshen.common.core.exception.user.CaptchaException;
import com.fuyuanshen.common.core.exception.user.CaptchaExpireException;
import com.fuyuanshen.common.core.exception.user.UserException;
import com.fuyuanshen.common.core.utils.MessageUtils;
import com.fuyuanshen.common.core.utils.ServletUtils;
import com.fuyuanshen.common.core.utils.SpringUtils;
import com.fuyuanshen.common.core.utils.StringUtils;
import com.fuyuanshen.common.log.event.LogininforEvent;
import com.fuyuanshen.common.redis.utils.RedisUtils;
import com.fuyuanshen.common.tenant.helper.TenantHelper;
import com.fuyuanshen.common.web.config.properties.CaptchaProperties;
import com.fuyuanshen.system.domain.SysUser;
import com.fuyuanshen.system.domain.bo.SysUserBo;
import com.fuyuanshen.system.mapper.SysUserMapper;
import com.fuyuanshen.system.service.ISysUserService;
import org.springframework.stereotype.Service;
/**

46
ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java → fys-admin/src/main/java/com/fuyuanshen/web/service/impl/EmailAuthStrategy.java
View File

@ -1,4 +1,4 @@
package org.dromara.web.service.impl;
package com.fuyuanshen.web.service.impl;
import cn.dev33.satoken.stp.StpUtil;
import cn.dev33.satoken.stp.parameter.SaLoginParameter;
@ -6,28 +6,28 @@ 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.constant.Constants;
import org.dromara.common.core.constant.GlobalConstants;
import org.dromara.common.core.constant.SystemConstants;
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.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.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.fuyuanshen.common.core.constant.Constants;
import com.fuyuanshen.common.core.constant.GlobalConstants;
import com.fuyuanshen.common.core.constant.SystemConstants;
import com.fuyuanshen.common.core.domain.model.EmailLoginBody;
import com.fuyuanshen.common.core.domain.model.LoginUser;
import com.fuyuanshen.common.core.enums.LoginType;
import com.fuyuanshen.common.core.exception.user.CaptchaExpireException;
import com.fuyuanshen.common.core.exception.user.UserException;
import com.fuyuanshen.common.core.utils.MessageUtils;
import com.fuyuanshen.common.core.utils.StringUtils;
import com.fuyuanshen.common.core.utils.ValidatorUtils;
import com.fuyuanshen.common.json.utils.JsonUtils;
import com.fuyuanshen.common.redis.utils.RedisUtils;
import com.fuyuanshen.common.satoken.utils.LoginHelper;
import com.fuyuanshen.common.tenant.helper.TenantHelper;
import com.fuyuanshen.system.domain.SysUser;
import com.fuyuanshen.system.domain.vo.SysClientVo;
import com.fuyuanshen.system.domain.vo.SysUserVo;
import com.fuyuanshen.system.mapper.SysUserMapper;
import com.fuyuanshen.web.domain.vo.LoginVo;
import com.fuyuanshen.web.service.IAuthStrategy;
import com.fuyuanshen.web.service.SysLoginService;
import org.springframework.stereotype.Service;
/**

50
ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java → fys-admin/src/main/java/com/fuyuanshen/web/service/impl/PasswordAuthStrategy.java
View File

@ -1,4 +1,4 @@
package org.dromara.web.service.impl;
package com.fuyuanshen.web.service.impl;
import cn.dev33.satoken.stp.StpUtil;
import cn.dev33.satoken.stp.parameter.SaLoginParameter;
@ -7,30 +7,30 @@ import cn.hutool.crypto.digest.BCrypt;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.constant.SystemConstants;
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.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.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.fuyuanshen.common.core.constant.Constants;
import com.fuyuanshen.common.core.constant.GlobalConstants;
import com.fuyuanshen.common.core.constant.SystemConstants;
import com.fuyuanshen.common.core.domain.model.LoginUser;
import com.fuyuanshen.common.core.domain.model.PasswordLoginBody;
import com.fuyuanshen.common.core.enums.LoginType;
import com.fuyuanshen.common.core.exception.user.CaptchaException;
import com.fuyuanshen.common.core.exception.user.CaptchaExpireException;
import com.fuyuanshen.common.core.exception.user.UserException;
import com.fuyuanshen.common.core.utils.MessageUtils;
import com.fuyuanshen.common.core.utils.StringUtils;
import com.fuyuanshen.common.core.utils.ValidatorUtils;
import com.fuyuanshen.common.json.utils.JsonUtils;
import com.fuyuanshen.common.redis.utils.RedisUtils;
import com.fuyuanshen.common.satoken.utils.LoginHelper;
import com.fuyuanshen.common.tenant.helper.TenantHelper;
import com.fuyuanshen.common.web.config.properties.CaptchaProperties;
import com.fuyuanshen.system.domain.SysUser;
import com.fuyuanshen.system.domain.vo.SysClientVo;
import com.fuyuanshen.system.domain.vo.SysUserVo;
import com.fuyuanshen.system.mapper.SysUserMapper;
import com.fuyuanshen.web.domain.vo.LoginVo;
import com.fuyuanshen.web.service.IAuthStrategy;
import com.fuyuanshen.web.service.SysLoginService;
import org.springframework.stereotype.Service;
/**

46
ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java → fys-admin/src/main/java/com/fuyuanshen/web/service/impl/SmsAuthStrategy.java
View File

@ -1,4 +1,4 @@
package org.dromara.web.service.impl;
package com.fuyuanshen.web.service.impl;
import cn.dev33.satoken.stp.StpUtil;
import cn.dev33.satoken.stp.parameter.SaLoginParameter;
@ -6,28 +6,28 @@ 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.constant.Constants;
import org.dromara.common.core.constant.GlobalConstants;
import org.dromara.common.core.constant.SystemConstants;
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.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.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.fuyuanshen.common.core.constant.Constants;
import com.fuyuanshen.common.core.constant.GlobalConstants;
import com.fuyuanshen.common.core.constant.SystemConstants;
import com.fuyuanshen.common.core.domain.model.LoginUser;
import com.fuyuanshen.common.core.domain.model.SmsLoginBody;
import com.fuyuanshen.common.core.enums.LoginType;
import com.fuyuanshen.common.core.exception.user.CaptchaExpireException;
import com.fuyuanshen.common.core.exception.user.UserException;
import com.fuyuanshen.common.core.utils.MessageUtils;
import com.fuyuanshen.common.core.utils.StringUtils;
import com.fuyuanshen.common.core.utils.ValidatorUtils;
import com.fuyuanshen.common.json.utils.JsonUtils;
import com.fuyuanshen.common.redis.utils.RedisUtils;
import com.fuyuanshen.common.satoken.utils.LoginHelper;
import com.fuyuanshen.common.tenant.helper.TenantHelper;
import com.fuyuanshen.system.domain.SysUser;
import com.fuyuanshen.system.domain.vo.SysClientVo;
import com.fuyuanshen.system.domain.vo.SysUserVo;
import com.fuyuanshen.system.mapper.SysUserMapper;
import com.fuyuanshen.web.domain.vo.LoginVo;
import com.fuyuanshen.web.service.IAuthStrategy;
import com.fuyuanshen.web.service.SysLoginService;
import org.springframework.stereotype.Service;
/**

46
ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java → fys-admin/src/main/java/com/fuyuanshen/web/service/impl/SocialAuthStrategy.java
View File

@ -1,4 +1,4 @@
package org.dromara.web.service.impl;
package com.fuyuanshen.web.service.impl;
import cn.dev33.satoken.stp.StpUtil;
import cn.dev33.satoken.stp.parameter.SaLoginParameter;
@ -11,26 +11,26 @@ 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.constant.SystemConstants;
import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.core.domain.model.SocialLoginBody;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.exception.user.UserException;
import org.dromara.common.core.utils.StreamUtils;
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.fuyuanshen.common.core.constant.SystemConstants;
import com.fuyuanshen.common.core.domain.model.LoginUser;
import com.fuyuanshen.common.core.domain.model.SocialLoginBody;
import com.fuyuanshen.common.core.exception.ServiceException;
import com.fuyuanshen.common.core.exception.user.UserException;
import com.fuyuanshen.common.core.utils.StreamUtils;
import com.fuyuanshen.common.core.utils.ValidatorUtils;
import com.fuyuanshen.common.json.utils.JsonUtils;
import com.fuyuanshen.common.satoken.utils.LoginHelper;
import com.fuyuanshen.common.social.config.properties.SocialProperties;
import com.fuyuanshen.common.social.utils.SocialUtils;
import com.fuyuanshen.common.tenant.helper.TenantHelper;
import com.fuyuanshen.system.domain.vo.SysClientVo;
import com.fuyuanshen.system.domain.vo.SysSocialVo;
import com.fuyuanshen.system.domain.vo.SysUserVo;
import com.fuyuanshen.system.mapper.SysUserMapper;
import com.fuyuanshen.system.service.ISysSocialService;
import com.fuyuanshen.web.domain.vo.LoginVo;
import com.fuyuanshen.web.service.IAuthStrategy;
import com.fuyuanshen.web.service.SysLoginService;
import org.springframework.stereotype.Service;
import java.util.List;
@ -70,10 +70,10 @@ public class SocialAuthStrategy implements IAuthStrategy {
AuthUser authUserData = response.getData();
if ("GITEE".equals(authUserData.getSource())) {
// 如用户使用 gitee 登录顺手 star 给作者一点支持 拒绝白嫖
HttpUtil.createRequest(Method.PUT, "https://gitee.com/api/v5/user/starred/dromara/RuoYi-Vue-Plus")
HttpUtil.createRequest(Method.PUT, "https://gitee.com/api/v5/user/starred/dromara/fys-Vue-Plus")
.formStr(MapUtil.of("access_token", authUserData.getToken().getAccessToken()))
.executeAsync();
HttpUtil.createRequest(Method.PUT, "https://gitee.com/api/v5/user/starred/dromara/RuoYi-Cloud-Plus")
HttpUtil.createRequest(Method.PUT, "https://gitee.com/api/v5/user/starred/dromara/fys-Cloud-Plus")
.formStr(MapUtil.of("access_token", authUserData.getToken().getAccessToken()))
.executeAsync();
}

26
ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java → fys-admin/src/main/java/com/fuyuanshen/web/service/impl/XcxAuthStrategy.java
View File

@ -1,4 +1,4 @@
package org.dromara.web.service.impl;
package com.fuyuanshen.web.service.impl;
import cn.dev33.satoken.stp.StpUtil;
import cn.dev33.satoken.stp.parameter.SaLoginParameter;
@ -12,18 +12,18 @@ import me.zhyd.oauth.model.AuthToken;
import me.zhyd.oauth.model.AuthUser;
import me.zhyd.oauth.request.AuthRequest;
import me.zhyd.oauth.request.AuthWechatMiniProgramRequest;
import org.dromara.common.core.constant.SystemConstants;
import org.dromara.common.core.domain.model.XcxLoginBody;
import org.dromara.common.core.domain.model.XcxLoginUser;
import org.dromara.common.core.exception.ServiceException;
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.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.fuyuanshen.common.core.constant.SystemConstants;
import com.fuyuanshen.common.core.domain.model.XcxLoginBody;
import com.fuyuanshen.common.core.domain.model.XcxLoginUser;
import com.fuyuanshen.common.core.exception.ServiceException;
import com.fuyuanshen.common.core.utils.ValidatorUtils;
import com.fuyuanshen.common.json.utils.JsonUtils;
import com.fuyuanshen.common.satoken.utils.LoginHelper;
import com.fuyuanshen.system.domain.vo.SysClientVo;
import com.fuyuanshen.system.domain.vo.SysUserVo;
import com.fuyuanshen.web.domain.vo.LoginVo;
import com.fuyuanshen.web.service.IAuthStrategy;
import com.fuyuanshen.web.service.SysLoginService;
import org.springframework.stereotype.Service;
/**

6
ruoyi-admin/src/main/resources/application-dev.yml → fys-admin/src/main/resources/application-dev.yml
View File

@ -15,7 +15,7 @@ spring.boot.admin.client:
snail-job:
enabled: false
# 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
group: "ruoyi_group"
group: "fys_group"
# SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config` 表
token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
server:
@ -121,7 +121,7 @@ redisson:
# 单节点配置
singleServerConfig:
# 客户端名称 不能用中文
clientName: RuoYi-Vue-Plus
clientName: fys-Vue-Plus
# 最小空闲连接数
connectionMinimumIdleSize: 8
# 连接池大小
@ -166,7 +166,7 @@ sms:
minute-max: 1
# 短信拦截限制单手机号每日最大发送量，只对开启了拦截的配置有效
account-max: 30
# 以下配置来自于 org.dromara.sms4j.provider.config.BaseConfig类中
# 以下配置来自于 com.fuyuanshen.sms4j.provider.config.BaseConfig类中
blends:
# 唯一ID 用于发送短信寻找具体配置 随便定义别用中文即可
# 可以同时存在两个相同厂商 例如: ali1 ali2 两个不同的阿里短信账号 也可用于区分租户

10
ruoyi-admin/src/main/resources/application-prod.yml → fys-admin/src/main/resources/application-prod.yml
View File

@ -1,5 +1,5 @@
--- # 临时文件存储位置 避免临时文件被系统清理报错
spring.servlet.multipart.location: /ruoyi/server/temp
spring.servlet.multipart.location: /fys/server/temp
--- # 监控中心配置
spring.boot.admin.client:
@ -18,7 +18,7 @@ spring.boot.admin.client:
snail-job:
enabled: true
# 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
group: "ruoyi_group"
group: "fys_group"
# SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config`表
token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
server:
@ -107,7 +107,7 @@ spring.data:
# 数据库索引
database: 0
# redis 密码必须配置
password: ruoyi123
password: fys123
# 连接超时时间
timeout: 10s
# 是否开启ssl
@ -124,7 +124,7 @@ redisson:
# 单节点配置
singleServerConfig:
# 客户端名称 不能用中文
clientName: RuoYi-Vue-Plus
clientName: fys-Vue-Plus
# 最小空闲连接数
connectionMinimumIdleSize: 32
# 连接池大小
@ -169,7 +169,7 @@ sms:
minute-max: 1
# 短信拦截限制单手机号每日最大发送量，只对开启了拦截的配置有效
account-max: 30
# 以下配置来自于 org.dromara.sms4j.provider.config.BaseConfig类中
# 以下配置来自于 com.fuyuanshen.sms4j.provider.config.BaseConfig类中
blends:
# 唯一ID 用于发送短信寻找具体配置 随便定义别用中文即可
# 可以同时存在两个相同厂商 例如: ali1 ali2 两个不同的阿里短信账号 也可用于区分租户

26
ruoyi-admin/src/main/resources/application.yml → fys-admin/src/main/resources/application.yml
View File

@ -35,7 +35,7 @@ captcha:
# 日志配置
logging:
level:
org.dromara: @logging.level@
com.fuyuanshen: @logging.level@
org.springframework: warn
org.mybatis.spring.mapper: error
org.apache.fury: warn
@ -52,7 +52,7 @@ user:
# Spring配置
spring:
application:
name: RuoYi-Vue-Plus
name: fys-Vue-Plus
threads:
# 开启虚拟线程 仅jdk21可用
virtual:
@ -133,12 +133,12 @@ tenant:
mybatis-plus:
# 自定义配置 是否全局开启逻辑删除 关闭后 所有逻辑删除功能将失效
enableLogicDelete: true
# 多包名使用 例如 org.dromara.**.mapper,org.xxx.**.mapper
mapperPackage: org.dromara.**.mapper
# 多包名使用 例如 com.fuyuanshen.**.mapper,org.xxx.**.mapper
mapperPackage: com.fuyuanshen.**.mapper
# 对应的 XML 文件位置
mapperLocations: classpath*:mapper/**/*Mapper.xml
# 实体扫描，多个package用逗号或者分号分隔
typeAliasesPackage: org.dromara.**.domain
typeAliasesPackage: com.fuyuanshen.**.domain
global-config:
dbConfig:
# 主键类型
@ -179,16 +179,16 @@ springdoc:
enabled: true
info:
# 标题
title: '标题：RuoYi-Vue-Plus多租户管理系统_接口文档'
title: '标题：fys-Vue-Plus多租户管理系统_接口文档'
# 描述
description: '描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...'
# 版本
version: '版本号: ${ruoyi.version}'
version: '版本号: ${fys.version}'
# 作者信息
contact:
name: Lion Li
email: crazylionli@163.com
url: https://gitee.com/dromara/RuoYi-Vue-Plus
url: https://gitee.com/dromara/fys-Vue-Plus
components:
# 鉴权方式配置
security-schemes:
@ -199,15 +199,15 @@ springdoc:
#这里定义了两个分组，可定义多个，也可以不定义
group-configs:
- group: 1.演示模块
packages-to-scan: org.dromara.demo
packages-to-scan: com.fuyuanshen.demo
- group: 2.通用模块
packages-to-scan: org.dromara.web
packages-to-scan: com.fuyuanshen.web
- group: 3.系统模块
packages-to-scan: org.dromara.system
packages-to-scan: com.fuyuanshen.system
- group: 4.代码生成模块
packages-to-scan: org.dromara.generator
packages-to-scan: com.fuyuanshen.generator
- group: 5.工作流模块
packages-to-scan: org.dromara.workflow
packages-to-scan: com.fuyuanshen.workflow
# 防止XSS攻击
xss:

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

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

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

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

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

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

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

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

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

@ -1,6 +1,6 @@
package org.dromara.test;
package com.fuyuanshen.test;
import org.dromara.common.web.config.properties.CaptchaProperties;
import com.fuyuanshen.common.web.config.properties.CaptchaProperties;
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 → fys-admin/src/test/java/com/fuyuanshen/test/ParamUnitTest.java
View File

@ -1,6 +1,6 @@
package org.dromara.test;
package com.fuyuanshen.test;
import org.dromara.common.core.enums.UserType;
import com.fuyuanshen.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 → fys-admin/src/test/java/com/fuyuanshen/test/TagUnitTest.java
View File

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

98
ruoyi-common/ruoyi-common-bom/pom.xml → fys-common/fys-common-bom/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-common-bom</artifactId>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-common-bom</artifactId>
<version>${revision}</version>
<packaging>pom</packaging>
<description>
ruoyi-common-bom common依赖项
fys-common-bom common依赖项
</description>
<properties>
@ -21,161 +21,161 @@
<dependencies>
<!-- 核心模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-core</artifactId>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-common-core</artifactId>
<version>${revision}</version>
</dependency>
<!-- 接口模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-doc</artifactId>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-common-doc</artifactId>
<version>${revision}</version>
</dependency>
<!-- excel -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-excel</artifactId>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-common-excel</artifactId>
<version>${revision}</version>
</dependency>
<!-- 幂等 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-idempotent</artifactId>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-common-idempotent</artifactId>
<version>${revision}</version>
</dependency>
<!-- 调度模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-job</artifactId>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-common-job</artifactId>
<version>${revision}</version>
</dependency>
<!-- 日志记录 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-log</artifactId>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-common-log</artifactId>
<version>${revision}</version>
</dependency>
<!-- 邮件服务 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-mail</artifactId>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-common-mail</artifactId>
<version>${revision}</version>
</dependency>
<!-- 数据库服务 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-mybatis</artifactId>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-common-mybatis</artifactId>
<version>${revision}</version>
</dependency>
<!-- OSS -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-oss</artifactId>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-common-oss</artifactId>
<version>${revision}</version>
</dependency>
<!-- 限流 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-ratelimiter</artifactId>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-common-ratelimiter</artifactId>
<version>${revision}</version>
</dependency>
<!-- 缓存服务 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-redis</artifactId>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-common-redis</artifactId>
<version>${revision}</version>
</dependency>
<!-- satoken -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-satoken</artifactId>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-common-satoken</artifactId>
<version>${revision}</version>
</dependency>
<!-- 安全模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-security</artifactId>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-common-security</artifactId>
<version>${revision}</version>
</dependency>
<!-- 短信模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-sms</artifactId>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-common-sms</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-social</artifactId>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-common-social</artifactId>
<version>${revision}</version>
</dependency>
<!-- web服务 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-web</artifactId>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-common-web</artifactId>
<version>${revision}</version>
</dependency>
<!-- 翻译模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-translation</artifactId>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-common-translation</artifactId>
<version>${revision}</version>
</dependency>
<!-- 脱敏模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-sensitive</artifactId>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-common-sensitive</artifactId>
<version>${revision}</version>
</dependency>
<!-- 序列化模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-json</artifactId>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-common-json</artifactId>
<version>${revision}</version>
</dependency>
<!-- 数据库加解密模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-encrypt</artifactId>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-common-encrypt</artifactId>
<version>${revision}</version>
</dependency>
<!-- 租户模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-tenant</artifactId>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-common-tenant</artifactId>
<version>${revision}</version>
</dependency>
<!-- WebSocket模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-websocket</artifactId>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-common-websocket</artifactId>
<version>${revision}</version>
</dependency>
<!-- SSE模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-sse</artifactId>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-common-sse</artifactId>
<version>${revision}</version>
</dependency>

8
ruoyi-common/ruoyi-common-core/pom.xml → fys-common/fys-common-core/pom.xml
View File

@ -3,16 +3,16 @@
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.fuyuanshen</groupId>
<artifactId>fys-common</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-common-core</artifactId>
<artifactId>fys-common-core</artifactId>
<description>
ruoyi-common-core 核心模块
fys-common-core 核心模块
</description>
<dependencies>

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

@ -1,4 +1,4 @@
package org.dromara.common.core.config;
package com.fuyuanshen.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 → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/config/AsyncConfig.java
View File

@ -1,8 +1,8 @@
package org.dromara.common.core.config;
package com.fuyuanshen.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.fuyuanshen.common.core.exception.ServiceException;
import com.fuyuanshen.common.core.utils.SpringUtils;
import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.core.task.VirtualThreadTaskExecutor;

8
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/config/ThreadPoolConfig.java
View File

@ -1,11 +1,11 @@
package org.dromara.common.core.config;
package com.fuyuanshen.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.SpringUtils;
import org.dromara.common.core.utils.Threads;
import com.fuyuanshen.common.core.config.properties.ThreadPoolProperties;
import com.fuyuanshen.common.core.utils.SpringUtils;
import com.fuyuanshen.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 → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/config/ValidatorConfig.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.config;
package com.fuyuanshen.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 → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/config/properties/ThreadPoolProperties.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.config.properties;
package com.fuyuanshen.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 → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/CacheConstants.java
View File

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

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

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

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/Constants.java
View File

@ -1,9 +1,9 @@
package org.dromara.common.core.constant;
package com.fuyuanshen.common.core.constant;
/**
* 通用常量信息
*
* @author ruoyi
* @author fys
*/
public interface Constants {

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

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

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

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

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

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

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/SystemConstants.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/SystemConstants.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.constant;
package com.fuyuanshen.common.core.constant;
/**
* 系统常量信息

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

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

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

@ -1,6 +1,6 @@
package org.dromara.common.core.domain;
package com.fuyuanshen.common.core.domain;
import org.dromara.common.core.constant.HttpStatus;
import com.fuyuanshen.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/CompleteTaskDTO.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/CompleteTaskDTO.java
View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DeptDTO.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/DeptDTO.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.domain.dto;
package com.fuyuanshen.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/DictDataDTO.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/DictDataDTO.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.domain.dto;
package com.fuyuanshen.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/DictTypeDTO.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/DictTypeDTO.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.domain.dto;
package com.fuyuanshen.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/FlowCopyDTO.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/FlowCopyDTO.java
View File

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

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

@ -1,4 +1,4 @@
package org.dromara.common.core.domain.dto;
package com.fuyuanshen.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/PostDTO.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/PostDTO.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.domain.dto;
package com.fuyuanshen.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 → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/RoleDTO.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.domain.dto;
package com.fuyuanshen.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/StartProcessDTO.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/StartProcessDTO.java
View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessReturnDTO.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/StartProcessReturnDTO.java
View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/TaskAssigneeDTO.java
View File

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

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

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

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/UserOnlineDTO.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.domain.dto;
package com.fuyuanshen.common.core.domain.dto;
import lombok.Data;
import lombok.NoArgsConstructor;
@ -9,7 +9,7 @@ import java.io.Serializable;
/**
* 当前在线会话
*
* @author ruoyi
* @author fys
*/
@Data

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessDeleteEvent.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/event/ProcessDeleteEvent.java
View File

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

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

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

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

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

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

@ -1,4 +1,4 @@
package org.dromara.common.core.domain.model;
package com.fuyuanshen.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 → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/LoginBody.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.domain.model;
package com.fuyuanshen.common.core.domain.model;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;

6
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/LoginUser.java
View File

@ -1,9 +1,9 @@
package org.dromara.common.core.domain.model;
package com.fuyuanshen.common.core.domain.model;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.dromara.common.core.domain.dto.PostDTO;
import org.dromara.common.core.domain.dto.RoleDTO;
import com.fuyuanshen.common.core.domain.dto.PostDTO;
import com.fuyuanshen.common.core.domain.dto.RoleDTO;
import java.io.Serial;
import java.io.Serializable;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/PasswordLoginBody.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.domain.model;
package com.fuyuanshen.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/RegisterBody.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/RegisterBody.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.domain.model;
package com.fuyuanshen.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/SmsLoginBody.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/SmsLoginBody.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.domain.model;
package com.fuyuanshen.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 → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/SocialLoginBody.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.domain.model;
package com.fuyuanshen.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/TaskAssigneeBody.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/TaskAssigneeBody.java
View File

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

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

@ -1,4 +1,4 @@
package org.dromara.common.core.domain.model;
package com.fuyuanshen.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 → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/XcxLoginUser.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.domain.model;
package com.fuyuanshen.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 → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/enums/BusinessStatusEnum.java
View File

@ -1,10 +1,10 @@
package org.dromara.common.core.enums;
package com.fuyuanshen.common.core.enums;
import cn.hutool.core.util.StrUtil;
import lombok.AllArgsConstructor;
import lombok.Getter;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.StringUtils;
import com.fuyuanshen.common.core.exception.ServiceException;
import com.fuyuanshen.common.core.utils.StringUtils;
import java.util.Arrays;
import java.util.List;

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

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

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/FormatsType.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/enums/FormatsType.java
View File

@ -1,8 +1,8 @@
package org.dromara.common.core.enums;
package com.fuyuanshen.common.core.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
import org.dromara.common.core.utils.StringUtils;
import com.fuyuanshen.common.core.utils.StringUtils;
/*
* 日期格式

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

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

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/enums/UserStatus.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.enums;
package com.fuyuanshen.common.core.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
@ -6,7 +6,7 @@ import lombok.Getter;
/**
* 用户状态
*
* @author ruoyi
* @author fys
*/
@Getter
@AllArgsConstructor

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

@ -1,8 +1,8 @@
package org.dromara.common.core.enums;
package com.fuyuanshen.common.core.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
import org.dromara.common.core.utils.StringUtils;
import com.fuyuanshen.common.core.utils.StringUtils;
/**
* 用户类型

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/ServiceException.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.exception;
package com.fuyuanshen.common.core.exception;
import lombok.*;
@ -7,7 +7,7 @@ import java.io.Serial;
/**
* 业务异常
*
* @author ruoyi
* @author fys
*/
@Data
@EqualsAndHashCode(callSuper = true)

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/SseException.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.exception;
package com.fuyuanshen.common.core.exception;
import lombok.AllArgsConstructor;
import lombok.Data;

8
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/base/BaseException.java
View File

@ -1,8 +1,8 @@
package org.dromara.common.core.exception.base;
package com.fuyuanshen.common.core.exception.base;
import lombok.AllArgsConstructor;
import org.dromara.common.core.utils.MessageUtils;
import org.dromara.common.core.utils.StringUtils;
import com.fuyuanshen.common.core.utils.MessageUtils;
import com.fuyuanshen.common.core.utils.StringUtils;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
@ -12,7 +12,7 @@ import java.io.Serial;
/**
* 基础异常
*
* @author ruoyi
* @author fys
*/
@Data
@EqualsAndHashCode(callSuper = true)

6
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/file/FileException.java
View File

@ -1,13 +1,13 @@
package org.dromara.common.core.exception.file;
package com.fuyuanshen.common.core.exception.file;
import org.dromara.common.core.exception.base.BaseException;
import com.fuyuanshen.common.core.exception.base.BaseException;
import java.io.Serial;
/**
* 文件信息异常类
*
* @author ruoyi
* @author fys
*/
public class FileException extends BaseException {

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/file/FileNameLengthLimitExceededException.java
View File

@ -1,11 +1,11 @@
package org.dromara.common.core.exception.file;
package com.fuyuanshen.common.core.exception.file;
import java.io.Serial;
/**
* 文件名称超长限制异常类
*
* @author ruoyi
* @author fys
*/
public class FileNameLengthLimitExceededException extends FileException {

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/file/FileSizeLimitExceededException.java
View File

@ -1,11 +1,11 @@
package org.dromara.common.core.exception.file;
package com.fuyuanshen.common.core.exception.file;
import java.io.Serial;
/**
* 文件名大小限制异常类
*
* @author ruoyi
* @author fys
*/
public class FileSizeLimitExceededException extends FileException {

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/user/CaptchaException.java
View File

@ -1,11 +1,11 @@
package org.dromara.common.core.exception.user;
package com.fuyuanshen.common.core.exception.user;
import java.io.Serial;
/**
* 验证码错误异常类
*
* @author ruoyi
* @author fys
*/
public class CaptchaException extends UserException {

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/user/CaptchaExpireException.java
View File

@ -1,11 +1,11 @@
package org.dromara.common.core.exception.user;
package com.fuyuanshen.common.core.exception.user;
import java.io.Serial;
/**
* 验证码失效异常类
*
* @author ruoyi
* @author fys
*/
public class CaptchaExpireException extends UserException {

6
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/user/UserException.java
View File

@ -1,13 +1,13 @@
package org.dromara.common.core.exception.user;
package com.fuyuanshen.common.core.exception.user;
import org.dromara.common.core.exception.base.BaseException;
import com.fuyuanshen.common.core.exception.base.BaseException;
import java.io.Serial;
/**
* 用户信息异常类
*
* @author ruoyi
* @author fys
*/
public class UserException extends BaseException {

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

@ -1,7 +1,7 @@
package org.dromara.common.core.factory;
package com.fuyuanshen.common.core.factory;
import cn.hutool.core.lang.PatternPool;
import org.dromara.common.core.constant.RegexConstants;
import com.fuyuanshen.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 → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/factory/YmlPropertySourceFactory.java
View File

@ -1,6 +1,6 @@
package org.dromara.common.core.factory;
package com.fuyuanshen.common.core.factory;
import org.dromara.common.core.utils.StringUtils;
import com.fuyuanshen.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 → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/ConfigService.java
View File

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

4
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/DeptService.java
View File

@ -1,6 +1,6 @@
package org.dromara.common.core.service;
package com.fuyuanshen.common.core.service;
import org.dromara.common.core.domain.dto.DeptDTO;
import com.fuyuanshen.common.core.domain.dto.DeptDTO;
import java.util.List;

6
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/DictService.java
View File

@ -1,7 +1,7 @@
package org.dromara.common.core.service;
package com.fuyuanshen.common.core.service;
import org.dromara.common.core.domain.dto.DictDataDTO;
import org.dromara.common.core.domain.dto.DictTypeDTO;
import com.fuyuanshen.common.core.domain.dto.DictDataDTO;
import com.fuyuanshen.common.core.domain.dto.DictTypeDTO;
import java.util.List;
import java.util.Map;

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

@ -1,6 +1,6 @@
package org.dromara.common.core.service;
package com.fuyuanshen.common.core.service;
import org.dromara.common.core.domain.dto.OssDTO;
import com.fuyuanshen.common.core.domain.dto.OssDTO;
import java.util.List;

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PermissionService.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/PermissionService.java
View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PostService.java → fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/PostService.java
View File

@ -1,4 +1,4 @@
package org.dromara.common.core.service;
package com.fuyuanshen.common.core.service;
/**
* 通用 岗位服务

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