Pre Merge pull request !42 from 十八般武艺集于一身的阳哥哥/D_20230712_个性化修改
十八般武艺集于一身的阳哥哥
Gitee
commit
953c2d2cb7
2
LICENSE
2
LICENSE
|
|
@ -1,6 +1,6 @@
|
|||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2021 yudao-cloud
|
||||
Copyright (c) 2021 fuxiaoaio-cloud
|
||||
|
||||
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
|
||||
|
|
|
|||
86
README.md
86
README.md
|
|
@ -9,9 +9,9 @@
|
|||
|
||||
## 🐶 新手必读
|
||||
|
||||
* 演示地址【Vue3 + element-plus】：<http://dashboard-vue3.yudao.iocoder.cn>
|
||||
* 演示地址【Vue3 + vben(ant-design-vue)】：<http://dashboard-vben.yudao.iocoder.cn>
|
||||
* 演示地址【Vue2 + element-ui】：<http://dashboard.yudao.iocoder.cn>
|
||||
* 演示地址【Vue3 + element-plus】：<http://dashboard-vue3.fuxiaoaio.iocoder.cn>
|
||||
* 演示地址【Vue3 + vben(ant-design-vue)】：<http://dashboard-vben.fuxiaoaio.iocoder.cn>
|
||||
* 演示地址【Vue2 + element-ui】：<http://dashboard.fuxiaoaio.iocoder.cn>
|
||||
* 启动文档：<https://cloud.iocoder.cn/quick-start/>
|
||||
* 视频教程：<https://cloud.iocoder.cn/video/>
|
||||
|
||||
|
|
@ -23,9 +23,9 @@
|
|||
>
|
||||
> 😜 给项目点点 Star 吧，这对我们真的很重要！
|
||||
|
||||
|
||||
|
||||
|
||||
* 管理后台的电脑端：Vue3 提供 [element-plus](https://gitee.com/yudaocode/yudao-ui-admin-vue3)、[vben(ant-design-vue)](https://gitee.com/yudaocode/yudao-ui-admin-vben) 两个版本，Vue2 提供 [element-ui](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/master/yudao-ui-admin) 版本
|
||||
* 管理后台的电脑端：Vue3 提供 [element-plus](https://gitee.com/fuxiaoaiocode/fuxiaoaio-ui-admin-vue3)、[vben(ant-design-vue)](https://gitee.com/fuxiaoaiocode/fuxiaoaio-ui-admin-vben) 两个版本，Vue2 提供 [element-ui](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/master/fuxiaoaio-ui-admin) 版本
|
||||
* 管理后台的移动端：采用 [uni-app](https://github.com/dcloudio/uni-app) 方案，一份代码多终端适配，同时支持 APP、小程序、H5！
|
||||
* 后端采用 Spring Cloud Alibaba 微服务架构，注册中心 + 配置中心 Nacos，消息队列 RocketMQ，定时任务 XXL-Job，服务保障 Sentinel，服务网关 Gateway，分布式事务 Seata
|
||||
* 数据库可使用 MySQL、Oracle、PostgreSQL、SQL Server、MariaDB、国产达梦 DM、TiDB 等，基于 MyBatis Plus、Redis + Redisson 操作
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
|
||||
## 🐳 项目关系
|
||||
|
||||
|
||||
|
||||
|
||||
三个项目的功能对比，可见社区共同整理的 [国产开源项目对比](https://www.yuque.com/xiatian-bsgny/lm0ec1/wqf8mn) 表格。
|
||||
|
||||
|
|
@ -50,19 +50,19 @@
|
|||
| 项目 | Star | 简介 |
|
||||
|-----------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------|
|
||||
| [ruoyi-vue-pro](https://gitee.com/zhijiantianya/ruoyi-vue-pro) | [](https://gitee.com/zhijiantianya/ruoyi-vue-pro) [](https://github.com/YunaiV/ruoyi-vue-pro) | 基于 Spring Boot 多模块架构 |
|
||||
| [yudao-cloud](https://gitee.com/zhijiantianya/yudao-cloud) | [](https://gitee.com/zhijiantianya/yudao-cloud) [](https://github.com/YunaiV/yudao-cloud) | 基于 Spring Cloud 微服务架构 |
|
||||
| [Spring-Boot-Labs](https://gitee.com/yudaocode/SpringBoot-Labs) | [](https://gitee.com/zhijiantianya/yudao-cloud) [](https://github.com/yudaocode/SpringBoot-Labs) | 系统学习 Spring Boot & Cloud 专栏 |
|
||||
| [fuxiaoaio-cloud](https://gitee.com/zhijiantianya/fuxiaoaio-cloud) | [](https://gitee.com/zhijiantianya/fuxiaoaio-cloud) [](https://github.com/YunaiV/fuxiaoaio-cloud) | 基于 Spring Cloud 微服务架构 |
|
||||
| [Spring-Boot-Labs](https://gitee.com/fuxiaoaiocode/SpringBoot-Labs) | [](https://gitee.com/zhijiantianya/fuxiaoaio-cloud) [](https://github.com/fuxiaoaiocode/SpringBoot-Labs) | 系统学习 Spring Boot & Cloud 专栏 |
|
||||
|
||||
### 前端项目
|
||||
|
||||
| 项目 | Star | 简介 |
|
||||
|----------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------|
|
||||
| [yudao-ui-admin-vue3](https://gitee.com/yudaocode/yudao-ui-admin-vue3) | [](https://gitee.com/yudaocode/yudao-ui-admin-vue3) [](https://github.com/yudaocode/yudao-ui-admin-vue3) | 基于 Vue3 + element-plus 实现的管理后台 |
|
||||
| [yudao-ui-admin-vben](https://gitee.com/yudaocode/yudao-ui-admin-vben) | [](https://gitee.com/yudaocode/yudao-ui-admin-vben) [](https://github.com/yudaocode/yudao-ui-admin-vben) | 基于 Vue3 + vben(ant-design-vue) 实现的管理后台 |
|
||||
| [yudao-ui-admin](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/master/yudao-ui-admin) | [](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/master/yudao-ui-admin) [](https://github.com/YunaiV/ruoyi-vue-pro/tree/master/yudao-ui-admin) | 基于 Vue2 + element-ui 实现的管理后台 |
|
||||
| [yudao-ui-admin-uniapp](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/master/yudao-ui-admin-uniapp) | [](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/master/yudao-ui-admin-uniapp) [](https://github.com/YunaiV/ruoyi-vue-pro/tree/master/yudao-ui-admin-uniapp) | 基于 uni-app + uni-ui 实现的管理后台的小程序 |
|
||||
| [yudao-ui-go-view](https://gitee.com/yudaocode/yudao-ui-go-view) | [](https://gitee.com/yudaocode/yudao-ui-go-view) [](https://github.com/yudaocode/yudao-ui-go-view) | 基于 Vue3 + naive-ui 实现的大屏报表 |
|
||||
| [yudao-ui-app](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/master/yudao-ui-app) | [](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/master/yudao-ui-app) [](https://github.com/YunaiV/ruoyi-vue-pro/tree/master/yudao-ui-app) | 基于 uni-app + uview 实现的用户 App |
|
||||
| [fuxiaoaio-ui-admin-vue3](https://gitee.com/fuxiaoaiocode/fuxiaoaio-ui-admin-vue3) | [](https://gitee.com/fuxiaoaiocode/fuxiaoaio-ui-admin-vue3) [](https://github.com/fuxiaoaiocode/fuxiaoaio-ui-admin-vue3) | 基于 Vue3 + element-plus 实现的管理后台 |
|
||||
| [fuxiaoaio-ui-admin-vben](https://gitee.com/fuxiaoaiocode/fuxiaoaio-ui-admin-vben) | [](https://gitee.com/fuxiaoaiocode/fuxiaoaio-ui-admin-vben) [](https://github.com/fuxiaoaiocode/fuxiaoaio-ui-admin-vben) | 基于 Vue3 + vben(ant-design-vue) 实现的管理后台 |
|
||||
| [fuxiaoaio-ui-admin](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/master/fuxiaoaio-ui-admin) | [](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/master/fuxiaoaio-ui-admin) [](https://github.com/YunaiV/ruoyi-vue-pro/tree/master/fuxiaoaio-ui-admin) | 基于 Vue2 + element-ui 实现的管理后台 |
|
||||
| [fuxiaoaio-ui-admin-uniapp](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/master/fuxiaoaio-ui-admin-uniapp) | [](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/master/fuxiaoaio-ui-admin-uniapp) [](https://github.com/YunaiV/ruoyi-vue-pro/tree/master/fuxiaoaio-ui-admin-uniapp) | 基于 uni-app + uni-ui 实现的管理后台的小程序 |
|
||||
| [fuxiaoaio-ui-go-view](https://gitee.com/fuxiaoaiocode/fuxiaoaio-ui-go-view) | [](https://gitee.com/fuxiaoaiocode/fuxiaoaio-ui-go-view) [](https://github.com/fuxiaoaiocode/fuxiaoaio-ui-go-view) | 基于 Vue3 + naive-ui 实现的大屏报表 |
|
||||
| [fuxiaoaio-ui-app](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/master/fuxiaoaio-ui-app) | [](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/master/fuxiaoaio-ui-app) [](https://github.com/YunaiV/ruoyi-vue-pro/tree/master/fuxiaoaio-ui-app) | 基于 uni-app + uview 实现的用户 App |
|
||||
|
||||
## 😎 开源协议
|
||||
|
||||
|
|
@ -219,45 +219,45 @@ ps：核心功能已经实现，正在对接微信小程序中...
|
|||
|
||||
| 项目 | 说明 |
|
||||
|--------------------------------------------------------------------------|--------------------|
|
||||
| `yudao-dependencies` | Maven 依赖版本管理 |
|
||||
| `yudao-framework` | Java 框架拓展 |
|
||||
| `yudao-server` | 管理后台 + 用户 APP 的服务端 |
|
||||
| `yudao-module-system` | 系统功能的 Module 模块 |
|
||||
| `yudao-module-member` | 会员中心的 Module 模块 |
|
||||
| `yudao-module-infra` | 基础设施的 Module 模块 |
|
||||
| `yudao-module-bpm` | 工作流程的 Module 模块 |
|
||||
| `yudao-module-pay` | 支付系统的 Module 模块 |
|
||||
| `yudao-module-mall` | 商城系统的 Module 模块 |
|
||||
| `yudao-module-mp` | 微信公众号的 Module 模块 |
|
||||
| `yudao-module-report` | 大屏报表 Module 模块 |
|
||||
| `fuxiaoaio-dependencies` | Maven 依赖版本管理 |
|
||||
| `fuxiaoaio-framework` | Java 框架拓展 |
|
||||
| `fuxiaoaio-server` | 管理后台 + 用户 APP 的服务端 |
|
||||
| `fuxiaoaio-module-system` | 系统功能的 Module 模块 |
|
||||
| `fuxiaoaio-module-member` | 会员中心的 Module 模块 |
|
||||
| `fuxiaoaio-module-infra` | 基础设施的 Module 模块 |
|
||||
| `fuxiaoaio-module-bpm` | 工作流程的 Module 模块 |
|
||||
| `fuxiaoaio-module-pay` | 支付系统的 Module 模块 |
|
||||
| `fuxiaoaio-module-mall` | 商城系统的 Module 模块 |
|
||||
| `fuxiaoaio-module-mp` | 微信公众号的 Module 模块 |
|
||||
| `fuxiaoaio-module-report` | 大屏报表 Module 模块 |
|
||||
|
||||
### 框架
|
||||
|
||||
| 框架 | 说明 | 版本 | 学习指南 |
|
||||
|---------------------------------------------------------------------------------------------|------------------|-------------|---------------------------------------------------------------------|
|
||||
| [Spring Cloud Alibaba](https://github.com/alibaba/spring-cloud-alibaba) | 微服务框架 | 2021.0.4.0 | [文档](https://github.com/YunaiV/SpringBoot-Labs) |
|
||||
| [Nacos](https://github.com/alibaba/nacos) | 配置中心 & 注册中心 | 2.0.4 | [文档](https://www.iocoder.cn/categories/Nacos/?yudao) |
|
||||
| [RocketMQ](https://github.com/apache/rocketmq) | 消息队列 | 4.9.4 | [文档](https://www.iocoder.cn/categories/RocketMQ/?yudao) |
|
||||
| [Sentinel](https://github.com/alibaba/sentinel) | 服务保障 | 1.8.6 | [文档](https://www.iocoder.cn/categories/Sentinel/?yudao) |
|
||||
| [XXL Job](https://github.com/xuxueli/xxl-job) | 定时任务 | 2.3.1 | [文档](https://www.iocoder.cn/XXL-JOB/good-collection/?yudao) |
|
||||
| [Spring Cloud Gateway](https://github.com/spring-cloud/spring-cloud-gateway) | 服务网关 | 3.4.1 | [文档](https://www.iocoder.cn/categories/Spring-Cloud-Gateway/?yudao) |
|
||||
| [Seata](https://github.com/seata/seata) | 分布式事务 | 1.6.1 | [文档](https://www.iocoder.cn/categories/Seata/?yudao) |
|
||||
| [Nacos](https://github.com/alibaba/nacos) | 配置中心 & 注册中心 | 2.0.4 | [文档](https://www.iocoder.cn/categories/Nacos/?fuxiaoaio) |
|
||||
| [RocketMQ](https://github.com/apache/rocketmq) | 消息队列 | 4.9.4 | [文档](https://www.iocoder.cn/categories/RocketMQ/?fuxiaoaio) |
|
||||
| [Sentinel](https://github.com/alibaba/sentinel) | 服务保障 | 1.8.6 | [文档](https://www.iocoder.cn/categories/Sentinel/?fuxiaoaio) |
|
||||
| [XXL Job](https://github.com/xuxueli/xxl-job) | 定时任务 | 2.3.1 | [文档](https://www.iocoder.cn/XXL-JOB/good-collection/?fuxiaoaio) |
|
||||
| [Spring Cloud Gateway](https://github.com/spring-cloud/spring-cloud-gateway) | 服务网关 | 3.4.1 | [文档](https://www.iocoder.cn/categories/Spring-Cloud-Gateway/?fuxiaoaio) |
|
||||
| [Seata](https://github.com/seata/seata) | 分布式事务 | 1.6.1 | [文档](https://www.iocoder.cn/categories/Seata/?fuxiaoaio) |
|
||||
| [MySQL](https://www.mysql.com/cn/) | 数据库服务器 | 5.7 / 8.0+ | |
|
||||
| [Druid](https://github.com/alibaba/druid) | JDBC 连接池、监控组件 | 1.2.16 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) |
|
||||
| [MyBatis Plus](https://mp.baomidou.com/) | MyBatis 增强工具包 | 3.5.3.1 | [文档](http://www.iocoder.cn/Spring-Boot/MyBatis/?yudao) |
|
||||
| [Dynamic Datasource](https://dynamic-datasource.com/) | 动态数据源 | 3.6.0 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) |
|
||||
| [Druid](https://github.com/alibaba/druid) | JDBC 连接池、监控组件 | 1.2.16 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?fuxiaoaio) |
|
||||
| [MyBatis Plus](https://mp.baomidou.com/) | MyBatis 增强工具包 | 3.5.3.1 | [文档](http://www.iocoder.cn/Spring-Boot/MyBatis/?fuxiaoaio) |
|
||||
| [Dynamic Datasource](https://dynamic-datasource.com/) | 动态数据源 | 3.6.0 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?fuxiaoaio) |
|
||||
| [Redis](https://redis.io/) | key-value 数据库 | 5.0 / 6.0 | |
|
||||
| [Redisson](https://github.com/redisson/redisson) | Redis 客户端 | 3.18.0 | [文档](http://www.iocoder.cn/Spring-Boot/Redis/?yudao) |
|
||||
| [Spring MVC](https://github.com/spring-projects/spring-framework/tree/master/spring-webmvc) | MVC 框架 | 5.3.24 | [文档](http://www.iocoder.cn/SpringMVC/MVC/?yudao) |
|
||||
| [Spring Security](https://github.com/spring-projects/spring-security) | Spring 安全框架 | 5.7.5 | [文档](http://www.iocoder.cn/Spring-Boot/Spring-Security/?yudao) |
|
||||
| [Hibernate Validator](https://github.com/hibernate/hibernate-validator) | 参数校验组件 | 6.2.5 | [文档](http://www.iocoder.cn/Spring-Boot/Validation/?yudao) |
|
||||
| [Redisson](https://github.com/redisson/redisson) | Redis 客户端 | 3.18.0 | [文档](http://www.iocoder.cn/Spring-Boot/Redis/?fuxiaoaio) |
|
||||
| [Spring MVC](https://github.com/spring-projects/spring-framework/tree/master/spring-webmvc) | MVC 框架 | 5.3.24 | [文档](http://www.iocoder.cn/SpringMVC/MVC/?fuxiaoaio) |
|
||||
| [Spring Security](https://github.com/spring-projects/spring-security) | Spring 安全框架 | 5.7.5 | [文档](http://www.iocoder.cn/Spring-Boot/Spring-Security/?fuxiaoaio) |
|
||||
| [Hibernate Validator](https://github.com/hibernate/hibernate-validator) | 参数校验组件 | 6.2.5 | [文档](http://www.iocoder.cn/Spring-Boot/Validation/?fuxiaoaio) |
|
||||
| [Flowable](https://github.com/flowable/flowable-engine) | 工作流引擎 | 6.7.2 | [文档](https://doc.iocoder.cn/bpm/) |
|
||||
| [Knife4j](https://gitee.com/xiaoym/knife4j) | Swagger 增强 UI 实现 | 4.0.0 | [文档](http://www.iocoder.cn/Spring-Boot/Swagger/?yudao) |
|
||||
| [SkyWalking](https://skywalking.apache.org/) | 分布式应用追踪系统 | 8.12.0 | [文档](http://www.iocoder.cn/Spring-Boot/SkyWalking/?yudao) |
|
||||
| [Spring Boot Admin](https://github.com/codecentric/spring-boot-admin) | Spring Boot 监控平台 | 2.7.10 | [文档](http://www.iocoder.cn/Spring-Boot/Admin/?yudao) |
|
||||
| [Knife4j](https://gitee.com/xiaoym/knife4j) | Swagger 增强 UI 实现 | 4.0.0 | [文档](http://www.iocoder.cn/Spring-Boot/Swagger/?fuxiaoaio) |
|
||||
| [SkyWalking](https://skywalking.apache.org/) | 分布式应用追踪系统 | 8.12.0 | [文档](http://www.iocoder.cn/Spring-Boot/SkyWalking/?fuxiaoaio) |
|
||||
| [Spring Boot Admin](https://github.com/codecentric/spring-boot-admin) | Spring Boot 监控平台 | 2.7.10 | [文档](http://www.iocoder.cn/Spring-Boot/Admin/?fuxiaoaio) |
|
||||
| [Jackson](https://github.com/FasterXML/jackson) | JSON 工具库 | 2.13.3 | |
|
||||
| [MapStruct](https://mapstruct.org/) | Java Bean 转换 | 1.5.5.Final | [文档](http://www.iocoder.cn/Spring-Boot/MapStruct/?yudao) |
|
||||
| [Lombok](https://projectlombok.org/) | 消除冗长的 Java 代码 | 1.18.26 | [文档](http://www.iocoder.cn/Spring-Boot/Lombok/?yudao) |
|
||||
| [MapStruct](https://mapstruct.org/) | Java Bean 转换 | 1.5.5.Final | [文档](http://www.iocoder.cn/Spring-Boot/MapStruct/?fuxiaoaio) |
|
||||
| [Lombok](https://projectlombok.org/) | 消除冗长的 Java 代码 | 1.18.26 | [文档](http://www.iocoder.cn/Spring-Boot/Lombok/?fuxiaoaio) |
|
||||
| [JUnit](https://junit.org/junit5/) | Java 单元测试框架 | 5.8.2 | - |
|
||||
| [Mockito](https://github.com/mockito/mockito) | Java Mock 框架 | 4.8.0 | - |
|
||||
|
||||
|
|
|
|||
|
|
@ -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>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-dependencies</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-dependencies</artifactId>
|
||||
<version>${revision}</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
|
|
@ -80,6 +80,7 @@
|
|||
<justauth.version>1.4.0</justauth.version>
|
||||
<jimureport.version>1.5.6</jimureport.version>
|
||||
<xercesImpl.version>2.12.2</xercesImpl.version>
|
||||
<mariadb.version>2.7.3</mariadb.version>
|
||||
</properties>
|
||||
|
||||
<dependencyManagement>
|
||||
|
|
@ -109,68 +110,68 @@
|
|||
|
||||
<!-- 业务组件 -->
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-banner</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-banner</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-biz-operatelog</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-biz-operatelog</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-biz-dict</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-biz-dict</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-biz-sms</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-biz-sms</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-biz-pay</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-biz-pay</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-biz-weixin</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-biz-weixin</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-biz-tenant</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-biz-data-permission</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-biz-data-permission</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-biz-social</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-biz-social</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-biz-error-code</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-biz-error-code</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-biz-ip</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-biz-ip</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-captcha</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-captcha</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-desensitize</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-desensitize</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
|
|
@ -183,21 +184,21 @@
|
|||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-env</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-env</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Web 相关 -->
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-web</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-web</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-security</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-security</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
|
|
@ -244,8 +245,8 @@
|
|||
|
||||
<!-- DB 相关 -->
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-mybatis</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-mybatis</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
<dependency> <!-- TODO 芋艿：说不清楚 -->
|
||||
|
|
@ -276,8 +277,8 @@
|
|||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-redis</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-redis</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
|
|
@ -310,8 +311,8 @@
|
|||
<version>${dubbo.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-rpc</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-rpc</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
|
|
@ -326,22 +327,22 @@
|
|||
<version>${xxl-job.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-job</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-job</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- 消息队列相关 -->
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-mq</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-mq</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- 服务保障相关 -->
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-protection</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-protection</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
|
|
@ -370,8 +371,8 @@
|
|||
|
||||
<!-- 监控相关 -->
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-monitor</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-monitor</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
|
|
@ -429,8 +430,8 @@
|
|||
|
||||
<!-- Test 测试相关 -->
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-test</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-test</artifactId>
|
||||
<version>${revision}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
|
@ -471,8 +472,8 @@
|
|||
|
||||
<!-- 工作流相关 -->
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-flowable</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-flowable</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
@ -489,14 +490,14 @@
|
|||
|
||||
<!-- 工具类相关 -->
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-common</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-common</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-excel</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-excel</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
|
|
@ -645,8 +646,8 @@
|
|||
<version>${okhttp3.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-file</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-file</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
@ -712,6 +713,11 @@
|
|||
<artifactId>xercesImpl</artifactId>
|
||||
<version>${xercesImpl.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.mariadb.jdbc</groupId>
|
||||
<artifactId>mariadb-java-client</artifactId>
|
||||
<version>${mariadb.version}</version>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
|
@ -3,12 +3,12 @@
|
|||
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>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-framework</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-framework</artifactId>
|
||||
<version>${revision}</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>yudao-common</artifactId>
|
||||
<artifactId>fuxiaoaio-common</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>${project.artifactId}</name>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.common.core;
|
||||
package cn.fuxiaoaio.ygg.framework.common.core;
|
||||
|
||||
/**
|
||||
* 可生成 Int 数组的接口
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.common.core;
|
||||
package cn.fuxiaoaio.ygg.framework.common.core;
|
||||
|
||||
import com.google.common.base.Objects;
|
||||
import lombok.AllArgsConstructor;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package cn.iocoder.yudao.framework.common.enums;
|
||||
package cn.fuxiaoaio.ygg.framework.common.enums;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
|
||||
import cn.fuxiaoaio.ygg.framework.common.core.IntArrayValuable;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.common.enums;
|
||||
package cn.fuxiaoaio.ygg.framework.common.enums;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
package cn.iocoder.yudao.framework.common.enums;
|
||||
package cn.fuxiaoaio.ygg.framework.common.enums;
|
||||
|
||||
/**
|
||||
* RPC 相关的枚举
|
||||
*
|
||||
* 虽然放在 yudao-spring-boot-starter-rpc 会相对合适，但是每个 API 模块需要使用到，所以暂时只好放在此处
|
||||
* 虽然放在 fuxiaoaio-spring-boot-starter-rpc 会相对合适，但是每个 API 模块需要使用到，所以暂时只好放在此处
|
||||
*
|
||||
* @author 芋道源码
|
||||
*/
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
package cn.iocoder.yudao.framework.common.enums;
|
||||
package cn.fuxiaoaio.ygg.framework.common.enums;
|
||||
|
||||
import cn.hutool.core.util.ArrayUtil;
|
||||
import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
|
||||
import cn.fuxiaoaio.ygg.framework.common.core.IntArrayValuable;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.common.enums;
|
||||
package cn.fuxiaoaio.ygg.framework.common.enums;
|
||||
|
||||
/**
|
||||
* Web 过滤器顺序的枚举类，保证过滤器按照符合我们的预期
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
package cn.iocoder.yudao.framework.common.exception;
|
||||
package cn.fuxiaoaio.ygg.framework.common.exception;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
|
||||
import cn.iocoder.yudao.framework.common.exception.enums.ServiceErrorCodeRange;
|
||||
import cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants;
|
||||
import cn.fuxiaoaio.ygg.framework.common.exception.enums.ServiceErrorCodeRange;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package cn.iocoder.yudao.framework.common.exception;
|
||||
package cn.fuxiaoaio.ygg.framework.common.exception;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
|
||||
import cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package cn.iocoder.yudao.framework.common.exception;
|
||||
package cn.fuxiaoaio.ygg.framework.common.exception;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.exception.enums.ServiceErrorCodeRange;
|
||||
import cn.fuxiaoaio.ygg.framework.common.exception.enums.ServiceErrorCodeRange;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package cn.iocoder.yudao.framework.common.exception.enums;
|
||||
package cn.fuxiaoaio.ygg.framework.common.exception.enums;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.exception.ErrorCode;
|
||||
import cn.fuxiaoaio.ygg.framework.common.exception.ErrorCode;
|
||||
|
||||
/**
|
||||
* 全局错误码枚举
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.common.exception.enums;
|
||||
package cn.fuxiaoaio.ygg.framework.common.exception.enums;
|
||||
|
||||
/**
|
||||
* 业务异常的错误码区间，解决：解决各模块错误码定义，避免重复，在此只声明不做实际使用
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
package cn.iocoder.yudao.framework.common.exception.util;
|
||||
package cn.fuxiaoaio.ygg.framework.common.exception.util;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.exception.ErrorCode;
|
||||
import cn.iocoder.yudao.framework.common.exception.ServiceException;
|
||||
import cn.fuxiaoaio.ygg.framework.common.exception.ErrorCode;
|
||||
import cn.fuxiaoaio.ygg.framework.common.exception.ServiceException;
|
||||
import com.google.common.annotations.VisibleForTesting;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
|
|
@ -3,4 +3,4 @@
|
|||
*
|
||||
* 例如说，CommonResult 为通用返回
|
||||
*/
|
||||
package cn.iocoder.yudao.framework.common;
|
||||
package cn.fuxiaoaio.ygg.framework.common;
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
package cn.iocoder.yudao.framework.common.pojo;
|
||||
package cn.fuxiaoaio.ygg.framework.common.pojo;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.exception.ErrorCode;
|
||||
import cn.iocoder.yudao.framework.common.exception.ServiceException;
|
||||
import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
|
||||
import cn.fuxiaoaio.ygg.framework.common.exception.ErrorCode;
|
||||
import cn.fuxiaoaio.ygg.framework.common.exception.ServiceException;
|
||||
import cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import lombok.Data;
|
||||
import org.springframework.util.Assert;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.common.pojo;
|
||||
package cn.fuxiaoaio.ygg.framework.common.pojo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.common.pojo;
|
||||
package cn.fuxiaoaio.ygg.framework.common.pojo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.common.pojo;
|
||||
package cn.fuxiaoaio.ygg.framework.common.pojo;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.common.util.cache;
|
||||
package cn.fuxiaoaio.ygg.framework.common.util.cache;
|
||||
|
||||
import com.google.common.cache.CacheBuilder;
|
||||
import com.google.common.cache.CacheLoader;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.common.util.collection;
|
||||
package cn.fuxiaoaio.ygg.framework.common.util.collection;
|
||||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import cn.hutool.core.collection.IterUtil;
|
||||
|
|
@ -8,7 +8,7 @@ import java.util.Collection;
|
|||
import java.util.function.Consumer;
|
||||
import java.util.function.Function;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
|
||||
import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.convertList;
|
||||
|
||||
/**
|
||||
* Array 工具类
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.common.util.collection;
|
||||
package cn.fuxiaoaio.ygg.framework.common.util.collection;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
package cn.iocoder.yudao.framework.common.util.collection;
|
||||
package cn.fuxiaoaio.ygg.framework.common.util.collection;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import cn.iocoder.yudao.framework.common.core.KeyValue;
|
||||
import cn.fuxiaoaio.ygg.framework.common.core.KeyValue;
|
||||
import com.google.common.collect.Maps;
|
||||
import com.google.common.collect.Multimap;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.common.util.collection;
|
||||
package cn.fuxiaoaio.ygg.framework.common.util.collection;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.common.util.date;
|
||||
package cn.fuxiaoaio.ygg.framework.common.util.date;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.date.LocalDateTimeUtil;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.common.util.date;
|
||||
package cn.fuxiaoaio.ygg.framework.common.util.date;
|
||||
|
||||
import cn.hutool.core.date.LocalDateTimeUtil;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.common.util.http;
|
||||
package cn.fuxiaoaio.ygg.framework.common.util.http;
|
||||
|
||||
import cn.hutool.core.codec.Base64;
|
||||
import cn.hutool.core.map.TableMap;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.common.util.io;
|
||||
package cn.fuxiaoaio.ygg.framework.common.util.io;
|
||||
|
||||
import cn.hutool.core.io.FileTypeUtil;
|
||||
import cn.hutool.core.io.FileUtil;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.common.util.io;
|
||||
package cn.fuxiaoaio.ygg.framework.common.util.io;
|
||||
|
||||
import cn.hutool.core.io.IORuntimeException;
|
||||
import cn.hutool.core.io.IoUtil;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.common.util.json;
|
||||
package cn.fuxiaoaio.ygg.framework.common.util.json;
|
||||
|
||||
import cn.hutool.core.util.ArrayUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.common.util.monitor;
|
||||
package cn.fuxiaoaio.ygg.framework.common.util.monitor;
|
||||
|
||||
import org.apache.skywalking.apm.toolkit.trace.TraceContext;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.common.util.number;
|
||||
package cn.fuxiaoaio.ygg.framework.common.util.number;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.common.util.object;
|
||||
package cn.fuxiaoaio.ygg.framework.common.util.object;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.core.util.ReflectUtil;
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
package cn.iocoder.yudao.framework.common.util.object;
|
||||
package cn.fuxiaoaio.ygg.framework.common.util.object;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam;
|
||||
|
||||
/**
|
||||
* {@link cn.iocoder.yudao.framework.common.pojo.PageParam} 工具类
|
||||
* {@link cn.fuxiaoaio.ygg.framework.common.pojo.PageParam} 工具类
|
||||
*
|
||||
* @author 芋道源码
|
||||
*/
|
||||
|
|
@ -4,4 +4,4 @@
|
|||
*
|
||||
* ps：如果担心 Hutool 存在坑的问题，可以阅读 Hutool 的实现源码，以确保可靠性。并且，可以补充相关的单元测试。
|
||||
*/
|
||||
package cn.iocoder.yudao.framework.common.util;
|
||||
package cn.fuxiaoaio.ygg.framework.common.util;
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
package cn.iocoder.yudao.framework.common.util.servlet;
|
||||
package cn.fuxiaoaio.ygg.framework.common.util.servlet;
|
||||
|
||||
import cn.hutool.core.io.IoUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.hutool.extra.servlet.ServletUtil;
|
||||
import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
|
||||
import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.web.context.request.RequestAttributes;
|
||||
import org.springframework.web.context.request.RequestContextHolder;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.common.util.spring;
|
||||
package cn.fuxiaoaio.ygg.framework.common.util.spring;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import org.springframework.aop.framework.AdvisedSupport;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.common.util.spring;
|
||||
package cn.fuxiaoaio.ygg.framework.common.util.spring;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.map.MapUtil;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.common.util.string;
|
||||
package cn.fuxiaoaio.ygg.framework.common.util.string;
|
||||
|
||||
import cn.hutool.core.lang.Assert;
|
||||
import cn.hutool.core.util.ArrayUtil;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.common.util.validation;
|
||||
package cn.fuxiaoaio.ygg.framework.common.util.validation;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package cn.iocoder.yudao.framework.common.validation;
|
||||
package cn.fuxiaoaio.ygg.framework.common.validation;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
|
||||
import cn.fuxiaoaio.ygg.framework.common.core.IntArrayValuable;
|
||||
|
||||
import javax.validation.Constraint;
|
||||
import javax.validation.Payload;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package cn.iocoder.yudao.framework.common.validation;
|
||||
package cn.fuxiaoaio.ygg.framework.common.validation;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
|
||||
import cn.fuxiaoaio.ygg.framework.common.core.IntArrayValuable;
|
||||
|
||||
import javax.validation.ConstraintValidator;
|
||||
import javax.validation.ConstraintValidatorContext;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.common.validation;
|
||||
package cn.fuxiaoaio.ygg.framework.common.validation;
|
||||
|
||||
import javax.validation.Constraint;
|
||||
import javax.validation.Payload;
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
package cn.iocoder.yudao.framework.common.validation;
|
||||
package cn.fuxiaoaio.ygg.framework.common.validation;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.iocoder.yudao.framework.common.util.validation.ValidationUtils;
|
||||
import cn.fuxiaoaio.ygg.framework.common.util.validation.ValidationUtils;
|
||||
|
||||
import javax.validation.ConstraintValidator;
|
||||
import javax.validation.ConstraintValidatorContext;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/**
|
||||
* 使用 Hibernate Validator 实现参数校验
|
||||
*/
|
||||
package cn.iocoder.yudao.framework.common.validation;
|
||||
package cn.fuxiaoaio.ygg.framework.common.validation;
|
||||
|
|
@ -0,0 +1 @@
|
|||
<http://www.iocoder.cn/Spring-Boot/Validation/?fuxiaoaio>
|
||||
|
|
@ -3,12 +3,12 @@
|
|||
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>yudao-framework</artifactId>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>fuxiaoaio-framework</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<version>${revision}</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>yudao-spring-boot-starter-banner</artifactId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-banner</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>${project.artifactId}</name>
|
||||
|
|
@ -17,8 +17,8 @@
|
|||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-common</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-common</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package cn.iocoder.yudao.framework.banner.config;
|
||||
package cn.fuxiaoaio.ygg.framework.banner.config;
|
||||
|
||||
import cn.iocoder.yudao.framework.banner.core.BannerApplicationRunner;
|
||||
import cn.fuxiaoaio.ygg.framework.banner.core.BannerApplicationRunner;
|
||||
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ import org.springframework.context.annotation.Bean;
|
|||
* @author 芋道源码
|
||||
*/
|
||||
@AutoConfiguration
|
||||
public class YudaoBannerAutoConfiguration {
|
||||
public class FuxiaoaioBannerAutoConfiguration {
|
||||
|
||||
@Bean
|
||||
public BannerApplicationRunner bannerApplicationRunner() {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.banner.core;
|
||||
package cn.fuxiaoaio.ygg.framework.banner.core;
|
||||
|
||||
import cn.hutool.core.thread.ThreadUtil;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
|
@ -32,13 +32,13 @@ public class BannerApplicationRunner implements ApplicationRunner {
|
|||
"https://t.zsxq.com/02B6ujIee");
|
||||
|
||||
// 数据报表
|
||||
System.out.println("[报表模块 yudao-module-report 教程][参考 https://cloud.iocoder.cn/report/ 开启]");
|
||||
System.out.println("[报表模块 fuxiaoaio-module-report 教程][参考 https://cloud.iocoder.cn/report/ 开启]");
|
||||
// 工作流
|
||||
System.out.println("[工作流模块 yudao-module-bpm 教程][参考 https://cloud.iocoder.cn/bpm/ 开启]");
|
||||
System.out.println("[工作流模块 fuxiaoaio-module-bpm 教程][参考 https://cloud.iocoder.cn/bpm/ 开启]");
|
||||
// 微信公众号
|
||||
System.out.println("[微信公众号 yudao-module-mp 教程][参考 https://cloud.iocoder.cn/mp/build/ 开启]");
|
||||
System.out.println("[微信公众号 fuxiaoaio-module-mp 教程][参考 https://cloud.iocoder.cn/mp/build/ 开启]");
|
||||
// 商城
|
||||
System.out.println("[商城系统 yudao-module-mall 教程][参考 https://cloud.iocoder.cn/mall/build/ 开启]");
|
||||
System.out.println("[商城系统 fuxiaoaio-module-mall 教程][参考 https://cloud.iocoder.cn/mall/build/ 开启]");
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -3,4 +3,4 @@
|
|||
*
|
||||
* @author 芋道源码
|
||||
*/
|
||||
package cn.iocoder.yudao.framework.banner;
|
||||
package cn.fuxiaoaio.ygg.framework.banner;
|
||||
|
|
@ -0,0 +1 @@
|
|||
cn.fuxiaoaio.ygg.framework.banner.config.FuxiaoaioBannerAutoConfiguration
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
芋道源码 http://www.iocoder.cn
|
||||
Application Version: ${yudao.info.version}
|
||||
Application Version: ${fuxiaoaio.info.version}
|
||||
Spring Boot Version: ${spring-boot.version}
|
||||
|
||||
.__ __. ______ .______ __ __ _______
|
||||
|
|
@ -3,12 +3,12 @@
|
|||
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>yudao-framework</artifactId>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>fuxiaoaio-framework</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<version>${revision}</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>yudao-spring-boot-starter-biz-data-permission</artifactId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-biz-data-permission</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>${project.artifactId}</name>
|
||||
|
|
@ -17,34 +17,34 @@
|
|||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-common</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-common</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Web 相关 -->
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-security</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-security</artifactId>
|
||||
<optional>true</optional> <!-- 可选，如果使用 DeptDataPermissionRule 必须提供 -->
|
||||
</dependency>
|
||||
|
||||
<!-- DB 相关 -->
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-mybatis</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-mybatis</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- 业务组件 -->
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-module-system-api</artifactId> <!-- 需要使用它，进行数据权限的获取 -->
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-module-system-api</artifactId> <!-- 需要使用它，进行数据权限的获取 -->
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Test 测试相关 -->
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-test</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
package cn.iocoder.yudao.framework.datapermission.config;
|
||||
package cn.fuxiaoaio.ygg.framework.datapermission.config;
|
||||
|
||||
import cn.iocoder.yudao.framework.datapermission.core.aop.DataPermissionAnnotationAdvisor;
|
||||
import cn.iocoder.yudao.framework.datapermission.core.db.DataPermissionDatabaseInterceptor;
|
||||
import cn.iocoder.yudao.framework.datapermission.core.rule.DataPermissionRule;
|
||||
import cn.iocoder.yudao.framework.datapermission.core.rule.DataPermissionRuleFactory;
|
||||
import cn.iocoder.yudao.framework.datapermission.core.rule.DataPermissionRuleFactoryImpl;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.aop.DataPermissionAnnotationAdvisor;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.db.DataPermissionDatabaseInterceptor;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.rule.DataPermissionRule;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.rule.DataPermissionRuleFactory;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.rule.DataPermissionRuleFactoryImpl;
|
||||
import cn.fuxiaoaio.ygg.framework.mybatis.core.util.MyBatisUtils;
|
||||
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
|
||||
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
|
|
@ -18,7 +18,7 @@ import java.util.List;
|
|||
* @author 芋道源码
|
||||
*/
|
||||
@AutoConfiguration
|
||||
public class YudaoDataPermissionAutoConfiguration {
|
||||
public class FuxiaoaioDataPermissionAutoConfiguration {
|
||||
|
||||
@Bean
|
||||
public DataPermissionRuleFactory dataPermissionRuleFactory(List<DataPermissionRule> rules) {
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
package cn.iocoder.yudao.framework.datapermission.config;
|
||||
package cn.fuxiaoaio.ygg.framework.datapermission.config;
|
||||
|
||||
import cn.hutool.extra.spring.SpringUtil;
|
||||
import cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissionRule;
|
||||
import cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissionRuleCustomizer;
|
||||
import cn.iocoder.yudao.framework.security.core.LoginUser;
|
||||
import cn.iocoder.yudao.module.system.api.permission.PermissionApi;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.rule.dept.DeptDataPermissionRule;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.rule.dept.DeptDataPermissionRuleCustomizer;
|
||||
import cn.fuxiaoaio.ygg.framework.security.core.LoginUser;
|
||||
import cn.fuxiaoaio.ygg.module.system.api.permission.PermissionApi;
|
||||
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
||||
|
|
@ -20,7 +20,7 @@ import java.util.List;
|
|||
@AutoConfiguration
|
||||
@ConditionalOnClass(LoginUser.class)
|
||||
@ConditionalOnBean(value = DeptDataPermissionRuleCustomizer.class)
|
||||
public class YudaoDeptDataPermissionAutoConfiguration {
|
||||
public class FuxiaoaioDeptDataPermissionAutoConfiguration {
|
||||
|
||||
@Bean
|
||||
public DeptDataPermissionRule deptDataPermissionRule(PermissionApi permissionApi,
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package cn.iocoder.yudao.framework.datapermission.core.annotation;
|
||||
package cn.fuxiaoaio.ygg.framework.datapermission.core.annotation;
|
||||
|
||||
import cn.iocoder.yudao.framework.datapermission.core.rule.DataPermissionRule;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.rule.DataPermissionRule;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package cn.iocoder.yudao.framework.datapermission.core.aop;
|
||||
package cn.fuxiaoaio.ygg.framework.datapermission.core.aop;
|
||||
|
||||
import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.annotation.DataPermission;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import org.aopalliance.aop.Advice;
|
||||
|
|
@ -10,7 +10,7 @@ import org.springframework.aop.support.ComposablePointcut;
|
|||
import org.springframework.aop.support.annotation.AnnotationMatchingPointcut;
|
||||
|
||||
/**
|
||||
* {@link cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission} 注解的 Advisor 实现类
|
||||
* {@link cn.fuxiaoaio.ygg.framework.datapermission.core.annotation.DataPermission} 注解的 Advisor 实现类
|
||||
*
|
||||
* @author 芋道源码
|
||||
*/
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package cn.iocoder.yudao.framework.datapermission.core.aop;
|
||||
package cn.fuxiaoaio.ygg.framework.datapermission.core.aop;
|
||||
|
||||
import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.annotation.DataPermission;
|
||||
import lombok.Getter;
|
||||
import org.aopalliance.intercept.MethodInterceptor;
|
||||
import org.aopalliance.intercept.MethodInvocation;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package cn.iocoder.yudao.framework.datapermission.core.aop;
|
||||
package cn.fuxiaoaio.ygg.framework.datapermission.core.aop;
|
||||
|
||||
import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.annotation.DataPermission;
|
||||
import com.alibaba.ttl.TransmittableThreadLocal;
|
||||
|
||||
import java.util.LinkedList;
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
package cn.iocoder.yudao.framework.datapermission.core.db;
|
||||
package cn.fuxiaoaio.ygg.framework.datapermission.core.db;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.iocoder.yudao.framework.common.util.collection.SetUtils;
|
||||
import cn.iocoder.yudao.framework.datapermission.core.rule.DataPermissionRule;
|
||||
import cn.iocoder.yudao.framework.datapermission.core.rule.DataPermissionRuleFactory;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils;
|
||||
import cn.fuxiaoaio.ygg.framework.common.util.collection.SetUtils;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.rule.DataPermissionRule;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.rule.DataPermissionRuleFactory;
|
||||
import cn.fuxiaoaio.ygg.framework.mybatis.core.util.MyBatisUtils;
|
||||
import com.alibaba.ttl.TransmittableThreadLocal;
|
||||
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
||||
import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.datapermission.core.rule;
|
||||
package cn.fuxiaoaio.ygg.framework.datapermission.core.rule;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
|
||||
import net.sf.jsqlparser.expression.Alias;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.datapermission.core.rule;
|
||||
package cn.fuxiaoaio.ygg.framework.datapermission.core.rule;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
package cn.iocoder.yudao.framework.datapermission.core.rule;
|
||||
package cn.fuxiaoaio.ygg.framework.datapermission.core.rule;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.util.ArrayUtil;
|
||||
import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
|
||||
import cn.iocoder.yudao.framework.datapermission.core.aop.DataPermissionContextHolder;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.annotation.DataPermission;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.aop.DataPermissionContextHolder;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
import java.util.Collections;
|
||||
|
|
@ -1,19 +1,19 @@
|
|||
package cn.iocoder.yudao.framework.datapermission.core.rule.dept;
|
||||
package cn.fuxiaoaio.ygg.framework.datapermission.core.rule.dept;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
|
||||
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
|
||||
import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
|
||||
import cn.iocoder.yudao.framework.datapermission.core.rule.DataPermissionRule;
|
||||
import cn.iocoder.yudao.framework.expression.OrExpressionX;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils;
|
||||
import cn.iocoder.yudao.framework.security.core.LoginUser;
|
||||
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
|
||||
import cn.iocoder.yudao.module.system.api.permission.PermissionApi;
|
||||
import cn.iocoder.yudao.module.system.api.permission.dto.DeptDataPermissionRespDTO;
|
||||
import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum;
|
||||
import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils;
|
||||
import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.rule.DataPermissionRule;
|
||||
import cn.fuxiaoaio.ygg.framework.expression.OrExpressionX;
|
||||
import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO;
|
||||
import cn.fuxiaoaio.ygg.framework.mybatis.core.util.MyBatisUtils;
|
||||
import cn.fuxiaoaio.ygg.framework.security.core.LoginUser;
|
||||
import cn.fuxiaoaio.ygg.framework.security.core.util.SecurityFrameworkUtils;
|
||||
import cn.fuxiaoaio.ygg.module.system.api.permission.PermissionApi;
|
||||
import cn.fuxiaoaio.ygg.module.system.api.permission.dto.DeptDataPermissionRespDTO;
|
||||
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
|
@ -36,7 +36,7 @@ import java.util.Set;
|
|||
* 注意，使用 DeptDataPermissionRule 时，需要保证表中有 dept_id 部门编号的字段，可自定义。
|
||||
*
|
||||
* 实际业务场景下，会存在一个经典的问题？当用户修改部门时，冗余的 dept_id 是否需要修改？
|
||||
* 1. 一般情况下，dept_id 不进行修改，则会导致用户看到之前的数据。【yudao-server 采用该方案】
|
||||
* 1. 一般情况下，dept_id 不进行修改，则会导致用户看到之前的数据。【fuxiaoaio-server 采用该方案】
|
||||
* 2. 部分情况下，希望该用户还是能看到之前的数据，则有两种方式解决：【需要你改造该 DeptDataPermissionRule 的实现代码】
|
||||
* 1）编写洗数据的脚本，将 dept_id 修改成新部门的编号；【建议】
|
||||
* 最终过滤条件是 WHERE dept_id = ?
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.datapermission.core.rule.dept;
|
||||
package cn.fuxiaoaio.ygg.framework.datapermission.core.rule.dept;
|
||||
|
||||
/**
|
||||
* {@link DeptDataPermissionRule} 的自定义配置接口
|
||||
|
|
@ -3,4 +3,4 @@
|
|||
*
|
||||
* @author 芋道源码
|
||||
*/
|
||||
package cn.iocoder.yudao.framework.datapermission.core.rule.dept;
|
||||
package cn.fuxiaoaio.ygg.framework.datapermission.core.rule.dept;
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
package cn.iocoder.yudao.framework.datapermission.core.util;
|
||||
package cn.fuxiaoaio.ygg.framework.datapermission.core.util;
|
||||
|
||||
import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
|
||||
import cn.iocoder.yudao.framework.datapermission.core.aop.DataPermissionContextHolder;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.annotation.DataPermission;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.aop.DataPermissionContextHolder;
|
||||
import lombok.SneakyThrows;
|
||||
|
||||
/**
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/**
|
||||
* 基于 JSqlParser 解析 SQL，增加数据权限的 WHERE 条件
|
||||
*/
|
||||
package cn.iocoder.yudao.framework.datapermission;
|
||||
package cn.fuxiaoaio.ygg.framework.datapermission;
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
cn.fuxiaoaio.ygg.framework.datapermission.config.FuxiaoaioDataPermissionAutoConfiguration
|
||||
cn.fuxiaoaio.ygg.framework.datapermission.config.FuxiaoaioDeptDataPermissionAutoConfiguration
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
package cn.iocoder.yudao.framework.datapermission.core.aop;
|
||||
package cn.fuxiaoaio.ygg.framework.datapermission.core.aop;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
|
||||
import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.annotation.DataPermission;
|
||||
import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseMockitoUnitTest;
|
||||
import org.aopalliance.intercept.MethodInvocation;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package cn.iocoder.yudao.framework.datapermission.core.aop;
|
||||
package cn.fuxiaoaio.ygg.framework.datapermission.core.aop;
|
||||
|
||||
import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.annotation.DataPermission;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
package cn.iocoder.yudao.framework.datapermission.core.db;
|
||||
package cn.fuxiaoaio.ygg.framework.datapermission.core.db;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.util.collection.SetUtils;
|
||||
import cn.iocoder.yudao.framework.datapermission.core.rule.DataPermissionRule;
|
||||
import cn.iocoder.yudao.framework.datapermission.core.rule.DataPermissionRuleFactory;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils;
|
||||
import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
|
||||
import cn.fuxiaoaio.ygg.framework.common.util.collection.SetUtils;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.rule.DataPermissionRule;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.rule.DataPermissionRuleFactory;
|
||||
import cn.fuxiaoaio.ygg.framework.mybatis.core.util.MyBatisUtils;
|
||||
import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseMockitoUnitTest;
|
||||
import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
|
||||
import net.sf.jsqlparser.expression.Alias;
|
||||
import net.sf.jsqlparser.expression.Expression;
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
package cn.iocoder.yudao.framework.datapermission.core.db;
|
||||
package cn.fuxiaoaio.ygg.framework.datapermission.core.db;
|
||||
|
||||
import cn.iocoder.yudao.framework.datapermission.core.rule.DataPermissionRule;
|
||||
import cn.iocoder.yudao.framework.datapermission.core.rule.DataPermissionRuleFactory;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils;
|
||||
import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.rule.DataPermissionRule;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.rule.DataPermissionRuleFactory;
|
||||
import cn.fuxiaoaio.ygg.framework.mybatis.core.util.MyBatisUtils;
|
||||
import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseMockitoUnitTest;
|
||||
import net.sf.jsqlparser.expression.Alias;
|
||||
import net.sf.jsqlparser.expression.Expression;
|
||||
import net.sf.jsqlparser.expression.LongValue;
|
||||
|
|
@ -19,7 +19,7 @@ import org.mockito.Mock;
|
|||
import java.util.Arrays;
|
||||
import java.util.Set;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet;
|
||||
import static cn.fuxiaoaio.ygg.framework.common.util.collection.SetUtils.asSet;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
/**
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
package cn.iocoder.yudao.framework.datapermission.core.rule;
|
||||
package cn.fuxiaoaio.ygg.framework.datapermission.core.rule;
|
||||
|
||||
import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
|
||||
import cn.iocoder.yudao.framework.datapermission.core.aop.DataPermissionContextHolder;
|
||||
import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.annotation.DataPermission;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.aop.DataPermissionContextHolder;
|
||||
import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseMockitoUnitTest;
|
||||
import net.sf.jsqlparser.expression.Alias;
|
||||
import net.sf.jsqlparser.expression.Expression;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
|
|
@ -15,7 +15,7 @@ import java.util.Arrays;
|
|||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString;
|
||||
import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.randomString;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
/**
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
package cn.iocoder.yudao.framework.datapermission.core.rule.dept;
|
||||
package cn.fuxiaoaio.ygg.framework.datapermission.core.rule.dept;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.util.ReflectUtil;
|
||||
import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
|
||||
import cn.iocoder.yudao.framework.common.util.collection.SetUtils;
|
||||
import cn.iocoder.yudao.framework.security.core.LoginUser;
|
||||
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
|
||||
import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
|
||||
import cn.iocoder.yudao.module.system.api.permission.PermissionApi;
|
||||
import cn.iocoder.yudao.module.system.api.permission.dto.DeptDataPermissionRespDTO;
|
||||
import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum;
|
||||
import cn.fuxiaoaio.ygg.framework.common.util.collection.SetUtils;
|
||||
import cn.fuxiaoaio.ygg.framework.security.core.LoginUser;
|
||||
import cn.fuxiaoaio.ygg.framework.security.core.util.SecurityFrameworkUtils;
|
||||
import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseMockitoUnitTest;
|
||||
import cn.fuxiaoaio.ygg.module.system.api.permission.PermissionApi;
|
||||
import cn.fuxiaoaio.ygg.module.system.api.permission.dto.DeptDataPermissionRespDTO;
|
||||
import net.sf.jsqlparser.expression.Alias;
|
||||
import net.sf.jsqlparser.expression.Expression;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
|
|
@ -19,10 +19,10 @@ import org.mockito.MockedStatic;
|
|||
|
||||
import java.util.Map;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
||||
import static cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissionRule.EXPRESSION_NULL;
|
||||
import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
|
||||
import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString;
|
||||
import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success;
|
||||
import static cn.fuxiaoaio.ygg.framework.datapermission.core.rule.dept.DeptDataPermissionRule.EXPRESSION_NULL;
|
||||
import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.randomPojo;
|
||||
import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.randomString;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.ArgumentMatchers.same;
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
package cn.iocoder.yudao.framework.datapermission.core.utils;
|
||||
package cn.fuxiaoaio.ygg.framework.datapermission.core.utils;
|
||||
|
||||
import cn.iocoder.yudao.framework.datapermission.core.aop.DataPermissionContextHolder;
|
||||
import cn.iocoder.yudao.framework.datapermission.core.util.DataPermissionUtils;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.aop.DataPermissionContextHolder;
|
||||
import cn.fuxiaoaio.ygg.framework.datapermission.core.util.DataPermissionUtils;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
|
@ -3,12 +3,12 @@
|
|||
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>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-framework</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-framework</artifactId>
|
||||
<version>${revision}</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>yudao-spring-boot-starter-biz-dict</artifactId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-biz-dict</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>${project.artifactId}</name>
|
||||
|
|
@ -17,8 +17,8 @@
|
|||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-common</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-common</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Spring 核心 -->
|
||||
|
|
@ -29,15 +29,15 @@
|
|||
|
||||
<!-- RPC 远程调用相关 -->
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-rpc</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-rpc</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
|
||||
<!-- 业务组件 -->
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-module-system-api</artifactId> <!-- 需要使用它，进行 Token 的校验 -->
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-module-system-api</artifactId> <!-- 需要使用它，进行 Token 的校验 -->
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
|
|
@ -49,8 +49,8 @@
|
|||
|
||||
<!-- Test 测试相关 -->
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-test</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
package cn.iocoder.yudao.framework.dict.config;
|
||||
package cn.fuxiaoaio.ygg.framework.dict.config;
|
||||
|
||||
import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils;
|
||||
import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
|
||||
import cn.fuxiaoaio.ygg.framework.dict.core.util.DictFrameworkUtils;
|
||||
import cn.fuxiaoaio.ygg.module.system.api.dict.DictDataApi;
|
||||
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
|
||||
@AutoConfiguration
|
||||
public class YudaoDictAutoConfiguration {
|
||||
public class FuxiaoaioDictAutoConfiguration {
|
||||
|
||||
@Bean
|
||||
@SuppressWarnings("InstantiationOfUtilityClass")
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package cn.iocoder.yudao.framework.dict.config;
|
||||
package cn.fuxiaoaio.ygg.framework.dict.config;
|
||||
|
||||
import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
|
||||
import cn.fuxiaoaio.ygg.module.system.api.dict.DictDataApi;
|
||||
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||
import org.springframework.cloud.openfeign.EnableFeignClients;
|
||||
|
||||
|
|
@ -11,5 +11,5 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
|
|||
*/
|
||||
@AutoConfiguration
|
||||
@EnableFeignClients(clients = DictDataApi.class) // 主要是引入相关的 API 服务
|
||||
public class YudaoDictRpcAutoConfiguration {
|
||||
public class FuxiaoaioDictRpcAutoConfiguration {
|
||||
}
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
/**
|
||||
* 占位
|
||||
*/
|
||||
package cn.fuxiaoaio.ygg.framework.dict.core;
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
package cn.iocoder.yudao.framework.dict.core.util;
|
||||
package cn.fuxiaoaio.ygg.framework.dict.core.util;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.iocoder.yudao.framework.common.core.KeyValue;
|
||||
import cn.iocoder.yudao.framework.common.util.cache.CacheUtils;
|
||||
import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
|
||||
import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO;
|
||||
import cn.fuxiaoaio.ygg.framework.common.core.KeyValue;
|
||||
import cn.fuxiaoaio.ygg.framework.common.util.cache.CacheUtils;
|
||||
import cn.fuxiaoaio.ygg.module.system.api.dict.DictDataApi;
|
||||
import cn.fuxiaoaio.ygg.module.system.api.dict.dto.DictDataRespDTO;
|
||||
import com.google.common.cache.CacheLoader;
|
||||
import com.google.common.cache.LoadingCache;
|
||||
import lombok.SneakyThrows;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* 字典数据模块，提供 {@link cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils} 工具类
|
||||
* 字典数据模块，提供 {@link cn.fuxiaoaio.ygg.framework.dict.core.util.DictFrameworkUtils} 工具类
|
||||
*
|
||||
* 通过将字典缓存在内存中，保证性能
|
||||
*/
|
||||
package cn.iocoder.yudao.framework.dict;
|
||||
package cn.fuxiaoaio.ygg.framework.dict;
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
cn.fuxiaoaio.ygg.framework.dict.config.FuxiaoaioDictRpcAutoConfiguration
|
||||
cn.fuxiaoaio.ygg.framework.dict.config.FuxiaoaioDictAutoConfiguration
|
||||
|
|
@ -1,16 +1,16 @@
|
|||
package cn.iocoder.yudao.framework.datapermission.core.util;
|
||||
package cn.fuxiaoaio.ygg.framework.datapermission.core.util;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
|
||||
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
||||
import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils;
|
||||
import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
|
||||
import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
|
||||
import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO;
|
||||
import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum;
|
||||
import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult;
|
||||
import cn.fuxiaoaio.ygg.framework.dict.core.util.DictFrameworkUtils;
|
||||
import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseMockitoUnitTest;
|
||||
import cn.fuxiaoaio.ygg.module.system.api.dict.DictDataApi;
|
||||
import cn.fuxiaoaio.ygg.module.system.api.dict.dto.DictDataRespDTO;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.Mock;
|
||||
|
||||
import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
|
||||
import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.randomPojo;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
|
|
@ -3,12 +3,12 @@
|
|||
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>yudao-framework</artifactId>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>fuxiaoaio-framework</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<version>${revision}</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>yudao-spring-boot-starter-biz-error-code</artifactId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-biz-error-code</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>${project.artifactId}</name>
|
||||
|
|
@ -22,8 +22,8 @@
|
|||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-common</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-common</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Spring 核心 -->
|
||||
|
|
@ -34,15 +34,15 @@
|
|||
|
||||
<!-- RPC 远程调用相关 -->
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-rpc</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-rpc</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
|
||||
<!-- 业务组件 -->
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-module-system-api</artifactId> <!-- 需要使用它，进行操作日志的记录 -->
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-module-system-api</artifactId> <!-- 需要使用它，进行操作日志的记录 -->
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.errorcode.config;
|
||||
package cn.fuxiaoaio.ygg.framework.errorcode.config;
|
||||
|
||||
import lombok.Data;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
|
|
@ -12,7 +12,7 @@ import java.util.List;
|
|||
*
|
||||
* @author dlyan
|
||||
*/
|
||||
@ConfigurationProperties("yudao.error-code")
|
||||
@ConfigurationProperties("fuxiaoaio.error-code")
|
||||
@Data
|
||||
@Validated
|
||||
public class ErrorCodeProperties {
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
package cn.iocoder.yudao.framework.errorcode.config;
|
||||
package cn.fuxiaoaio.ygg.framework.errorcode.config;
|
||||
|
||||
import cn.iocoder.yudao.framework.errorcode.core.generator.ErrorCodeAutoGenerator;
|
||||
import cn.iocoder.yudao.framework.errorcode.core.generator.ErrorCodeAutoGeneratorImpl;
|
||||
import cn.iocoder.yudao.framework.errorcode.core.loader.ErrorCodeLoader;
|
||||
import cn.iocoder.yudao.framework.errorcode.core.loader.ErrorCodeLoaderImpl;
|
||||
import cn.iocoder.yudao.module.system.api.errorcode.ErrorCodeApi;
|
||||
import cn.fuxiaoaio.ygg.framework.errorcode.core.generator.ErrorCodeAutoGenerator;
|
||||
import cn.fuxiaoaio.ygg.framework.errorcode.core.generator.ErrorCodeAutoGeneratorImpl;
|
||||
import cn.fuxiaoaio.ygg.framework.errorcode.core.loader.ErrorCodeLoader;
|
||||
import cn.fuxiaoaio.ygg.framework.errorcode.core.loader.ErrorCodeLoaderImpl;
|
||||
import cn.fuxiaoaio.ygg.module.system.api.errorcode.ErrorCodeApi;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||
|
|
@ -18,10 +18,10 @@ import org.springframework.scheduling.annotation.EnableScheduling;
|
|||
* @author 芋道源码
|
||||
*/
|
||||
@AutoConfiguration
|
||||
@ConditionalOnProperty(prefix = "yudao.error-code", value = "enable", matchIfMissing = true) // 允许使用 yudao.error-code.enable=false 禁用访问日志
|
||||
@ConditionalOnProperty(prefix = "fuxiaoaio.error-code", value = "enable", matchIfMissing = true) // 允许使用 fuxiaoaio.error-code.enable=false 禁用访问日志
|
||||
@EnableConfigurationProperties(ErrorCodeProperties.class)
|
||||
@EnableScheduling // 开启调度任务的功能，因为 ErrorCodeRemoteLoader 通过定时刷新错误码
|
||||
public class YudaoErrorCodeAutoConfiguration {
|
||||
public class FuxiaoaioErrorCodeAutoConfiguration {
|
||||
|
||||
@Bean
|
||||
public ErrorCodeAutoGenerator errorCodeAutoGenerator(@Value("${spring.application.name}") String applicationName,
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package cn.iocoder.yudao.framework.errorcode.config;
|
||||
package cn.fuxiaoaio.ygg.framework.errorcode.config;
|
||||
|
||||
import cn.iocoder.yudao.module.system.api.errorcode.ErrorCodeApi;
|
||||
import cn.fuxiaoaio.ygg.module.system.api.errorcode.ErrorCodeApi;
|
||||
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||
import org.springframework.cloud.openfeign.EnableFeignClients;
|
||||
|
||||
|
|
@ -11,5 +11,5 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
|
|||
*/
|
||||
@AutoConfiguration
|
||||
@EnableFeignClients(clients = ErrorCodeApi.class) // 主要是引入相关的 API 服务
|
||||
public class YudaoErrorCodeRpcAutoConfiguration {
|
||||
public class FuxiaoaioErrorCodeRpcAutoConfiguration {
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package cn.iocoder.yudao.framework.errorcode.core.generator;
|
||||
package cn.fuxiaoaio.ygg.framework.errorcode.core.generator;
|
||||
|
||||
/**
|
||||
* 错误码的自动生成器
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
package cn.iocoder.yudao.framework.errorcode.core.generator;
|
||||
package cn.fuxiaoaio.ygg.framework.errorcode.core.generator;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.exceptions.ExceptionUtil;
|
||||
import cn.hutool.core.util.ClassUtil;
|
||||
import cn.hutool.core.util.ReflectUtil;
|
||||
import cn.iocoder.yudao.framework.common.exception.ErrorCode;
|
||||
import cn.iocoder.yudao.module.system.api.errorcode.ErrorCodeApi;
|
||||
import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeAutoGenerateReqDTO;
|
||||
import cn.fuxiaoaio.ygg.framework.common.exception.ErrorCode;
|
||||
import cn.fuxiaoaio.ygg.module.system.api.errorcode.ErrorCodeApi;
|
||||
import cn.fuxiaoaio.ygg.module.system.api.errorcode.dto.ErrorCodeAutoGenerateReqDTO;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.boot.context.event.ApplicationReadyEvent;
|
||||
|
|
@ -61,7 +61,7 @@ public class ErrorCodeAutoGeneratorImpl implements ErrorCodeAutoGenerator {
|
|||
private List<ErrorCodeAutoGenerateReqDTO> parseErrorCode() {
|
||||
// 校验 errorCodeConstantsClass 参数
|
||||
if (CollUtil.isEmpty(constantsClassList)) {
|
||||
log.info("[execute][未配置 yudao.error-code.constants-class-list 配置项，不进行自动写入到 system 服务中]");
|
||||
log.info("[execute][未配置 fuxiaoaio.error-code.constants-class-list 配置项，不进行自动写入到 system 服务中]");
|
||||
return new ArrayList<>();
|
||||
}
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package cn.iocoder.yudao.framework.errorcode.core.loader;
|
||||
package cn.fuxiaoaio.ygg.framework.errorcode.core.loader;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
|
||||
import cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil;
|
||||
|
||||
/**
|
||||
* 错误码加载器
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
package cn.iocoder.yudao.framework.errorcode.core.loader;
|
||||
package cn.fuxiaoaio.ygg.framework.errorcode.core.loader;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.iocoder.yudao.framework.common.util.date.DateUtils;
|
||||
import cn.iocoder.yudao.module.system.api.errorcode.ErrorCodeApi;
|
||||
import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeRespDTO;
|
||||
import cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils;
|
||||
import cn.fuxiaoaio.ygg.module.system.api.errorcode.ErrorCodeApi;
|
||||
import cn.fuxiaoaio.ygg.module.system.api.errorcode.dto.ErrorCodeRespDTO;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.boot.context.event.ApplicationReadyEvent;
|
||||
|
|
@ -7,4 +7,4 @@
|
|||
*
|
||||
* @author 芋道源码
|
||||
*/
|
||||
package cn.iocoder.yudao.framework.errorcode;
|
||||
package cn.fuxiaoaio.ygg.framework.errorcode;
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
cn.fuxiaoaio.ygg.framework.errorcode.config.FuxiaoaioErrorCodeRpcAutoConfiguration
|
||||
cn.fuxiaoaio.ygg.framework.errorcode.config.FuxiaoaioErrorCodeAutoConfiguration
|
||||
|
|
@ -3,12 +3,12 @@
|
|||
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>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-framework</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-framework</artifactId>
|
||||
<version>${revision}</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>yudao-spring-boot-starter-biz-ip</artifactId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-biz-ip</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>${project.artifactId}</name>
|
||||
|
|
@ -22,8 +22,8 @@
|
|||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-common</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-common</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- IP地址检索 -->
|
||||
|
|
@ -45,8 +45,8 @@
|
|||
|
||||
<!-- Test 测试相关 -->
|
||||
<dependency>
|
||||
<groupId>cn.iocoder.cloud</groupId>
|
||||
<artifactId>yudao-spring-boot-starter-test</artifactId>
|
||||
<groupId>cn.fuxiaoaio.ygg</groupId>
|
||||
<artifactId>fuxiaoaio-spring-boot-starter-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package cn.iocoder.yudao.framework.ip.core;
|
||||
package cn.fuxiaoaio.ygg.framework.ip.core;
|
||||
|
||||
import cn.iocoder.yudao.framework.ip.core.enums.AreaTypeEnum;
|
||||
import cn.fuxiaoaio.ygg.framework.ip.core.enums.AreaTypeEnum;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package cn.iocoder.yudao.framework.ip.core.enums;
|
||||
package cn.fuxiaoaio.ygg.framework.ip.core.enums;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
|
||||
import cn.fuxiaoaio.ygg.framework.common.core.IntArrayValuable;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue