diff --git a/LICENSE b/LICENSE index af732e377..733f0e989 100644 --- a/LICENSE +++ b/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 diff --git a/README.md b/README.md index cb38da9be..df86758cc 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ ## 🐶 新手必读 -* 演示地址【Vue3 + element-plus】： -* 演示地址【Vue3 + vben(ant-design-vue)】： -* 演示地址【Vue2 + element-ui】： +* 演示地址【Vue3 + element-plus】： +* 演示地址【Vue3 + vben(ant-design-vue)】： +* 演示地址【Vue2 + element-ui】： * 启动文档： * 视频教程： @@ -23,9 +23,9 @@ > > 😜 给项目点点 Star 吧，这对我们真的很重要！ -![架构图](https://static.iocoder.cn/yudao-cloud-architecture.png?imageView2/2/format/webp) +![架构图](https://static.iocoder.cn/fuxiaoaio-cloud-architecture.png?imageView2/2/format/webp) -* 管理后台的电脑端：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://static.iocoder.cn/yudao-roadmap.png?imageView2/2/format/webp) +![架构演进](https://static.iocoder.cn/fuxiaoaio-roadmap.png?imageView2/2/format/webp) 三个项目的功能对比，可见社区共同整理的 [国产开源项目对比](https://www.yuque.com/xiatian-bsgny/lm0ec1/wqf8mn) 表格。 @@ -50,19 +50,19 @@ | 项目 | Star | 简介 | |-----------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------| | [ruoyi-vue-pro](https://gitee.com/zhijiantianya/ruoyi-vue-pro) | [![Gitee star](https://gitee.com/zhijiantianya/ruoyi-vue-pro/badge/star.svg?theme=white)](https://gitee.com/zhijiantianya/ruoyi-vue-pro) [![GitHub stars](https://img.shields.io/github/stars/YunaiV/ruoyi-vue-pro.svg?style=social&label=Stars)](https://github.com/YunaiV/ruoyi-vue-pro) | 基于 Spring Boot 多模块架构 | -| [yudao-cloud](https://gitee.com/zhijiantianya/yudao-cloud) | [![Gitee star](https://gitee.com/zhijiantianya/yudao-cloud/badge/star.svg?theme=white)](https://gitee.com/zhijiantianya/yudao-cloud) [![GitHub stars](https://img.shields.io/github/stars/YunaiV/yudao-cloud.svg?style=social&label=Stars)](https://github.com/YunaiV/yudao-cloud) | 基于 Spring Cloud 微服务架构 | -| [Spring-Boot-Labs](https://gitee.com/yudaocode/SpringBoot-Labs) | [![Gitee star](https://gitee.com/yudaocode/SpringBoot-Labs/badge/star.svg?theme=white)](https://gitee.com/zhijiantianya/yudao-cloud) [![GitHub stars](https://img.shields.io/github/stars/yudaocode/SpringBoot-Labs.svg?style=social&label=Stars)](https://github.com/yudaocode/SpringBoot-Labs) | 系统学习 Spring Boot & Cloud 专栏 | +| [fuxiaoaio-cloud](https://gitee.com/zhijiantianya/fuxiaoaio-cloud) | [![Gitee star](https://gitee.com/zhijiantianya/fuxiaoaio-cloud/badge/star.svg?theme=white)](https://gitee.com/zhijiantianya/fuxiaoaio-cloud) [![GitHub stars](https://img.shields.io/github/stars/YunaiV/fuxiaoaio-cloud.svg?style=social&label=Stars)](https://github.com/YunaiV/fuxiaoaio-cloud) | 基于 Spring Cloud 微服务架构 | +| [Spring-Boot-Labs](https://gitee.com/fuxiaoaiocode/SpringBoot-Labs) | [![Gitee star](https://gitee.com/fuxiaoaiocode/SpringBoot-Labs/badge/star.svg?theme=white)](https://gitee.com/zhijiantianya/fuxiaoaio-cloud) [![GitHub stars](https://img.shields.io/github/stars/fuxiaoaiocode/SpringBoot-Labs.svg?style=social&label=Stars)](https://github.com/fuxiaoaiocode/SpringBoot-Labs) | 系统学习 Spring Boot & Cloud 专栏 | ### 前端项目 | 项目 | Star | 简介 | |----------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------| -| [yudao-ui-admin-vue3](https://gitee.com/yudaocode/yudao-ui-admin-vue3) | [![Gitee star](https://gitee.com/yudaocode/yudao-ui-admin-vue3/badge/star.svg?theme=white)](https://gitee.com/yudaocode/yudao-ui-admin-vue3) [![GitHub stars](https://img.shields.io/github/stars/yudaocode/yudao-ui-admin-vue3.svg?style=social&label=Stars)](https://github.com/yudaocode/yudao-ui-admin-vue3) | 基于 Vue3 + element-plus 实现的管理后台 | -| [yudao-ui-admin-vben](https://gitee.com/yudaocode/yudao-ui-admin-vben) | [![Gitee star](https://gitee.com/yudaocode/yudao-ui-admin-vben/badge/star.svg?theme=white)](https://gitee.com/yudaocode/yudao-ui-admin-vben) [![GitHub stars](https://img.shields.io/github/stars/yudaocode/yudao-ui-admin-vben.svg?style=social&label=Stars)](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) | [![Gitee star](https://gitee.com/zhijiantianya/ruoyi-vue-pro/badge/star.svg?theme=white)](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/master/yudao-ui-admin) [![GitHub stars](https://img.shields.io/github/stars/YunaiV/ruoyi-vue-pro.svg?style=social&label=Stars)](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) | [![Gitee star](https://gitee.com/zhijiantianya/ruoyi-vue-pro/badge/star.svg?theme=white)](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/master/yudao-ui-admin-uniapp) [![GitHub stars](https://img.shields.io/github/stars/YunaiV/ruoyi-vue-pro.svg?style=social&label=Stars)](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) | [![Gitee star](https://gitee.com/yudaocode/yudao-ui-go-view/badge/star.svg?theme=white)](https://gitee.com/yudaocode/yudao-ui-go-view) [![GitHub stars](https://img.shields.io/github/stars/yudaocode/yudao-ui-go-view.svg?style=social&label=Stars)](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) | [![Gitee star](https://gitee.com/zhijiantianya/ruoyi-vue-pro/badge/star.svg?theme=white)](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/master/yudao-ui-app) [![GitHub stars](https://img.shields.io/github/stars/YunaiV/ruoyi-vue-pro.svg?style=social&label=Stars)](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) | [![Gitee star](https://gitee.com/fuxiaoaiocode/fuxiaoaio-ui-admin-vue3/badge/star.svg?theme=white)](https://gitee.com/fuxiaoaiocode/fuxiaoaio-ui-admin-vue3) [![GitHub stars](https://img.shields.io/github/stars/fuxiaoaiocode/fuxiaoaio-ui-admin-vue3.svg?style=social&label=Stars)](https://github.com/fuxiaoaiocode/fuxiaoaio-ui-admin-vue3) | 基于 Vue3 + element-plus 实现的管理后台 | +| [fuxiaoaio-ui-admin-vben](https://gitee.com/fuxiaoaiocode/fuxiaoaio-ui-admin-vben) | [![Gitee star](https://gitee.com/fuxiaoaiocode/fuxiaoaio-ui-admin-vben/badge/star.svg?theme=white)](https://gitee.com/fuxiaoaiocode/fuxiaoaio-ui-admin-vben) [![GitHub stars](https://img.shields.io/github/stars/fuxiaoaiocode/fuxiaoaio-ui-admin-vben.svg?style=social&label=Stars)](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) | [![Gitee star](https://gitee.com/zhijiantianya/ruoyi-vue-pro/badge/star.svg?theme=white)](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/master/fuxiaoaio-ui-admin) [![GitHub stars](https://img.shields.io/github/stars/YunaiV/ruoyi-vue-pro.svg?style=social&label=Stars)](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) | [![Gitee star](https://gitee.com/zhijiantianya/ruoyi-vue-pro/badge/star.svg?theme=white)](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/master/fuxiaoaio-ui-admin-uniapp) [![GitHub stars](https://img.shields.io/github/stars/YunaiV/ruoyi-vue-pro.svg?style=social&label=Stars)](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) | [![Gitee star](https://gitee.com/fuxiaoaiocode/fuxiaoaio-ui-go-view/badge/star.svg?theme=white)](https://gitee.com/fuxiaoaiocode/fuxiaoaio-ui-go-view) [![GitHub stars](https://img.shields.io/github/stars/fuxiaoaiocode/fuxiaoaio-ui-go-view.svg?style=social&label=Stars)](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) | [![Gitee star](https://gitee.com/zhijiantianya/ruoyi-vue-pro/badge/star.svg?theme=white)](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/master/fuxiaoaio-ui-app) [![GitHub stars](https://img.shields.io/github/stars/YunaiV/ruoyi-vue-pro.svg?style=social&label=Stars)](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 | - | diff --git a/yudao-dependencies/pom.xml b/fuxiaoaio-dependencies/pom.xml similarity index 87% rename from yudao-dependencies/pom.xml rename to fuxiaoaio-dependencies/pom.xml index 41e258f02..079a7f8eb 100644 --- a/yudao-dependencies/pom.xml +++ b/fuxiaoaio-dependencies/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.iocoder.cloud - yudao-dependencies + cn.fuxiaoaio.ygg + fuxiaoaio-dependencies ${revision} pom @@ -80,6 +80,7 @@ 1.4.0 1.5.6 2.12.2 + 2.7.3 @@ -109,68 +110,68 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-banner + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-banner ${revision} - cn.iocoder.cloud - yudao-spring-boot-starter-biz-operatelog + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-operatelog ${revision} - cn.iocoder.cloud - yudao-spring-boot-starter-biz-dict + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-dict ${revision} - cn.iocoder.cloud - yudao-spring-boot-starter-biz-sms + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-sms ${revision} - cn.iocoder.cloud - yudao-spring-boot-starter-biz-pay + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-pay ${revision} - cn.iocoder.cloud - yudao-spring-boot-starter-biz-weixin + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-weixin ${revision} - cn.iocoder.cloud - yudao-spring-boot-starter-biz-tenant + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-tenant ${revision} - cn.iocoder.cloud - yudao-spring-boot-starter-biz-data-permission + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-data-permission ${revision} - cn.iocoder.cloud - yudao-spring-boot-starter-biz-social + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-social ${revision} - cn.iocoder.cloud - yudao-spring-boot-starter-biz-error-code + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-error-code ${revision} - cn.iocoder.cloud - yudao-spring-boot-starter-biz-ip + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-ip ${revision} - cn.iocoder.cloud - yudao-spring-boot-starter-captcha + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-captcha ${revision} - cn.iocoder.cloud - yudao-spring-boot-starter-desensitize + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-desensitize ${revision} @@ -183,21 +184,21 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-env + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-env ${revision} - cn.iocoder.cloud - yudao-spring-boot-starter-web + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-web ${revision} - cn.iocoder.cloud - yudao-spring-boot-starter-security + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-security ${revision} @@ -244,8 +245,8 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-mybatis + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-mybatis ${revision} @@ -276,8 +277,8 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-redis + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-redis ${revision} @@ -310,8 +311,8 @@ ${dubbo.version} - cn.iocoder.cloud - yudao-spring-boot-starter-rpc + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-rpc ${revision} @@ -326,22 +327,22 @@ ${xxl-job.version} - cn.iocoder.cloud - yudao-spring-boot-starter-job + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-job ${revision} - cn.iocoder.cloud - yudao-spring-boot-starter-mq + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-mq ${revision} - cn.iocoder.cloud - yudao-spring-boot-starter-protection + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-protection ${revision} @@ -370,8 +371,8 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-monitor + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-monitor ${revision} @@ -429,8 +430,8 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-test + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-test ${revision} test @@ -471,8 +472,8 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-flowable + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-flowable ${revision} @@ -489,14 +490,14 @@ - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common ${revision} - cn.iocoder.cloud - yudao-spring-boot-starter-excel + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-excel ${revision} @@ -645,8 +646,8 @@ ${okhttp3.version} - cn.iocoder.cloud - yudao-spring-boot-starter-file + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-file ${revision} @@ -712,6 +713,11 @@ xercesImpl ${xercesImpl.version} + + org.mariadb.jdbc + mariadb-java-client + ${mariadb.version} + diff --git a/yudao-framework/yudao-common/pom.xml b/fuxiaoaio-framework/fuxiaoaio-common/pom.xml similarity index 97% rename from yudao-framework/yudao-common/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-common/pom.xml index 7fb4c0ac2..03bfb34ea 100644 --- a/yudao-framework/yudao-common/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-common/pom.xml @@ -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"> - cn.iocoder.cloud - yudao-framework + cn.fuxiaoaio.ygg + fuxiaoaio-framework ${revision} 4.0.0 - yudao-common + fuxiaoaio-common jar ${project.artifactId} diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/core/IntArrayValuable.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/core/IntArrayValuable.java similarity index 77% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/core/IntArrayValuable.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/core/IntArrayValuable.java index 8914231d8..964ee484f 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/core/IntArrayValuable.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/core/IntArrayValuable.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.common.core; +package cn.fuxiaoaio.ygg.framework.common.core; /** * 可生成 Int 数组的接口 diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/core/KeyValue.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/core/KeyValue.java similarity index 86% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/core/KeyValue.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/core/KeyValue.java index ef432e218..c280a9f35 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/core/KeyValue.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/core/KeyValue.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/CommonStatusEnum.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/enums/CommonStatusEnum.java similarity index 84% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/CommonStatusEnum.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/enums/CommonStatusEnum.java index 7b07fa1f5..507dc76ec 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/CommonStatusEnum.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/enums/CommonStatusEnum.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/DocumentEnum.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/enums/DocumentEnum.java similarity index 89% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/DocumentEnum.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/enums/DocumentEnum.java index 0d2c64c8b..a818a0845 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/DocumentEnum.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/enums/DocumentEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.common.enums; +package cn.fuxiaoaio.ygg.framework.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/RpcConstants.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/enums/RpcConstants.java similarity index 50% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/RpcConstants.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/enums/RpcConstants.java index b1c53dbfe..363e267e4 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/RpcConstants.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/enums/RpcConstants.java @@ -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 芋道源码 */ diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/UserTypeEnum.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/enums/UserTypeEnum.java similarity index 88% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/UserTypeEnum.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/enums/UserTypeEnum.java index c950c529d..dfa247081 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/UserTypeEnum.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/enums/UserTypeEnum.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/WebFilterOrderEnum.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/enums/WebFilterOrderEnum.java similarity index 96% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/WebFilterOrderEnum.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/enums/WebFilterOrderEnum.java index dd3640d13..b0b19dd89 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/WebFilterOrderEnum.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/enums/WebFilterOrderEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.common.enums; +package cn.fuxiaoaio.ygg.framework.common.enums; /** * Web 过滤器顺序的枚举类，保证过滤器按照符合我们的预期 diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/ErrorCode.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/exception/ErrorCode.java similarity index 77% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/ErrorCode.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/exception/ErrorCode.java index 45feaec55..f9f9068d2 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/ErrorCode.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/exception/ErrorCode.java @@ -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; /** diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/ServerException.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/exception/ServerException.java similarity index 90% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/ServerException.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/exception/ServerException.java index fac56d5e2..fc8d901d4 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/ServerException.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/exception/ServerException.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/ServiceException.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/exception/ServiceException.java similarity index 90% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/ServiceException.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/exception/ServiceException.java index 5c6967e2f..f9dd4aa10 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/ServiceException.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/exception/ServiceException.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/enums/GlobalErrorCodeConstants.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/exception/enums/GlobalErrorCodeConstants.java similarity index 93% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/enums/GlobalErrorCodeConstants.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/exception/enums/GlobalErrorCodeConstants.java index a132e63d7..829c86f89 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/enums/GlobalErrorCodeConstants.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/exception/enums/GlobalErrorCodeConstants.java @@ -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; /** * 全局错误码枚举 diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/enums/ServiceErrorCodeRange.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/exception/enums/ServiceErrorCodeRange.java similarity index 96% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/enums/ServiceErrorCodeRange.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/exception/enums/ServiceErrorCodeRange.java index be22815eb..f29c1b654 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/enums/ServiceErrorCodeRange.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/exception/enums/ServiceErrorCodeRange.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.common.exception.enums; +package cn.fuxiaoaio.ygg.framework.common.exception.enums; /** * 业务异常的错误码区间，解决：解决各模块错误码定义，避免重复，在此只声明不做实际使用 diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/util/ServiceExceptionUtil.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/exception/util/ServiceExceptionUtil.java similarity index 95% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/util/ServiceExceptionUtil.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/exception/util/ServiceExceptionUtil.java index 7a9d62dd1..9e19aef18 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/util/ServiceExceptionUtil.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/exception/util/ServiceExceptionUtil.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/package-info.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/package-info.java similarity index 68% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/package-info.java index f3f2574e5..9a4987b6d 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/package-info.java @@ -3,4 +3,4 @@ * * 例如说，CommonResult 为通用返回 */ -package cn.iocoder.yudao.framework.common; +package cn.fuxiaoaio.ygg.framework.common; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/CommonResult.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/pojo/CommonResult.java similarity index 92% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/CommonResult.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/pojo/CommonResult.java index bfb291b6d..5e3b10e76 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/CommonResult.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/pojo/CommonResult.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageParam.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/pojo/PageParam.java similarity index 95% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageParam.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/pojo/PageParam.java index 72708f8c7..f88434ab6 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageParam.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/pojo/PageParam.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageResult.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/pojo/PageResult.java similarity index 94% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageResult.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/pojo/PageResult.java index ff167d149..56bd1f5a9 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageResult.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/pojo/PageResult.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/SortingField.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/pojo/SortingField.java similarity index 95% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/SortingField.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/pojo/SortingField.java index 98411730e..982e8f2db 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/SortingField.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/pojo/SortingField.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.common.pojo; +package cn.fuxiaoaio.ygg.framework.common.pojo; import java.io.Serializable; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/cache/CacheUtils.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/cache/CacheUtils.java similarity index 94% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/cache/CacheUtils.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/cache/CacheUtils.java index 7f7318487..7f8803a45 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/cache/CacheUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/cache/CacheUtils.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/ArrayUtils.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/collection/ArrayUtils.java similarity index 92% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/ArrayUtils.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/collection/ArrayUtils.java index 4285b8f4c..b40f31fd2 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/ArrayUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/collection/ArrayUtils.java @@ -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 工具类 diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/CollectionUtils.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/collection/CollectionUtils.java similarity index 99% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/CollectionUtils.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/collection/CollectionUtils.java index 6b83bb3d6..f7729348c 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/CollectionUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/collection/CollectionUtils.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/MapUtils.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/collection/MapUtils.java similarity index 93% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/MapUtils.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/collection/MapUtils.java index f4a17b523..17726934b 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/MapUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/collection/MapUtils.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/SetUtils.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/collection/SetUtils.java similarity index 81% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/SetUtils.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/collection/SetUtils.java index e8eba6624..b0bf417f9 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/SetUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/collection/SetUtils.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/date/DateUtils.java similarity index 99% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/date/DateUtils.java index a1d96464b..c5303baa3 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/date/DateUtils.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/date/LocalDateTimeUtils.java similarity index 97% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/date/LocalDateTimeUtils.java index 62e0e4441..918844e56 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/date/LocalDateTimeUtils.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/http/HttpUtils.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/http/HttpUtils.java similarity index 98% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/http/HttpUtils.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/http/HttpUtils.java index d36b2c308..d997b538c 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/http/HttpUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/http/HttpUtils.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/io/FileUtils.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/io/FileUtils.java similarity index 97% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/io/FileUtils.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/io/FileUtils.java index 2f870d738..6fa41aed8 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/io/FileUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/io/FileUtils.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/io/IoUtils.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/io/IoUtils.java similarity index 92% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/io/IoUtils.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/io/IoUtils.java index 4a19f479d..206f666e1 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/io/IoUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/io/IoUtils.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/json/JsonUtils.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/json/JsonUtils.java similarity index 98% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/json/JsonUtils.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/json/JsonUtils.java index 86d220638..ef27e80dd 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/json/JsonUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/json/JsonUtils.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/monitor/TracerUtils.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/monitor/TracerUtils.java similarity index 91% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/monitor/TracerUtils.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/monitor/TracerUtils.java index 81092b656..42f652011 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/monitor/TracerUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/monitor/TracerUtils.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/number/NumberUtils.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/number/NumberUtils.java similarity index 84% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/number/NumberUtils.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/number/NumberUtils.java index 822510096..d105e972d 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/number/NumberUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/number/NumberUtils.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/object/ObjectUtils.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/object/ObjectUtils.java similarity index 96% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/object/ObjectUtils.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/object/ObjectUtils.java index c08316dc2..50577a6de 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/object/ObjectUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/object/ObjectUtils.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/object/PageUtils.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/object/PageUtils.java similarity index 53% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/object/PageUtils.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/object/PageUtils.java index 72403a9bd..106606565 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/object/PageUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/object/PageUtils.java @@ -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 芋道源码 */ diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/package-info.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/package-info.java similarity index 87% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/package-info.java index cd8ae6b36..c8a5cb5e1 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/package-info.java @@ -4,4 +4,4 @@ * * ps：如果担心 Hutool 存在坑的问题，可以阅读 Hutool 的实现源码，以确保可靠性。并且，可以补充相关的单元测试。 */ -package cn.iocoder.yudao.framework.common.util; +package cn.fuxiaoaio.ygg.framework.common.util; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/servlet/ServletUtils.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/servlet/ServletUtils.java similarity index 96% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/servlet/ServletUtils.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/servlet/ServletUtils.java index eec306fd6..0eea6a487 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/servlet/ServletUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/servlet/ServletUtils.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/spring/SpringAopUtils.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/spring/SpringAopUtils.java similarity index 96% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/spring/SpringAopUtils.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/spring/SpringAopUtils.java index b71342cb3..f1382b4da 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/spring/SpringAopUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/spring/SpringAopUtils.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/spring/SpringExpressionUtils.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/spring/SpringExpressionUtils.java similarity index 98% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/spring/SpringExpressionUtils.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/spring/SpringExpressionUtils.java index 659053da7..33328279b 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/spring/SpringExpressionUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/spring/SpringExpressionUtils.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/string/StrUtils.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/string/StrUtils.java similarity index 95% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/string/StrUtils.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/string/StrUtils.java index 53dabcac8..d6b23616b 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/string/StrUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/string/StrUtils.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/validation/ValidationUtils.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/validation/ValidationUtils.java similarity index 96% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/validation/ValidationUtils.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/validation/ValidationUtils.java index 7e6f89d5a..d75dd195f 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/validation/ValidationUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/util/validation/ValidationUtils.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnum.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/validation/InEnum.java similarity index 85% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnum.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/validation/InEnum.java index c2d56b0c5..3400ac017 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnum.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/validation/InEnum.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnumValidator.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/validation/InEnumValidator.java similarity index 92% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnumValidator.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/validation/InEnumValidator.java index 6cd08caa2..3c1cb8670 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnumValidator.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/validation/InEnumValidator.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/Mobile.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/validation/Mobile.java similarity index 91% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/Mobile.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/validation/Mobile.java index 4c7cb10ba..d04c17e16 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/Mobile.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/validation/Mobile.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/MobileValidator.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/validation/MobileValidator.java similarity index 83% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/MobileValidator.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/validation/MobileValidator.java index 0bddfcb21..536169bb5 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/MobileValidator.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/validation/MobileValidator.java @@ -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; diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/package-info.java b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/validation/package-info.java similarity index 51% rename from yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/validation/package-info.java index aa95c691a..4d198bab8 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-common/src/main/java/cn/fuxiaoaio/ygg/framework/common/validation/package-info.java @@ -1,4 +1,4 @@ /** * 使用 Hibernate Validator 实现参数校验 */ -package cn.iocoder.yudao.framework.common.validation; +package cn.fuxiaoaio.ygg.framework.common.validation; diff --git a/fuxiaoaio-framework/fuxiaoaio-common/《芋道 Spring Boot 参数校验 Validation 入门》.md b/fuxiaoaio-framework/fuxiaoaio-common/《芋道 Spring Boot 参数校验 Validation 入门》.md new file mode 100644 index 000000000..2e4ec8bd1 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-common/《芋道 Spring Boot 参数校验 Validation 入门》.md @@ -0,0 +1 @@ + diff --git a/yudao-framework/yudao-spring-boot-starter-banner/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-banner/pom.xml similarity index 76% rename from yudao-framework/yudao-spring-boot-starter-banner/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-banner/pom.xml index 9f4d1ded2..fb62c4324 100644 --- a/yudao-framework/yudao-spring-boot-starter-banner/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-banner/pom.xml @@ -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"> - yudao-framework - cn.iocoder.cloud + fuxiaoaio-framework + cn.fuxiaoaio.ygg ${revision} 4.0.0 - yudao-spring-boot-starter-banner + fuxiaoaio-spring-boot-starter-banner jar ${project.artifactId} @@ -17,8 +17,8 @@ - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common diff --git a/yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/config/YudaoBannerAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-banner/src/main/java/cn/fuxiaoaio/ygg/framework/banner/config/FuxiaoaioBannerAutoConfiguration.java similarity index 67% rename from yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/config/YudaoBannerAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-banner/src/main/java/cn/fuxiaoaio/ygg/framework/banner/config/FuxiaoaioBannerAutoConfiguration.java index a8b66787c..d959a67ad 100644 --- a/yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/config/YudaoBannerAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-banner/src/main/java/cn/fuxiaoaio/ygg/framework/banner/config/FuxiaoaioBannerAutoConfiguration.java @@ -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() { diff --git a/yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/core/BannerApplicationRunner.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-banner/src/main/java/cn/fuxiaoaio/ygg/framework/banner/core/BannerApplicationRunner.java similarity index 70% rename from yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/core/BannerApplicationRunner.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-banner/src/main/java/cn/fuxiaoaio/ygg/framework/banner/core/BannerApplicationRunner.java index bda196c5c..6940c718c 100644 --- a/yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/core/BannerApplicationRunner.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-banner/src/main/java/cn/fuxiaoaio/ygg/framework/banner/core/BannerApplicationRunner.java @@ -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/ 开启]"); }); } diff --git a/yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-banner/src/main/java/cn/fuxiaoaio/ygg/framework/banner/package-info.java similarity index 72% rename from yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-banner/src/main/java/cn/fuxiaoaio/ygg/framework/banner/package-info.java index aba726853..8e5b2bd31 100644 --- a/yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-banner/src/main/java/cn/fuxiaoaio/ygg/framework/banner/package-info.java @@ -3,4 +3,4 @@ * * @author 芋道源码 */ -package cn.iocoder.yudao.framework.banner; +package cn.fuxiaoaio.ygg.framework.banner; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-banner/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-banner/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..a72e34dbf --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-banner/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +cn.fuxiaoaio.ygg.framework.banner.config.FuxiaoaioBannerAutoConfiguration \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-banner/src/main/resources/banner.txt b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-banner/src/main/resources/banner.txt similarity index 96% rename from yudao-framework/yudao-spring-boot-starter-banner/src/main/resources/banner.txt rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-banner/src/main/resources/banner.txt index 39a441d7d..2a42bb361 100644 --- a/yudao-framework/yudao-spring-boot-starter-banner/src/main/resources/banner.txt +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-banner/src/main/resources/banner.txt @@ -1,5 +1,5 @@ 芋道源码 http://www.iocoder.cn -Application Version: ${yudao.info.version} +Application Version: ${fuxiaoaio.info.version} Spring Boot Version: ${spring-boot.version} .__ __. ______ .______ __ __ _______ diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/pom.xml similarity index 58% rename from yudao-framework/yudao-spring-boot-starter-biz-data-permission/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/pom.xml index c80191e55..e0d00d37d 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/pom.xml @@ -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"> - yudao-framework - cn.iocoder.cloud + fuxiaoaio-framework + cn.fuxiaoaio.ygg ${revision} 4.0.0 - yudao-spring-boot-starter-biz-data-permission + fuxiaoaio-spring-boot-starter-biz-data-permission jar ${project.artifactId} @@ -17,34 +17,34 @@ - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common - cn.iocoder.cloud - yudao-spring-boot-starter-security + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-security true - cn.iocoder.cloud - yudao-spring-boot-starter-mybatis + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-mybatis - cn.iocoder.cloud - yudao-module-system-api + cn.fuxiaoaio.ygg + fuxiaoaio-module-system-api ${revision} - cn.iocoder.cloud - yudao-spring-boot-starter-test + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-test test diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/config/YudaoDataPermissionAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/config/FuxiaoaioDataPermissionAutoConfiguration.java similarity index 73% rename from yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/config/YudaoDataPermissionAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/config/FuxiaoaioDataPermissionAutoConfiguration.java index 445319883..59855d4ea 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/config/YudaoDataPermissionAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/config/FuxiaoaioDataPermissionAutoConfiguration.java @@ -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 rules) { diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/config/YudaoDeptDataPermissionAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/config/FuxiaoaioDeptDataPermissionAutoConfiguration.java similarity index 81% rename from yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/config/YudaoDeptDataPermissionAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/config/FuxiaoaioDeptDataPermissionAutoConfiguration.java index 3c1764135..68040b0a6 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/config/YudaoDeptDataPermissionAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/config/FuxiaoaioDeptDataPermissionAutoConfiguration.java @@ -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, diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/annotation/DataPermission.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/annotation/DataPermission.java similarity index 86% rename from yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/annotation/DataPermission.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/annotation/DataPermission.java index 4e8a92192..28b525597 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/annotation/DataPermission.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/annotation/DataPermission.java @@ -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.*; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionAnnotationAdvisor.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/aop/DataPermissionAnnotationAdvisor.java similarity index 85% rename from yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionAnnotationAdvisor.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/aop/DataPermissionAnnotationAdvisor.java index 03d212ca8..62132c818 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionAnnotationAdvisor.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/aop/DataPermissionAnnotationAdvisor.java @@ -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 芋道源码 */ diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionAnnotationInterceptor.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/aop/DataPermissionAnnotationInterceptor.java similarity index 95% rename from yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionAnnotationInterceptor.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/aop/DataPermissionAnnotationInterceptor.java index 48a03541f..26c855cb3 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionAnnotationInterceptor.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/aop/DataPermissionAnnotationInterceptor.java @@ -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; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionContextHolder.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/aop/DataPermissionContextHolder.java similarity index 93% rename from yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionContextHolder.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/aop/DataPermissionContextHolder.java index 9705d88a9..11544373b 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionContextHolder.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/aop/DataPermissionContextHolder.java @@ -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; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptor.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/db/DataPermissionDatabaseInterceptor.java similarity index 98% rename from yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptor.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/db/DataPermissionDatabaseInterceptor.java index f3446b21c..e3e2f99bb 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptor.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/db/DataPermissionDatabaseInterceptor.java @@ -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; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/DataPermissionRule.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/rule/DataPermissionRule.java similarity index 94% rename from yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/DataPermissionRule.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/rule/DataPermissionRule.java index 2bccde85f..edf52f06c 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/DataPermissionRule.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/rule/DataPermissionRule.java @@ -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; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/DataPermissionRuleFactory.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/rule/DataPermissionRuleFactory.java similarity index 91% rename from yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/DataPermissionRuleFactory.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/rule/DataPermissionRuleFactory.java index 166dfea6c..055604cc2 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/DataPermissionRuleFactory.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/rule/DataPermissionRuleFactory.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.datapermission.core.rule; +package cn.fuxiaoaio.ygg.framework.datapermission.core.rule; import java.util.List; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/DataPermissionRuleFactoryImpl.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/rule/DataPermissionRuleFactoryImpl.java similarity index 91% rename from yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/DataPermissionRuleFactoryImpl.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/rule/DataPermissionRuleFactoryImpl.java index eaa6e6aed..f1bd9fa92 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/DataPermissionRuleFactoryImpl.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/rule/DataPermissionRuleFactoryImpl.java @@ -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; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java similarity index 91% rename from yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java index 4a88b9708..71f46f9c7 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java @@ -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 = ? diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/dept/DeptDataPermissionRuleCustomizer.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/rule/dept/DeptDataPermissionRuleCustomizer.java similarity index 89% rename from yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/dept/DeptDataPermissionRuleCustomizer.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/rule/dept/DeptDataPermissionRuleCustomizer.java index e5e4f578c..636df4991 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/dept/DeptDataPermissionRuleCustomizer.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/rule/dept/DeptDataPermissionRuleCustomizer.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.datapermission.core.rule.dept; +package cn.fuxiaoaio.ygg.framework.datapermission.core.rule.dept; /** * {@link DeptDataPermissionRule} 的自定义配置接口 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/dept/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/rule/dept/package-info.java similarity index 53% rename from yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/dept/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/rule/dept/package-info.java index 66e932680..49c5b6b4c 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/dept/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/rule/dept/package-info.java @@ -3,4 +3,4 @@ * * @author 芋道源码 */ -package cn.iocoder.yudao.framework.datapermission.core.rule.dept; +package cn.fuxiaoaio.ygg.framework.datapermission.core.rule.dept; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/util/DataPermissionUtils.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/util/DataPermissionUtils.java similarity index 85% rename from yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/util/DataPermissionUtils.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/util/DataPermissionUtils.java index c154bd5f5..1cace9070 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/util/DataPermissionUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/core/util/DataPermissionUtils.java @@ -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; /** diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/package-info.java similarity index 60% rename from yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/package-info.java index 831aa7c62..d4d2fc130 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/java/cn/fuxiaoaio/ygg/framework/datapermission/package-info.java @@ -1,4 +1,4 @@ /** * 基于 JSqlParser 解析 SQL，增加数据权限的 WHERE 条件 */ -package cn.iocoder.yudao.framework.datapermission; +package cn.fuxiaoaio.ygg.framework.datapermission; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..bee221be9 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +cn.fuxiaoaio.ygg.framework.datapermission.config.FuxiaoaioDataPermissionAutoConfiguration +cn.fuxiaoaio.ygg.framework.datapermission.config.FuxiaoaioDeptDataPermissionAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionAnnotationInterceptorTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/test/java/cn/fuxiaoaio/ygg/framework/datapermission/core/aop/DataPermissionAnnotationInterceptorTest.java similarity index 94% rename from yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionAnnotationInterceptorTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/test/java/cn/fuxiaoaio/ygg/framework/datapermission/core/aop/DataPermissionAnnotationInterceptorTest.java index ba97ede2f..525db5f18 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionAnnotationInterceptorTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/test/java/cn/fuxiaoaio/ygg/framework/datapermission/core/aop/DataPermissionAnnotationInterceptorTest.java @@ -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; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionContextHolderTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/test/java/cn/fuxiaoaio/ygg/framework/datapermission/core/aop/DataPermissionContextHolderTest.java similarity index 94% rename from yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionContextHolderTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/test/java/cn/fuxiaoaio/ygg/framework/datapermission/core/aop/DataPermissionContextHolderTest.java index 688b92d9f..25a89303b 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionContextHolderTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/test/java/cn/fuxiaoaio/ygg/framework/datapermission/core/aop/DataPermissionContextHolderTest.java @@ -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; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptorTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/test/java/cn/fuxiaoaio/ygg/framework/datapermission/core/db/DataPermissionDatabaseInterceptorTest.java similarity index 95% rename from yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptorTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/test/java/cn/fuxiaoaio/ygg/framework/datapermission/core/db/DataPermissionDatabaseInterceptorTest.java index 145360789..f5c7b080e 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptorTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/test/java/cn/fuxiaoaio/ygg/framework/datapermission/core/db/DataPermissionDatabaseInterceptorTest.java @@ -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; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptorTest2.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/test/java/cn/fuxiaoaio/ygg/framework/datapermission/core/db/DataPermissionDatabaseInterceptorTest2.java similarity index 98% rename from yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptorTest2.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/test/java/cn/fuxiaoaio/ygg/framework/datapermission/core/db/DataPermissionDatabaseInterceptorTest2.java index 6e42d52f4..858e5f1d1 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptorTest2.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/test/java/cn/fuxiaoaio/ygg/framework/datapermission/core/db/DataPermissionDatabaseInterceptorTest2.java @@ -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; /** diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/rule/DataPermissionRuleFactoryImplTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/test/java/cn/fuxiaoaio/ygg/framework/datapermission/core/rule/DataPermissionRuleFactoryImplTest.java similarity index 92% rename from yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/rule/DataPermissionRuleFactoryImplTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/test/java/cn/fuxiaoaio/ygg/framework/datapermission/core/rule/DataPermissionRuleFactoryImplTest.java index 17dddc929..9e40bca4e 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/rule/DataPermissionRuleFactoryImplTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/test/java/cn/fuxiaoaio/ygg/framework/datapermission/core/rule/DataPermissionRuleFactoryImplTest.java @@ -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.*; /** diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/rule/dept/DeptDataPermissionRuleTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/test/java/cn/fuxiaoaio/ygg/framework/datapermission/core/rule/dept/DeptDataPermissionRuleTest.java similarity index 93% rename from yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/rule/dept/DeptDataPermissionRuleTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/test/java/cn/fuxiaoaio/ygg/framework/datapermission/core/rule/dept/DeptDataPermissionRuleTest.java index aecaf63d3..93646978e 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/rule/dept/DeptDataPermissionRuleTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/test/java/cn/fuxiaoaio/ygg/framework/datapermission/core/rule/dept/DeptDataPermissionRuleTest.java @@ -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; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/utils/DataPermissionUtilsTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/test/java/cn/fuxiaoaio/ygg/framework/datapermission/core/utils/DataPermissionUtilsTest.java similarity index 63% rename from yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/utils/DataPermissionUtilsTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/test/java/cn/fuxiaoaio/ygg/framework/datapermission/core/utils/DataPermissionUtilsTest.java index 234a9fe88..a9e5596df 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/utils/DataPermissionUtilsTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-data-permission/src/test/java/cn/fuxiaoaio/ygg/framework/datapermission/core/utils/DataPermissionUtilsTest.java @@ -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.*; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-dict/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-dict/pom.xml similarity index 66% rename from yudao-framework/yudao-spring-boot-starter-biz-dict/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-dict/pom.xml index 9da365e3e..f4dcef4fa 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-dict/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-dict/pom.xml @@ -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"> - cn.iocoder.cloud - yudao-framework + cn.fuxiaoaio.ygg + fuxiaoaio-framework ${revision} 4.0.0 - yudao-spring-boot-starter-biz-dict + fuxiaoaio-spring-boot-starter-biz-dict jar ${project.artifactId} @@ -17,8 +17,8 @@ - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common @@ -29,15 +29,15 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-rpc + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-rpc true - cn.iocoder.cloud - yudao-module-system-api + cn.fuxiaoaio.ygg + fuxiaoaio-module-system-api ${revision} @@ -49,8 +49,8 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-test + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-test test diff --git a/yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/config/YudaoDictAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-dict/src/main/java/cn/fuxiaoaio/ygg/framework/dict/config/FuxiaoaioDictAutoConfiguration.java similarity index 62% rename from yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/config/YudaoDictAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-dict/src/main/java/cn/fuxiaoaio/ygg/framework/dict/config/FuxiaoaioDictAutoConfiguration.java index 1b29fd165..918bef5b1 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/config/YudaoDictAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-dict/src/main/java/cn/fuxiaoaio/ygg/framework/dict/config/FuxiaoaioDictAutoConfiguration.java @@ -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") diff --git a/yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/config/YudaoDictRpcAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-dict/src/main/java/cn/fuxiaoaio/ygg/framework/dict/config/FuxiaoaioDictRpcAutoConfiguration.java similarity index 66% rename from yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/config/YudaoDictRpcAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-dict/src/main/java/cn/fuxiaoaio/ygg/framework/dict/config/FuxiaoaioDictRpcAutoConfiguration.java index 5a9c018dc..cc383c398 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/config/YudaoDictRpcAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-dict/src/main/java/cn/fuxiaoaio/ygg/framework/dict/config/FuxiaoaioDictRpcAutoConfiguration.java @@ -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 { } diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-dict/src/main/java/cn/fuxiaoaio/ygg/framework/dict/core/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-dict/src/main/java/cn/fuxiaoaio/ygg/framework/dict/core/package-info.java new file mode 100644 index 000000000..aa7c2cfb2 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-dict/src/main/java/cn/fuxiaoaio/ygg/framework/dict/core/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package cn.fuxiaoaio.ygg.framework.dict.core; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/core/util/DictFrameworkUtils.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-dict/src/main/java/cn/fuxiaoaio/ygg/framework/dict/core/util/DictFrameworkUtils.java similarity index 88% rename from yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/core/util/DictFrameworkUtils.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-dict/src/main/java/cn/fuxiaoaio/ygg/framework/dict/core/util/DictFrameworkUtils.java index 68fe2f107..c49508635 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/core/util/DictFrameworkUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-dict/src/main/java/cn/fuxiaoaio/ygg/framework/dict/core/util/DictFrameworkUtils.java @@ -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; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-dict/src/main/java/cn/fuxiaoaio/ygg/framework/dict/package-info.java similarity index 50% rename from yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-dict/src/main/java/cn/fuxiaoaio/ygg/framework/dict/package-info.java index 94a787e9d..c9c4f95a5 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-dict/src/main/java/cn/fuxiaoaio/ygg/framework/dict/package-info.java @@ -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; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-dict/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-dict/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..d4aaa865c --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-dict/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +cn.fuxiaoaio.ygg.framework.dict.config.FuxiaoaioDictRpcAutoConfiguration +cn.fuxiaoaio.ygg.framework.dict.config.FuxiaoaioDictAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-biz-dict/src/test/java/cn/iocoder/yudao/framework/datapermission/core/util/DictFrameworkUtilsTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-dict/src/test/java/cn/fuxiaoaio/ygg/framework/datapermission/core/util/DictFrameworkUtilsTest.java similarity index 75% rename from yudao-framework/yudao-spring-boot-starter-biz-dict/src/test/java/cn/iocoder/yudao/framework/datapermission/core/util/DictFrameworkUtilsTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-dict/src/test/java/cn/fuxiaoaio/ygg/framework/datapermission/core/util/DictFrameworkUtilsTest.java index f0a6eb1a6..52ac7b016 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-dict/src/test/java/cn/iocoder/yudao/framework/datapermission/core/util/DictFrameworkUtilsTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-dict/src/test/java/cn/fuxiaoaio/ygg/framework/datapermission/core/util/DictFrameworkUtilsTest.java @@ -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; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-error-code/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/pom.xml similarity index 76% rename from yudao-framework/yudao-spring-boot-starter-biz-error-code/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/pom.xml index 0f5db966c..7907e39b9 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-error-code/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/pom.xml @@ -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"> - yudao-framework - cn.iocoder.cloud + fuxiaoaio-framework + cn.fuxiaoaio.ygg ${revision} 4.0.0 - yudao-spring-boot-starter-biz-error-code + fuxiaoaio-spring-boot-starter-biz-error-code jar ${project.artifactId} @@ -22,8 +22,8 @@ - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common @@ -34,15 +34,15 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-rpc + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-rpc true - cn.iocoder.cloud - yudao-module-system-api + cn.fuxiaoaio.ygg + fuxiaoaio-module-system-api ${revision} diff --git a/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/config/ErrorCodeProperties.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/java/cn/fuxiaoaio/ygg/framework/errorcode/config/ErrorCodeProperties.java similarity index 84% rename from yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/config/ErrorCodeProperties.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/java/cn/fuxiaoaio/ygg/framework/errorcode/config/ErrorCodeProperties.java index 1c1d1b8a5..2187aa082 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/config/ErrorCodeProperties.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/java/cn/fuxiaoaio/ygg/framework/errorcode/config/ErrorCodeProperties.java @@ -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 { diff --git a/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/config/YudaoErrorCodeAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/java/cn/fuxiaoaio/ygg/framework/errorcode/config/FuxiaoaioErrorCodeAutoConfiguration.java similarity index 70% rename from yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/config/YudaoErrorCodeAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/java/cn/fuxiaoaio/ygg/framework/errorcode/config/FuxiaoaioErrorCodeAutoConfiguration.java index ed2c92fc2..7444bca91 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/config/YudaoErrorCodeAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/java/cn/fuxiaoaio/ygg/framework/errorcode/config/FuxiaoaioErrorCodeAutoConfiguration.java @@ -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, diff --git a/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/config/YudaoErrorCodeRpcAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/java/cn/fuxiaoaio/ygg/framework/errorcode/config/FuxiaoaioErrorCodeRpcAutoConfiguration.java similarity index 64% rename from yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/config/YudaoErrorCodeRpcAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/java/cn/fuxiaoaio/ygg/framework/errorcode/config/FuxiaoaioErrorCodeRpcAutoConfiguration.java index 8de68ca35..486f460ff 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/config/YudaoErrorCodeRpcAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/java/cn/fuxiaoaio/ygg/framework/errorcode/config/FuxiaoaioErrorCodeRpcAutoConfiguration.java @@ -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 { } diff --git a/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/java/cn/fuxiaoaio/ygg/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java similarity index 75% rename from yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/java/cn/fuxiaoaio/ygg/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java index b13cacaa2..987687cda 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/java/cn/fuxiaoaio/ygg/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.errorcode.core.generator; +package cn.fuxiaoaio.ygg.framework.errorcode.core.generator; /** * 错误码的自动生成器 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/java/cn/fuxiaoaio/ygg/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java similarity index 89% rename from yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/java/cn/fuxiaoaio/ygg/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java index fd175367c..6cf9c6d66 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/java/cn/fuxiaoaio/ygg/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java @@ -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 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<>(); } diff --git a/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/loader/ErrorCodeLoader.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/java/cn/fuxiaoaio/ygg/framework/errorcode/core/loader/ErrorCodeLoader.java similarity index 77% rename from yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/loader/ErrorCodeLoader.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/java/cn/fuxiaoaio/ygg/framework/errorcode/core/loader/ErrorCodeLoader.java index 26fb060d2..70479a392 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/loader/ErrorCodeLoader.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/java/cn/fuxiaoaio/ygg/framework/errorcode/core/loader/ErrorCodeLoader.java @@ -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; /** * 错误码加载器 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/java/cn/fuxiaoaio/ygg/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java similarity index 89% rename from yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/java/cn/fuxiaoaio/ygg/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java index 870c74f11..c4dd5f925 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/java/cn/fuxiaoaio/ygg/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java @@ -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; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/java/cn/fuxiaoaio/ygg/framework/errorcode/package-info.java similarity index 92% rename from yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/java/cn/fuxiaoaio/ygg/framework/errorcode/package-info.java index ddba4f78a..0f143873b 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/java/cn/fuxiaoaio/ygg/framework/errorcode/package-info.java @@ -7,4 +7,4 @@ * * @author 芋道源码 */ -package cn.iocoder.yudao.framework.errorcode; +package cn.fuxiaoaio.ygg.framework.errorcode; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..ebf87c989 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-error-code/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +cn.fuxiaoaio.ygg.framework.errorcode.config.FuxiaoaioErrorCodeRpcAutoConfiguration +cn.fuxiaoaio.ygg.framework.errorcode.config.FuxiaoaioErrorCodeAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-biz-ip/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/pom.xml similarity index 80% rename from yudao-framework/yudao-spring-boot-starter-biz-ip/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/pom.xml index 1d8f23b50..36d7ad0ea 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-ip/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/pom.xml @@ -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"> - cn.iocoder.cloud - yudao-framework + cn.fuxiaoaio.ygg + fuxiaoaio-framework ${revision} 4.0.0 - yudao-spring-boot-starter-biz-ip + fuxiaoaio-spring-boot-starter-biz-ip jar ${project.artifactId} @@ -22,8 +22,8 @@ - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common @@ -45,8 +45,8 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-test + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-test test diff --git a/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/java/cn/iocoder/yudao/framework/ip/core/Area.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/src/main/java/cn/fuxiaoaio/ygg/framework/ip/core/Area.java similarity index 88% rename from yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/java/cn/iocoder/yudao/framework/ip/core/Area.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/src/main/java/cn/fuxiaoaio/ygg/framework/ip/core/Area.java index dcc94422a..8f230f739 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/java/cn/iocoder/yudao/framework/ip/core/Area.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/src/main/java/cn/fuxiaoaio/ygg/framework/ip/core/Area.java @@ -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; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/java/cn/iocoder/yudao/framework/ip/core/enums/AreaTypeEnum.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/src/main/java/cn/fuxiaoaio/ygg/framework/ip/core/enums/AreaTypeEnum.java similarity index 85% rename from yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/java/cn/iocoder/yudao/framework/ip/core/enums/AreaTypeEnum.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/src/main/java/cn/fuxiaoaio/ygg/framework/ip/core/enums/AreaTypeEnum.java index 916d88505..d73da89a3 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/java/cn/iocoder/yudao/framework/ip/core/enums/AreaTypeEnum.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/src/main/java/cn/fuxiaoaio/ygg/framework/ip/core/enums/AreaTypeEnum.java @@ -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; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/java/cn/iocoder/yudao/framework/ip/core/utils/AreaUtils.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/src/main/java/cn/fuxiaoaio/ygg/framework/ip/core/utils/AreaUtils.java similarity index 93% rename from yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/java/cn/iocoder/yudao/framework/ip/core/utils/AreaUtils.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/src/main/java/cn/fuxiaoaio/ygg/framework/ip/core/utils/AreaUtils.java index d3fe59a6c..086345a76 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/java/cn/iocoder/yudao/framework/ip/core/utils/AreaUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/src/main/java/cn/fuxiaoaio/ygg/framework/ip/core/utils/AreaUtils.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.framework.ip.core.utils; +package cn.fuxiaoaio.ygg.framework.ip.core.utils; import cn.hutool.core.io.resource.ResourceUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.text.csv.CsvRow; import cn.hutool.core.text.csv.CsvUtil; -import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; -import cn.iocoder.yudao.framework.ip.core.Area; -import cn.iocoder.yudao.framework.ip.core.enums.AreaTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils; +import cn.fuxiaoaio.ygg.framework.ip.core.Area; +import cn.fuxiaoaio.ygg.framework.ip.core.enums.AreaTypeEnum; import lombok.extern.slf4j.Slf4j; import java.util.ArrayList; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/java/cn/iocoder/yudao/framework/ip/core/utils/IPUtils.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/src/main/java/cn/fuxiaoaio/ygg/framework/ip/core/utils/IPUtils.java similarity index 95% rename from yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/java/cn/iocoder/yudao/framework/ip/core/utils/IPUtils.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/src/main/java/cn/fuxiaoaio/ygg/framework/ip/core/utils/IPUtils.java index f74f84864..29f54cf76 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/java/cn/iocoder/yudao/framework/ip/core/utils/IPUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/src/main/java/cn/fuxiaoaio/ygg/framework/ip/core/utils/IPUtils.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.ip.core.utils; +package cn.fuxiaoaio.ygg.framework.ip.core.utils; import cn.hutool.core.io.resource.ResourceUtil; -import cn.iocoder.yudao.framework.ip.core.Area; +import cn.fuxiaoaio.ygg.framework.ip.core.Area; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.lionsoul.ip2region.xdb.Searcher; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/java/cn/iocoder/yudao/framework/ip/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/src/main/java/cn/fuxiaoaio/ygg/framework/ip/package-info.java similarity index 89% rename from yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/java/cn/iocoder/yudao/framework/ip/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/src/main/java/cn/fuxiaoaio/ygg/framework/ip/package-info.java index 9d422f594..65d161fe0 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/java/cn/iocoder/yudao/framework/ip/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/src/main/java/cn/fuxiaoaio/ygg/framework/ip/package-info.java @@ -8,4 +8,4 @@ * * @author 芋道源码 */ -package cn.iocoder.yudao.framework.ip; +package cn.fuxiaoaio.ygg.framework.ip; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/resources/area.csv b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/src/main/resources/area.csv similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/resources/area.csv rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/src/main/resources/area.csv diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/src/main/resources/ip2region.xdb b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/src/main/resources/ip2region.xdb new file mode 100644 index 000000000..25522736d Binary files /dev/null and b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/src/main/resources/ip2region.xdb differ diff --git a/yudao-framework/yudao-spring-boot-starter-biz-ip/src/test/java/cn/iocoder/yudao/framework/ip/core/utils/AreaUtilsTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/src/test/java/cn/fuxiaoaio/ygg/framework/ip/core/utils/AreaUtilsTest.java similarity index 84% rename from yudao-framework/yudao-spring-boot-starter-biz-ip/src/test/java/cn/iocoder/yudao/framework/ip/core/utils/AreaUtilsTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/src/test/java/cn/fuxiaoaio/ygg/framework/ip/core/utils/AreaUtilsTest.java index 8f5646b33..f5e190ebb 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-ip/src/test/java/cn/iocoder/yudao/framework/ip/core/utils/AreaUtilsTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/src/test/java/cn/fuxiaoaio/ygg/framework/ip/core/utils/AreaUtilsTest.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.ip.core.utils; +package cn.fuxiaoaio.ygg.framework.ip.core.utils; -import cn.iocoder.yudao.framework.ip.core.Area; -import cn.iocoder.yudao.framework.ip.core.enums.AreaTypeEnum; +import cn.fuxiaoaio.ygg.framework.ip.core.Area; +import cn.fuxiaoaio.ygg.framework.ip.core.enums.AreaTypeEnum; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-ip/src/test/java/cn/iocoder/yudao/framework/ip/core/utils/IPUtilsTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/src/test/java/cn/fuxiaoaio/ygg/framework/ip/core/utils/IPUtilsTest.java similarity index 92% rename from yudao-framework/yudao-spring-boot-starter-biz-ip/src/test/java/cn/iocoder/yudao/framework/ip/core/utils/IPUtilsTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/src/test/java/cn/fuxiaoaio/ygg/framework/ip/core/utils/IPUtilsTest.java index 761a1aa63..86a83976a 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-ip/src/test/java/cn/iocoder/yudao/framework/ip/core/utils/IPUtilsTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-ip/src/test/java/cn/fuxiaoaio/ygg/framework/ip/core/utils/IPUtilsTest.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.ip.core.utils; +package cn.fuxiaoaio.ygg.framework.ip.core.utils; -import cn.iocoder.yudao.framework.ip.core.Area; +import cn.fuxiaoaio.ygg.framework.ip.core.Area; import org.junit.jupiter.api.Test; import org.lionsoul.ip2region.xdb.Searcher; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/pom.xml similarity index 66% rename from yudao-framework/yudao-spring-boot-starter-biz-operatelog/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/pom.xml index 3c1e78211..3c8e9de0e 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/pom.xml @@ -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"> - cn.iocoder.cloud - yudao-framework + cn.fuxiaoaio.ygg + fuxiaoaio-framework ${revision} 4.0.0 - yudao-spring-boot-starter-biz-operatelog + fuxiaoaio-spring-boot-starter-biz-operatelog jar ${project.artifactId} @@ -17,8 +17,8 @@ - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common @@ -29,22 +29,22 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-web + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-web provided - cn.iocoder.cloud - yudao-spring-boot-starter-rpc + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-rpc true - cn.iocoder.cloud - yudao-module-system-api + cn.fuxiaoaio.ygg + fuxiaoaio-module-system-api ${revision} diff --git a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/config/YudaoOperateLogAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/config/FuxiaoaioOperateLogAutoConfiguration.java similarity index 57% rename from yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/config/YudaoOperateLogAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/config/FuxiaoaioOperateLogAutoConfiguration.java index 441ec6bbd..fc925ff35 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/config/YudaoOperateLogAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/config/FuxiaoaioOperateLogAutoConfiguration.java @@ -1,14 +1,14 @@ -package cn.iocoder.yudao.framework.operatelog.config; +package cn.fuxiaoaio.ygg.framework.operatelog.config; -import cn.iocoder.yudao.framework.operatelog.core.aop.OperateLogAspect; -import cn.iocoder.yudao.framework.operatelog.core.service.OperateLogFrameworkService; -import cn.iocoder.yudao.framework.operatelog.core.service.OperateLogFrameworkServiceImpl; -import cn.iocoder.yudao.module.system.api.logger.OperateLogApi; +import cn.fuxiaoaio.ygg.framework.operatelog.core.aop.OperateLogAspect; +import cn.fuxiaoaio.ygg.framework.operatelog.core.service.OperateLogFrameworkService; +import cn.fuxiaoaio.ygg.framework.operatelog.core.service.OperateLogFrameworkServiceImpl; +import cn.fuxiaoaio.ygg.module.system.api.logger.OperateLogApi; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; @AutoConfiguration -public class YudaoOperateLogAutoConfiguration { +public class FuxiaoaioOperateLogAutoConfiguration { @Bean public OperateLogAspect operateLogAspect() { diff --git a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/config/YudaoOperateLogRpcAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/config/FuxiaoaioOperateLogRpcAutoConfiguration.java similarity index 64% rename from yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/config/YudaoOperateLogRpcAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/config/FuxiaoaioOperateLogRpcAutoConfiguration.java index 1c3b4fe80..bacd729a7 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/config/YudaoOperateLogRpcAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/config/FuxiaoaioOperateLogRpcAutoConfiguration.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.operatelog.config; +package cn.fuxiaoaio.ygg.framework.operatelog.config; -import cn.iocoder.yudao.module.system.api.logger.OperateLogApi; +import cn.fuxiaoaio.ygg.module.system.api.logger.OperateLogApi; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.cloud.openfeign.EnableFeignClients; @@ -11,6 +11,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients; */ @AutoConfiguration @EnableFeignClients(clients = OperateLogApi.class) // 主要是引入相关的 API 服务 -public class YudaoOperateLogRpcAutoConfiguration { +public class FuxiaoaioOperateLogRpcAutoConfiguration { } diff --git a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/annotations/OperateLog.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/core/annotations/OperateLog.java similarity index 90% rename from yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/annotations/OperateLog.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/core/annotations/OperateLog.java index c61384ff4..62f03aea4 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/annotations/OperateLog.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/core/annotations/OperateLog.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.operatelog.core.annotations; +package cn.fuxiaoaio.ygg.framework.operatelog.core.annotations; -import cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum; +import cn.fuxiaoaio.ygg.framework.operatelog.core.enums.OperateTypeEnum; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/aop/OperateLogAspect.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/core/aop/OperateLogAspect.java similarity index 92% rename from yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/aop/OperateLogAspect.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/core/aop/OperateLogAspect.java index c42d7ec19..b125dc46d 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/aop/OperateLogAspect.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/core/aop/OperateLogAspect.java @@ -1,19 +1,19 @@ -package cn.iocoder.yudao.framework.operatelog.core.aop; +package cn.fuxiaoaio.ygg.framework.operatelog.core.aop; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.servlet.ServletUtil; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; -import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils; -import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; -import cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum; -import cn.iocoder.yudao.framework.operatelog.core.service.OperateLog; -import cn.iocoder.yudao.framework.operatelog.core.service.OperateLogFrameworkService; -import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.framework.common.util.monitor.TracerUtils; +import cn.fuxiaoaio.ygg.framework.common.util.servlet.ServletUtils; +import cn.fuxiaoaio.ygg.framework.operatelog.core.enums.OperateTypeEnum; +import cn.fuxiaoaio.ygg.framework.operatelog.core.service.OperateLog; +import cn.fuxiaoaio.ygg.framework.operatelog.core.service.OperateLogFrameworkService; +import cn.fuxiaoaio.ygg.framework.web.core.util.WebFrameworkUtils; import com.google.common.collect.Maps; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; @@ -38,8 +38,8 @@ import java.util.*; import java.util.function.Predicate; import java.util.stream.IntStream; -import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR; -import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.SUCCESS; +import static cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR; +import static cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants.SUCCESS; /** * 拦截使用 @OperateLog 注解，如果满足条件，则生成操作日志。 @@ -74,20 +74,20 @@ public class OperateLogAspect { @Around("@annotation(operation)") public Object around(ProceedingJoinPoint joinPoint, Operation operation) throws Throwable { // 可能也添加了 @ApiOperation 注解 - cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog operateLog = getMethodAnnotation(joinPoint, - cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog.class); + cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog operateLog = getMethodAnnotation(joinPoint, + cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog.class); return around0(joinPoint, operateLog, operation); } @Around("!@annotation(io.swagger.v3.oas.annotations.Operation) && @annotation(operateLog)") // 兼容处理，只添加 @OperateLog 注解的情况 public Object around(ProceedingJoinPoint joinPoint, - cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog operateLog) throws Throwable { + cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog operateLog) throws Throwable { return around0(joinPoint, operateLog, null); } private Object around0(ProceedingJoinPoint joinPoint, - cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog operateLog, + cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog operateLog, Operation operation) throws Throwable { // 目前，只有管理员，才记录操作日志！所以非管理员，直接调用，不进行记录 Integer userType = WebFrameworkUtils.getLoginUserType(); @@ -128,7 +128,7 @@ public class OperateLogAspect { } private void log(ProceedingJoinPoint joinPoint, - cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog operateLog, + cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog operateLog, Operation operation, LocalDateTime startTime, Object result, Throwable exception) { try { @@ -145,7 +145,7 @@ public class OperateLogAspect { } private void log0(ProceedingJoinPoint joinPoint, - cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog operateLog, + cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog operateLog, Operation operation, LocalDateTime startTime, Object result, Throwable exception) { OperateLog operateLogObj = new OperateLog(); @@ -172,7 +172,7 @@ public class OperateLogAspect { private static void fillModuleFields(OperateLog operateLogObj, ProceedingJoinPoint joinPoint, - cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog operateLog, + cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog operateLog, Operation operation) { // module 属性 if (operateLog != null) { @@ -227,7 +227,7 @@ public class OperateLogAspect { private static void fillMethodFields(OperateLog operateLogObj, ProceedingJoinPoint joinPoint, - cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog operateLog, + cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog operateLog, LocalDateTime startTime, Object result, Throwable exception) { MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature(); operateLogObj.setJavaMethod(methodSignature.toString()); @@ -254,7 +254,7 @@ public class OperateLogAspect { } private static boolean isLogEnable(ProceedingJoinPoint joinPoint, - cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog operateLog) { + cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog operateLog) { // 有 @OperateLog 注解的情况下 if (operateLog != null) { return operateLog.enable(); diff --git a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/enums/OperateTypeEnum.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/core/enums/OperateTypeEnum.java similarity index 87% rename from yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/enums/OperateTypeEnum.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/core/enums/OperateTypeEnum.java index 65ee26d71..4ee47f503 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/enums/OperateTypeEnum.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/core/enums/OperateTypeEnum.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.operatelog.core.enums; +package cn.fuxiaoaio.ygg.framework.operatelog.core.enums; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; +import cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/core/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/core/package-info.java new file mode 100644 index 000000000..8130c72e6 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/core/package-info.java @@ -0,0 +1 @@ +package cn.fuxiaoaio.ygg.framework.operatelog.core; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/service/OperateLog.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/core/service/OperateLog.java similarity index 96% rename from yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/service/OperateLog.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/core/service/OperateLog.java index 1e3b8c8a8..49541ee22 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/service/OperateLog.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/core/service/OperateLog.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.operatelog.core.service; +package cn.fuxiaoaio.ygg.framework.operatelog.core.service; import lombok.Data; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/service/OperateLogFrameworkService.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/core/service/OperateLogFrameworkService.java similarity index 82% rename from yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/service/OperateLogFrameworkService.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/core/service/OperateLogFrameworkService.java index b3e95f088..fe1ae1cda 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/service/OperateLogFrameworkService.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/core/service/OperateLogFrameworkService.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.operatelog.core.service; +package cn.fuxiaoaio.ygg.framework.operatelog.core.service; /** * 操作日志 Framework Service 接口 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/service/OperateLogFrameworkServiceImpl.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/core/service/OperateLogFrameworkServiceImpl.java similarity index 79% rename from yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/service/OperateLogFrameworkServiceImpl.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/core/service/OperateLogFrameworkServiceImpl.java index 5581aed22..ab2b77e39 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/service/OperateLogFrameworkServiceImpl.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/core/service/OperateLogFrameworkServiceImpl.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.operatelog.core.service; +package cn.fuxiaoaio.ygg.framework.operatelog.core.service; import cn.hutool.core.bean.BeanUtil; -import cn.iocoder.yudao.module.system.api.logger.OperateLogApi; -import cn.iocoder.yudao.module.system.api.logger.dto.OperateLogCreateReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.logger.OperateLogApi; +import cn.fuxiaoaio.ygg.module.system.api.logger.dto.OperateLogCreateReqDTO; import lombok.RequiredArgsConstructor; import org.springframework.scheduling.annotation.Async; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/util/OperateLogUtils.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/core/util/OperateLogUtils.java similarity index 77% rename from yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/util/OperateLogUtils.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/core/util/OperateLogUtils.java index a9801e50e..b35e75e8e 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/util/OperateLogUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/core/util/OperateLogUtils.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.operatelog.core.util; +package cn.fuxiaoaio.ygg.framework.operatelog.core.util; -import cn.iocoder.yudao.framework.operatelog.core.aop.OperateLogAspect; +import cn.fuxiaoaio.ygg.framework.operatelog.core.aop.OperateLogAspect; /** * 操作日志工具类 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/package-info.java similarity index 75% rename from yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/package-info.java index d272b53b4..f731a49b7 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/java/cn/fuxiaoaio/ygg/framework/operatelog/package-info.java @@ -3,4 +3,4 @@ * * @author 芋道源码 */ -package cn.iocoder.yudao.framework.operatelog; +package cn.fuxiaoaio.ygg.framework.operatelog; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..6a12fa692 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-operatelog/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +cn.fuxiaoaio.ygg.framework.operatelog.config.FuxiaoaioOperateLogRpcAutoConfiguration +cn.fuxiaoaio.ygg.framework.operatelog.config.FuxiaoaioOperateLogAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/pom.xml similarity index 85% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/pom.xml index a20644ebe..86c10818b 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - cn.iocoder.cloud - yudao-framework + cn.fuxiaoaio.ygg + fuxiaoaio-framework ${revision} 4.0.0 - yudao-spring-boot-starter-biz-pay + fuxiaoaio-spring-boot-starter-biz-pay ${project.artifactId} 支付拓展，接入国内多个支付渠道 1. 支付宝，基于官方 SDK 接入 @@ -18,8 +18,8 @@ - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common @@ -69,8 +69,8 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-test + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-test test diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/config/YudaoPayAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/config/FuxiaoaioPayAutoConfiguration.java similarity index 67% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/config/YudaoPayAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/config/FuxiaoaioPayAutoConfiguration.java index 704dab307..02a73f2ed 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/config/YudaoPayAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/config/FuxiaoaioPayAutoConfiguration.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.pay.config; +package cn.fuxiaoaio.ygg.framework.pay.config; -import cn.iocoder.yudao.framework.pay.core.client.PayClientFactory; -import cn.iocoder.yudao.framework.pay.core.client.impl.PayClientFactoryImpl; +import cn.fuxiaoaio.ygg.framework.pay.core.client.PayClientFactory; +import cn.fuxiaoaio.ygg.framework.pay.core.client.impl.PayClientFactoryImpl; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -13,7 +13,7 @@ import org.springframework.context.annotation.Bean; */ @AutoConfiguration @EnableConfigurationProperties(PayProperties.class) -public class YudaoPayAutoConfiguration { +public class FuxiaoaioPayAutoConfiguration { @Bean public PayClientFactory payClientFactory() { diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/config/PayProperties.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/config/PayProperties.java similarity index 92% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/config/PayProperties.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/config/PayProperties.java index 057a75541..f8f25a71b 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/config/PayProperties.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/config/PayProperties.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.pay.config; +package cn.fuxiaoaio.ygg.framework.pay.config; import lombok.Data; import org.hibernate.validator.constraints.URL; @@ -7,7 +7,7 @@ import org.springframework.validation.annotation.Validated; import javax.validation.constraints.NotEmpty; -@ConfigurationProperties(prefix = "yudao.pay") +@ConfigurationProperties(prefix = "fuxiaoaio.pay") @Validated @Data public class PayProperties { diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/AbstractPayCodeMapping.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/AbstractPayCodeMapping.java similarity index 83% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/AbstractPayCodeMapping.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/AbstractPayCodeMapping.java index 88be97f00..c9f9b81b4 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/AbstractPayCodeMapping.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/AbstractPayCodeMapping.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.pay.core.client; +package cn.fuxiaoaio.ygg.framework.pay.core.client; -import cn.iocoder.yudao.framework.common.exception.ErrorCode; -import cn.iocoder.yudao.framework.pay.core.enums.PayFrameworkErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.common.exception.ErrorCode; +import cn.fuxiaoaio.ygg.framework.pay.core.enums.PayFrameworkErrorCodeConstants; import lombok.extern.slf4j.Slf4j; /** diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/PayClient.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/PayClient.java similarity index 94% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/PayClient.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/PayClient.java index 5cde0d5a0..93ccd43c6 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/PayClient.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/PayClient.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.pay.core.client; +package cn.fuxiaoaio.ygg.framework.pay.core.client; -import cn.iocoder.yudao.framework.pay.core.client.dto.*; +import cn.fuxiaoaio.ygg.framework.pay.core.client.dto.*; /** * 支付客户端，用于对接各支付渠道的 SDK，实现发起支付、退款等功能 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/PayClientConfig.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/PayClientConfig.java similarity index 96% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/PayClientConfig.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/PayClientConfig.java index bf709e497..7d927592b 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/PayClientConfig.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/PayClientConfig.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.pay.core.client; +package cn.fuxiaoaio.ygg.framework.pay.core.client; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/PayClientFactory.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/PayClientFactory.java similarity index 92% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/PayClientFactory.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/PayClientFactory.java index f6d0ca6b5..00c4c9940 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/PayClientFactory.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/PayClientFactory.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.pay.core.client; +package cn.fuxiaoaio.ygg.framework.pay.core.client; /** * 支付客户端的工厂接口 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/PayCommonResult.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/PayCommonResult.java similarity index 87% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/PayCommonResult.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/PayCommonResult.java index 8837a0ac9..dd17a66f8 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/PayCommonResult.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/PayCommonResult.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.framework.pay.core.client; +package cn.fuxiaoaio.ygg.framework.pay.core.client; import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.lang.Assert; -import cn.iocoder.yudao.framework.common.exception.ErrorCode; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.pay.core.enums.PayFrameworkErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.common.exception.ErrorCode; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.pay.core.enums.PayFrameworkErrorCodeConstants; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/PayNotifyDataDTO.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/dto/PayNotifyDataDTO.java similarity index 89% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/PayNotifyDataDTO.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/dto/PayNotifyDataDTO.java index bbd237e9c..15e213ba5 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/PayNotifyDataDTO.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/dto/PayNotifyDataDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.pay.core.client.dto; +package cn.fuxiaoaio.ygg.framework.pay.core.client.dto; import lombok.Builder; import lombok.Data; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/PayOrderNotifyRespDTO.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/dto/PayOrderNotifyRespDTO.java similarity index 95% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/PayOrderNotifyRespDTO.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/dto/PayOrderNotifyRespDTO.java index 91f3b2a37..11e633d89 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/PayOrderNotifyRespDTO.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/dto/PayOrderNotifyRespDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.pay.core.client.dto; +package cn.fuxiaoaio.ygg.framework.pay.core.client.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/PayOrderUnifiedReqDTO.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/dto/PayOrderUnifiedReqDTO.java similarity index 97% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/PayOrderUnifiedReqDTO.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/dto/PayOrderUnifiedReqDTO.java index ea3628931..408a4d75f 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/PayOrderUnifiedReqDTO.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/dto/PayOrderUnifiedReqDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.pay.core.client.dto; +package cn.fuxiaoaio.ygg.framework.pay.core.client.dto; import lombok.Data; import org.hibernate.validator.constraints.Length; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/PayRefundNotifyDTO.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/dto/PayRefundNotifyDTO.java similarity index 93% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/PayRefundNotifyDTO.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/dto/PayRefundNotifyDTO.java index edb593d82..621a1f1cc 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/PayRefundNotifyDTO.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/dto/PayRefundNotifyDTO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.pay.core.client.dto; +package cn.fuxiaoaio.ygg.framework.pay.core.client.dto; -import cn.iocoder.yudao.framework.pay.core.enums.PayNotifyRefundStatusEnum; +import cn.fuxiaoaio.ygg.framework.pay.core.enums.PayNotifyRefundStatusEnum; import lombok.Builder; import lombok.Data; import lombok.ToString; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/PayRefundUnifiedReqDTO.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/dto/PayRefundUnifiedReqDTO.java similarity index 97% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/PayRefundUnifiedReqDTO.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/dto/PayRefundUnifiedReqDTO.java index 79e11eaff..6c9b8e3f1 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/PayRefundUnifiedReqDTO.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/dto/PayRefundUnifiedReqDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.pay.core.client.dto; +package cn.fuxiaoaio.ygg.framework.pay.core.client.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/PayRefundUnifiedRespDTO.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/dto/PayRefundUnifiedRespDTO.java similarity index 87% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/PayRefundUnifiedRespDTO.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/dto/PayRefundUnifiedRespDTO.java index cedf0020d..8cf5e531d 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/PayRefundUnifiedRespDTO.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/dto/PayRefundUnifiedRespDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.pay.core.client.dto; +package cn.fuxiaoaio.ygg.framework.pay.core.client.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/AbstractPayClient.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/AbstractPayClient.java similarity index 83% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/AbstractPayClient.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/AbstractPayClient.java index 3253709c8..71fb047c9 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/AbstractPayClient.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/AbstractPayClient.java @@ -1,17 +1,17 @@ -package cn.iocoder.yudao.framework.pay.core.client.impl; +package cn.fuxiaoaio.ygg.framework.pay.core.client.impl; -import cn.iocoder.yudao.framework.pay.core.client.AbstractPayCodeMapping; -import cn.iocoder.yudao.framework.pay.core.client.PayClient; -import cn.iocoder.yudao.framework.pay.core.client.PayClientConfig; -import cn.iocoder.yudao.framework.pay.core.client.PayCommonResult; -import cn.iocoder.yudao.framework.pay.core.client.dto.PayOrderUnifiedReqDTO; -import cn.iocoder.yudao.framework.pay.core.client.dto.PayRefundUnifiedReqDTO; -import cn.iocoder.yudao.framework.pay.core.client.dto.PayRefundUnifiedRespDTO; +import cn.fuxiaoaio.ygg.framework.pay.core.client.AbstractPayCodeMapping; +import cn.fuxiaoaio.ygg.framework.pay.core.client.PayClient; +import cn.fuxiaoaio.ygg.framework.pay.core.client.PayClientConfig; +import cn.fuxiaoaio.ygg.framework.pay.core.client.PayCommonResult; +import cn.fuxiaoaio.ygg.framework.pay.core.client.dto.PayOrderUnifiedReqDTO; +import cn.fuxiaoaio.ygg.framework.pay.core.client.dto.PayRefundUnifiedReqDTO; +import cn.fuxiaoaio.ygg.framework.pay.core.client.dto.PayRefundUnifiedRespDTO; import lombok.extern.slf4j.Slf4j; import javax.validation.Validation; -import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString; +import static cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils.toJsonString; /** * 支付客户端的抽象类，提供模板方法，减少子类的冗余代码 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/PayClientFactoryImpl.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/PayClientFactoryImpl.java similarity index 80% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/PayClientFactoryImpl.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/PayClientFactoryImpl.java index 421dbfe7d..b74cb5205 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/PayClientFactoryImpl.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/PayClientFactoryImpl.java @@ -1,18 +1,18 @@ -package cn.iocoder.yudao.framework.pay.core.client.impl; +package cn.fuxiaoaio.ygg.framework.pay.core.client.impl; import cn.hutool.core.lang.Assert; -import cn.iocoder.yudao.framework.pay.core.client.PayClient; -import cn.iocoder.yudao.framework.pay.core.client.PayClientConfig; -import cn.iocoder.yudao.framework.pay.core.client.PayClientFactory; -import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayPayClientConfig; -import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayPcPayClient; -import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayQrPayClient; -import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayWapPayClient; -import cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXLitePayClient; -import cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXNativePayClient; -import cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXPayClientConfig; -import cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXPubPayClient; -import cn.iocoder.yudao.framework.pay.core.enums.PayChannelEnum; +import cn.fuxiaoaio.ygg.framework.pay.core.client.PayClient; +import cn.fuxiaoaio.ygg.framework.pay.core.client.PayClientConfig; +import cn.fuxiaoaio.ygg.framework.pay.core.client.PayClientFactory; +import cn.fuxiaoaio.ygg.framework.pay.core.client.impl.alipay.AlipayPayClientConfig; +import cn.fuxiaoaio.ygg.framework.pay.core.client.impl.alipay.AlipayPcPayClient; +import cn.fuxiaoaio.ygg.framework.pay.core.client.impl.alipay.AlipayQrPayClient; +import cn.fuxiaoaio.ygg.framework.pay.core.client.impl.alipay.AlipayWapPayClient; +import cn.fuxiaoaio.ygg.framework.pay.core.client.impl.wx.WXLitePayClient; +import cn.fuxiaoaio.ygg.framework.pay.core.client.impl.wx.WXNativePayClient; +import cn.fuxiaoaio.ygg.framework.pay.core.client.impl.wx.WXPayClientConfig; +import cn.fuxiaoaio.ygg.framework.pay.core.client.impl.wx.WXPubPayClient; +import cn.fuxiaoaio.ygg.framework.pay.core.enums.PayChannelEnum; import lombok.extern.slf4j.Slf4j; import java.util.concurrent.ConcurrentHashMap; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AbstractAlipayClient.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/alipay/AbstractAlipayClient.java similarity index 93% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AbstractAlipayClient.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/alipay/AbstractAlipayClient.java index 680d80d77..215da1f3e 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AbstractAlipayClient.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/alipay/AbstractAlipayClient.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.framework.pay.core.client.impl.alipay; +package cn.fuxiaoaio.ygg.framework.pay.core.client.impl.alipay; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.LocalDateTimeUtil; -import cn.iocoder.yudao.framework.pay.core.client.AbstractPayCodeMapping; -import cn.iocoder.yudao.framework.pay.core.client.PayCommonResult; -import cn.iocoder.yudao.framework.pay.core.client.dto.*; -import cn.iocoder.yudao.framework.pay.core.client.impl.AbstractPayClient; -import cn.iocoder.yudao.framework.pay.core.enums.PayNotifyRefundStatusEnum; +import cn.fuxiaoaio.ygg.framework.pay.core.client.AbstractPayCodeMapping; +import cn.fuxiaoaio.ygg.framework.pay.core.client.PayCommonResult; +import cn.fuxiaoaio.ygg.framework.pay.core.client.dto.*; +import cn.fuxiaoaio.ygg.framework.pay.core.client.impl.AbstractPayClient; +import cn.fuxiaoaio.ygg.framework.pay.core.enums.PayNotifyRefundStatusEnum; import com.alipay.api.AlipayApiException; import com.alipay.api.AlipayConfig; import com.alipay.api.DefaultAlipayClient; @@ -21,7 +21,7 @@ import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; -import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString; +import static cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils.toJsonString; /** * 支付宝抽象类， 实现支付宝统一的接口。如退款 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPayClientConfig.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/alipay/AlipayPayClientConfig.java similarity index 96% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPayClientConfig.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/alipay/AlipayPayClientConfig.java index bbe96c146..50ef9343e 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPayClientConfig.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/alipay/AlipayPayClientConfig.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.pay.core.client.impl.alipay; +package cn.fuxiaoaio.ygg.framework.pay.core.client.impl.alipay; -import cn.iocoder.yudao.framework.pay.core.client.PayClientConfig; +import cn.fuxiaoaio.ygg.framework.pay.core.client.PayClientConfig; import lombok.Data; import javax.validation.ConstraintViolation; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPayCodeMapping.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/alipay/AlipayPayCodeMapping.java similarity index 70% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPayCodeMapping.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/alipay/AlipayPayCodeMapping.java index d9662a01b..4d02bca5e 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPayCodeMapping.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/alipay/AlipayPayCodeMapping.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.pay.core.client.impl.alipay; +package cn.fuxiaoaio.ygg.framework.pay.core.client.impl.alipay; -import cn.iocoder.yudao.framework.common.exception.ErrorCode; -import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.yudao.framework.pay.core.client.AbstractPayCodeMapping; +import cn.fuxiaoaio.ygg.framework.common.exception.ErrorCode; +import cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.pay.core.client.AbstractPayCodeMapping; import java.util.Objects; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPcPayClient.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/alipay/AlipayPcPayClient.java similarity index 88% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPcPayClient.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/alipay/AlipayPcPayClient.java index 41a391c05..faccbae72 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPcPayClient.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/alipay/AlipayPcPayClient.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.framework.pay.core.client.impl.alipay; +package cn.fuxiaoaio.ygg.framework.pay.core.client.impl.alipay; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; -import cn.iocoder.yudao.framework.pay.core.client.PayCommonResult; -import cn.iocoder.yudao.framework.pay.core.client.dto.PayOrderUnifiedReqDTO; -import cn.iocoder.yudao.framework.pay.core.enums.PayChannelEnum; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.framework.pay.core.client.PayCommonResult; +import cn.fuxiaoaio.ygg.framework.pay.core.client.dto.PayOrderUnifiedReqDTO; +import cn.fuxiaoaio.ygg.framework.pay.core.enums.PayChannelEnum; import com.alibaba.fastjson.JSONObject; import com.alipay.api.AlipayApiException; import com.alipay.api.domain.AlipayTradePagePayModel; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayQrPayClient.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/alipay/AlipayQrPayClient.java similarity index 86% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayQrPayClient.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/alipay/AlipayQrPayClient.java index acdf28e70..2650dc403 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayQrPayClient.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/alipay/AlipayQrPayClient.java @@ -1,15 +1,15 @@ -package cn.iocoder.yudao.framework.pay.core.client.impl.alipay; +package cn.fuxiaoaio.ygg.framework.pay.core.client.impl.alipay; -import cn.iocoder.yudao.framework.pay.core.client.PayCommonResult; -import cn.iocoder.yudao.framework.pay.core.client.dto.PayOrderUnifiedReqDTO; -import cn.iocoder.yudao.framework.pay.core.enums.PayChannelEnum; +import cn.fuxiaoaio.ygg.framework.pay.core.client.PayCommonResult; +import cn.fuxiaoaio.ygg.framework.pay.core.client.dto.PayOrderUnifiedReqDTO; +import cn.fuxiaoaio.ygg.framework.pay.core.enums.PayChannelEnum; import com.alipay.api.AlipayApiException; import com.alipay.api.domain.AlipayTradePrecreateModel; import com.alipay.api.request.AlipayTradePrecreateRequest; import com.alipay.api.response.AlipayTradePrecreateResponse; import lombok.extern.slf4j.Slf4j; -import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString; +import static cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils.toJsonString; /** * 支付宝【扫码支付】的 PayClient 实现类 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayWapPayClient.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/alipay/AlipayWapPayClient.java similarity index 91% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayWapPayClient.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/alipay/AlipayWapPayClient.java index 0e410ba0c..eaf1a97bf 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayWapPayClient.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/alipay/AlipayWapPayClient.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.framework.pay.core.client.impl.alipay; +package cn.fuxiaoaio.ygg.framework.pay.core.client.impl.alipay; import cn.hutool.core.date.DateUtil; -import cn.iocoder.yudao.framework.pay.core.client.PayCommonResult; -import cn.iocoder.yudao.framework.pay.core.client.dto.PayOrderUnifiedReqDTO; -import cn.iocoder.yudao.framework.pay.core.enums.PayChannelEnum; +import cn.fuxiaoaio.ygg.framework.pay.core.client.PayCommonResult; +import cn.fuxiaoaio.ygg.framework.pay.core.client.dto.PayOrderUnifiedReqDTO; +import cn.fuxiaoaio.ygg.framework.pay.core.enums.PayChannelEnum; import com.alipay.api.AlipayApiException; import com.alipay.api.domain.AlipayTradeWapPayModel; import com.alipay.api.request.AlipayTradeWapPayRequest; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXCodeMapping.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/wx/WXCodeMapping.java similarity index 82% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXCodeMapping.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/wx/WXCodeMapping.java index cb5e872e7..84adc6096 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXCodeMapping.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/wx/WXCodeMapping.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.framework.pay.core.client.impl.wx; +package cn.fuxiaoaio.ygg.framework.pay.core.client.impl.wx; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.exception.ErrorCode; -import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.yudao.framework.pay.core.client.AbstractPayCodeMapping; +import cn.fuxiaoaio.ygg.framework.common.exception.ErrorCode; +import cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.pay.core.client.AbstractPayCodeMapping; import java.util.Objects; -import static cn.iocoder.yudao.framework.pay.core.enums.PayFrameworkErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.pay.core.enums.PayFrameworkErrorCodeConstants.*; /** * 微信支付 PayCodeMapping 实现类 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXLitePayClient.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/wx/WXLitePayClient.java similarity index 93% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXLitePayClient.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/wx/WXLitePayClient.java index 52bdde62d..a45e8baf1 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXLitePayClient.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/wx/WXLitePayClient.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.pay.core.client.impl.wx; +package cn.fuxiaoaio.ygg.framework.pay.core.client.impl.wx; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; @@ -6,12 +6,12 @@ import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.util.io.FileUtils; -import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; -import cn.iocoder.yudao.framework.pay.core.client.PayCommonResult; -import cn.iocoder.yudao.framework.pay.core.client.dto.*; -import cn.iocoder.yudao.framework.pay.core.client.impl.AbstractPayClient; -import cn.iocoder.yudao.framework.pay.core.enums.PayChannelEnum; +import cn.fuxiaoaio.ygg.framework.common.util.io.FileUtils; +import cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils; +import cn.fuxiaoaio.ygg.framework.pay.core.client.PayCommonResult; +import cn.fuxiaoaio.ygg.framework.pay.core.client.dto.*; +import cn.fuxiaoaio.ygg.framework.pay.core.client.impl.AbstractPayClient; +import cn.fuxiaoaio.ygg.framework.pay.core.enums.PayChannelEnum; import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyV3Result; import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult; @@ -28,9 +28,9 @@ import lombok.extern.slf4j.Slf4j; import java.util.Objects; -import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString; -import static cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXCodeMapping.CODE_SUCCESS; -import static cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXCodeMapping.MESSAGE_SUCCESS; +import static cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils.toJsonString; +import static cn.fuxiaoaio.ygg.framework.pay.core.client.impl.wx.WXCodeMapping.CODE_SUCCESS; +import static cn.fuxiaoaio.ygg.framework.pay.core.client.impl.wx.WXCodeMapping.MESSAGE_SUCCESS; /** diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXNativePayClient.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/wx/WXNativePayClient.java similarity index 92% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXNativePayClient.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/wx/WXNativePayClient.java index f9ccd4629..8dd05a81b 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXNativePayClient.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/wx/WXNativePayClient.java @@ -1,16 +1,16 @@ -package cn.iocoder.yudao.framework.pay.core.client.impl.wx; +package cn.fuxiaoaio.ygg.framework.pay.core.client.impl.wx; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.util.io.FileUtils; -import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; -import cn.iocoder.yudao.framework.pay.core.client.PayCommonResult; -import cn.iocoder.yudao.framework.pay.core.client.dto.*; -import cn.iocoder.yudao.framework.pay.core.client.impl.AbstractPayClient; -import cn.iocoder.yudao.framework.pay.core.enums.PayChannelEnum; +import cn.fuxiaoaio.ygg.framework.common.util.io.FileUtils; +import cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils; +import cn.fuxiaoaio.ygg.framework.pay.core.client.PayCommonResult; +import cn.fuxiaoaio.ygg.framework.pay.core.client.dto.*; +import cn.fuxiaoaio.ygg.framework.pay.core.client.impl.AbstractPayClient; +import cn.fuxiaoaio.ygg.framework.pay.core.enums.PayChannelEnum; import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyV3Result; import com.github.binarywang.wxpay.bean.order.WxPayNativeOrderResult; @@ -26,9 +26,9 @@ import lombok.extern.slf4j.Slf4j; import java.util.Objects; -import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString; -import static cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXCodeMapping.CODE_SUCCESS; -import static cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXCodeMapping.MESSAGE_SUCCESS; +import static cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils.toJsonString; +import static cn.fuxiaoaio.ygg.framework.pay.core.client.impl.wx.WXCodeMapping.CODE_SUCCESS; +import static cn.fuxiaoaio.ygg.framework.pay.core.client.impl.wx.WXCodeMapping.MESSAGE_SUCCESS; /** * 微信 App 支付 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXPayClientConfig.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/wx/WXPayClientConfig.java similarity index 96% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXPayClientConfig.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/wx/WXPayClientConfig.java index 294f8e4ff..26980dd37 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXPayClientConfig.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/wx/WXPayClientConfig.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.pay.core.client.impl.wx; +package cn.fuxiaoaio.ygg.framework.pay.core.client.impl.wx; import cn.hutool.core.io.IoUtil; -import cn.iocoder.yudao.framework.pay.core.client.PayClientConfig; +import cn.fuxiaoaio.ygg.framework.pay.core.client.PayClientConfig; import lombok.Data; import javax.validation.ConstraintViolation; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXPubPayClient.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/wx/WXPubPayClient.java similarity index 93% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXPubPayClient.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/wx/WXPubPayClient.java index 84e3064c3..5ad21c7c4 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXPubPayClient.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/client/impl/wx/WXPubPayClient.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.pay.core.client.impl.wx; +package cn.fuxiaoaio.ygg.framework.pay.core.client.impl.wx; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; @@ -6,12 +6,12 @@ import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.util.io.FileUtils; -import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; -import cn.iocoder.yudao.framework.pay.core.client.PayCommonResult; -import cn.iocoder.yudao.framework.pay.core.client.dto.*; -import cn.iocoder.yudao.framework.pay.core.client.impl.AbstractPayClient; -import cn.iocoder.yudao.framework.pay.core.enums.PayChannelEnum; +import cn.fuxiaoaio.ygg.framework.common.util.io.FileUtils; +import cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils; +import cn.fuxiaoaio.ygg.framework.pay.core.client.PayCommonResult; +import cn.fuxiaoaio.ygg.framework.pay.core.client.dto.*; +import cn.fuxiaoaio.ygg.framework.pay.core.client.impl.AbstractPayClient; +import cn.fuxiaoaio.ygg.framework.pay.core.enums.PayChannelEnum; import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyV3Result; import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult; @@ -28,9 +28,9 @@ import lombok.extern.slf4j.Slf4j; import java.util.Objects; -import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString; -import static cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXCodeMapping.CODE_SUCCESS; -import static cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXCodeMapping.MESSAGE_SUCCESS; +import static cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils.toJsonString; +import static cn.fuxiaoaio.ygg.framework.pay.core.client.impl.wx.WXCodeMapping.CODE_SUCCESS; +import static cn.fuxiaoaio.ygg.framework.pay.core.client.impl.wx.WXCodeMapping.MESSAGE_SUCCESS; /** * 微信支付（公众号）的 PayClient 实现类 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/PayChannelEnum.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/enums/PayChannelEnum.java similarity index 86% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/PayChannelEnum.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/enums/PayChannelEnum.java index 0754f9dae..ce3b4b9ce 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/PayChannelEnum.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/enums/PayChannelEnum.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.framework.pay.core.enums; +package cn.fuxiaoaio.ygg.framework.pay.core.enums; import cn.hutool.core.util.ArrayUtil; -import cn.iocoder.yudao.framework.pay.core.client.PayClientConfig; -import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayPayClientConfig; -import cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXPayClientConfig; +import cn.fuxiaoaio.ygg.framework.pay.core.client.PayClientConfig; +import cn.fuxiaoaio.ygg.framework.pay.core.client.impl.alipay.AlipayPayClientConfig; +import cn.fuxiaoaio.ygg.framework.pay.core.client.impl.wx.WXPayClientConfig; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/PayChannelRefundRespEnum.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/enums/PayChannelRefundRespEnum.java similarity index 88% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/PayChannelRefundRespEnum.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/enums/PayChannelRefundRespEnum.java index 53aa16bc2..e05ddb2e8 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/PayChannelRefundRespEnum.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/enums/PayChannelRefundRespEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.pay.core.enums; +package cn.fuxiaoaio.ygg.framework.pay.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/PayFrameworkErrorCodeConstants.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/enums/PayFrameworkErrorCodeConstants.java similarity index 89% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/PayFrameworkErrorCodeConstants.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/enums/PayFrameworkErrorCodeConstants.java index 7046b4c6f..db7afbd56 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/PayFrameworkErrorCodeConstants.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/enums/PayFrameworkErrorCodeConstants.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.pay.core.enums; +package cn.fuxiaoaio.ygg.framework.pay.core.enums; -import cn.iocoder.yudao.framework.common.exception.ErrorCode; +import cn.fuxiaoaio.ygg.framework.common.exception.ErrorCode; /** * 支付框架的错误码枚举 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/PayNotifyRefundStatusEnum.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/enums/PayNotifyRefundStatusEnum.java similarity index 87% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/PayNotifyRefundStatusEnum.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/enums/PayNotifyRefundStatusEnum.java index 5137600e0..6d36aacaf 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/PayNotifyRefundStatusEnum.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/java/cn/fuxiaoaio/ygg/framework/pay/core/enums/PayNotifyRefundStatusEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.pay.core.enums; +package cn.fuxiaoaio.ygg.framework.pay.core.enums; /** * 退款通知, 统一的渠道退款状态 diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..e3c93defa --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +cn.fuxiaoaio.ygg.framework.pay.config.FuxiaoaioPayAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test-integration/java/cn/iocoder/yudao/framework/core/client/impl/PayClientFactoryImplTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/test-integration/java/cn/fuxiaoaio/ygg/framework/core/client/impl/PayClientFactoryImplTest.java similarity index 92% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/test-integration/java/cn/iocoder/yudao/framework/core/client/impl/PayClientFactoryImplTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/test-integration/java/cn/fuxiaoaio/ygg/framework/core/client/impl/PayClientFactoryImplTest.java index 582840e4e..131afe0e9 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test-integration/java/cn/iocoder/yudao/framework/core/client/impl/PayClientFactoryImplTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/test-integration/java/cn/fuxiaoaio/ygg/framework/core/client/impl/PayClientFactoryImplTest.java @@ -1,18 +1,18 @@ -package cn.iocoder.yudao.framework.core.client.impl; +package cn.fuxiaoaio.ygg.framework.core.client.impl; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.RandomUtil; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; -import cn.iocoder.yudao.framework.pay.core.client.PayClient; -import cn.iocoder.yudao.framework.pay.core.client.dto.PayOrderUnifiedReqDTO; -import cn.iocoder.yudao.framework.pay.core.client.impl.PayClientFactoryImpl; -import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayPayClientConfig; -import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayQrPayClient; -import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayWapPayClient; -import cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXPayClientConfig; -import cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXPubPayClient; -import cn.iocoder.yudao.framework.pay.core.enums.PayChannelEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.framework.pay.core.client.PayClient; +import cn.fuxiaoaio.ygg.framework.pay.core.client.dto.PayOrderUnifiedReqDTO; +import cn.fuxiaoaio.ygg.framework.pay.core.client.impl.PayClientFactoryImpl; +import cn.fuxiaoaio.ygg.framework.pay.core.client.impl.alipay.AlipayPayClientConfig; +import cn.fuxiaoaio.ygg.framework.pay.core.client.impl.alipay.AlipayQrPayClient; +import cn.fuxiaoaio.ygg.framework.pay.core.client.impl.alipay.AlipayWapPayClient; +import cn.fuxiaoaio.ygg.framework.pay.core.client.impl.wx.WXPayClientConfig; +import cn.fuxiaoaio.ygg.framework.pay.core.client.impl.wx.WXPubPayClient; +import cn.fuxiaoaio.ygg.framework.pay.core.enums.PayChannelEnum; import com.alipay.api.response.AlipayTradePrecreateResponse; import org.junit.jupiter.api.Test; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn.iocoder.yudao.framework.pay.core.client.impl/alipay/AlipayQrPayClientTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/test/java/cn.iocoder.fuxiaoaio.framework.pay.core.client.impl/alipay/AlipayQrPayClientTest.java similarity index 93% rename from yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn.iocoder.yudao.framework.pay.core.client.impl/alipay/AlipayQrPayClientTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/test/java/cn.iocoder.fuxiaoaio.framework.pay.core.client.impl/alipay/AlipayQrPayClientTest.java index 6267ee614..314c19395 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn.iocoder.yudao.framework.pay.core.client.impl/alipay/AlipayQrPayClientTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-pay/src/test/java/cn.iocoder.fuxiaoaio.framework.pay.core.client.impl/alipay/AlipayQrPayClientTest.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.framework.pay.core.client.impl.alipay; +package cn.fuxiaoaio.ygg.framework.pay.core.client.impl.alipay; import cn.hutool.core.util.ReflectUtil; -import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.yudao.framework.pay.core.client.PayCommonResult; -import cn.iocoder.yudao.framework.pay.core.client.dto.PayOrderUnifiedReqDTO; -import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; +import cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.pay.core.client.PayCommonResult; +import cn.fuxiaoaio.ygg.framework.pay.core.client.dto.PayOrderUnifiedReqDTO; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseMockitoUnitTest; import com.alipay.api.AlipayApiException; import com.alipay.api.DefaultAlipayClient; import com.alipay.api.request.AlipayTradePrecreateRequest; @@ -14,7 +14,7 @@ import org.mockito.ArgumentMatcher; import org.mockito.InjectMocks; 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.junit.jupiter.api.Assertions.assertNotSame; import static org.mockito.ArgumentMatchers.argThat; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/pom.xml similarity index 86% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/pom.xml index 9d0d15662..643f0457b 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/pom.xml @@ -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"> - cn.iocoder.cloud - yudao-framework + cn.fuxiaoaio.ygg + fuxiaoaio-framework ${revision} 4.0.0 - yudao-spring-boot-starter-biz-sms + fuxiaoaio-spring-boot-starter-biz-sms jar ${project.artifactId} @@ -17,8 +17,8 @@ - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common @@ -35,8 +35,8 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-test + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-test test diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/config/YudaoSmsAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/config/FuxiaoaioSmsAutoConfiguration.java similarity index 59% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/config/YudaoSmsAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/config/FuxiaoaioSmsAutoConfiguration.java index 9873c80d5..a8d86a0ce 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/config/YudaoSmsAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/config/FuxiaoaioSmsAutoConfiguration.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.sms.config; +package cn.fuxiaoaio.ygg.framework.sms.config; -import cn.iocoder.yudao.framework.sms.core.client.SmsClientFactory; -import cn.iocoder.yudao.framework.sms.core.client.impl.SmsClientFactoryImpl; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsClientFactory; +import cn.fuxiaoaio.ygg.framework.sms.core.client.impl.SmsClientFactoryImpl; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; @@ -11,7 +11,7 @@ import org.springframework.context.annotation.Bean; * @author 芋道源码 */ @AutoConfiguration -public class YudaoSmsAutoConfiguration { +public class FuxiaoaioSmsAutoConfiguration { @Bean public SmsClientFactory smsClientFactory() { diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/SmsClient.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/SmsClient.java similarity index 81% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/SmsClient.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/SmsClient.java index 7411c9cd0..f21565f9d 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/SmsClient.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/SmsClient.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.framework.sms.core.client; +package cn.fuxiaoaio.ygg.framework.sms.core.client; -import cn.iocoder.yudao.framework.common.core.KeyValue; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsReceiveRespDTO; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO; +import cn.fuxiaoaio.ygg.framework.common.core.KeyValue; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsReceiveRespDTO; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsSendRespDTO; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsTemplateRespDTO; import java.util.List; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/SmsClientFactory.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/SmsClientFactory.java similarity index 84% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/SmsClientFactory.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/SmsClientFactory.java index d063e58f3..120b7c067 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/SmsClientFactory.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/SmsClientFactory.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.sms.core.client; +package cn.fuxiaoaio.ygg.framework.sms.core.client; -import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties; +import cn.fuxiaoaio.ygg.framework.sms.core.property.SmsChannelProperties; /** * 短信客户端的工厂接口 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/SmsCodeMapping.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/SmsCodeMapping.java similarity index 61% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/SmsCodeMapping.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/SmsCodeMapping.java index 826306fde..b4cd3ea5d 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/SmsCodeMapping.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/SmsCodeMapping.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.sms.core.client; +package cn.fuxiaoaio.ygg.framework.sms.core.client; -import cn.iocoder.yudao.framework.common.exception.ErrorCode; -import cn.iocoder.yudao.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.common.exception.ErrorCode; +import cn.fuxiaoaio.ygg.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; import java.util.function.Function; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/SmsCommonResult.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/SmsCommonResult.java similarity index 89% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/SmsCommonResult.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/SmsCommonResult.java index d314de2cd..e09fbe855 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/SmsCommonResult.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/SmsCommonResult.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.framework.sms.core.client; +package cn.fuxiaoaio.ygg.framework.sms.core.client; import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.lang.Assert; -import cn.iocoder.yudao.framework.common.exception.ErrorCode; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.common.exception.ErrorCode; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/dto/SmsReceiveRespDTO.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/dto/SmsReceiveRespDTO.java similarity index 92% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/dto/SmsReceiveRespDTO.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/dto/SmsReceiveRespDTO.java index 4def4a25c..f9ddfe2e5 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/dto/SmsReceiveRespDTO.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/dto/SmsReceiveRespDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.sms.core.client.dto; +package cn.fuxiaoaio.ygg.framework.sms.core.client.dto; import lombok.Data; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/dto/SmsSendRespDTO.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/dto/SmsSendRespDTO.java similarity index 79% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/dto/SmsSendRespDTO.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/dto/SmsSendRespDTO.java index 9d320d57b..15fb3b6cc 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/dto/SmsSendRespDTO.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/dto/SmsSendRespDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.sms.core.client.dto; +package cn.fuxiaoaio.ygg.framework.sms.core.client.dto; import lombok.Data; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/dto/SmsTemplateRespDTO.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/dto/SmsTemplateRespDTO.java similarity index 79% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/dto/SmsTemplateRespDTO.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/dto/SmsTemplateRespDTO.java index 70e8df400..9ae4474f9 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/dto/SmsTemplateRespDTO.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/dto/SmsTemplateRespDTO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.sms.core.client.dto; +package cn.fuxiaoaio.ygg.framework.sms.core.client.dto; -import cn.iocoder.yudao.framework.sms.core.enums.SmsTemplateAuditStatusEnum; +import cn.fuxiaoaio.ygg.framework.sms.core.enums.SmsTemplateAuditStatusEnum; import lombok.Data; /** diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/AbstractSmsClient.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/AbstractSmsClient.java similarity index 87% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/AbstractSmsClient.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/AbstractSmsClient.java index 492c02327..e4e648275 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/AbstractSmsClient.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/AbstractSmsClient.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.framework.sms.core.client.impl; +package cn.fuxiaoaio.ygg.framework.sms.core.client.impl; -import cn.iocoder.yudao.framework.common.core.KeyValue; -import cn.iocoder.yudao.framework.sms.core.client.SmsClient; -import cn.iocoder.yudao.framework.sms.core.client.SmsCodeMapping; -import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsReceiveRespDTO; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO; -import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties; +import cn.fuxiaoaio.ygg.framework.common.core.KeyValue; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsClient; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsCodeMapping; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsCommonResult; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsReceiveRespDTO; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsSendRespDTO; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsTemplateRespDTO; +import cn.fuxiaoaio.ygg.framework.sms.core.property.SmsChannelProperties; import lombok.extern.slf4j.Slf4j; import java.util.List; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/SmsClientFactoryImpl.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/SmsClientFactoryImpl.java similarity index 86% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/SmsClientFactoryImpl.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/SmsClientFactoryImpl.java index abb7dda1b..07dce4821 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/SmsClientFactoryImpl.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/SmsClientFactoryImpl.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.framework.sms.core.client.impl; +package cn.fuxiaoaio.ygg.framework.sms.core.client.impl; -import cn.iocoder.yudao.framework.sms.core.client.SmsClient; -import cn.iocoder.yudao.framework.sms.core.client.SmsClientFactory; -import cn.iocoder.yudao.framework.sms.core.client.impl.aliyun.AliyunSmsClient; -import cn.iocoder.yudao.framework.sms.core.client.impl.debug.DebugDingTalkSmsClient; -import cn.iocoder.yudao.framework.sms.core.client.impl.tencent.TencentSmsClient; -import cn.iocoder.yudao.framework.sms.core.enums.SmsChannelEnum; -import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsClient; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsClientFactory; +import cn.fuxiaoaio.ygg.framework.sms.core.client.impl.aliyun.AliyunSmsClient; +import cn.fuxiaoaio.ygg.framework.sms.core.client.impl.debug.DebugDingTalkSmsClient; +import cn.fuxiaoaio.ygg.framework.sms.core.client.impl.tencent.TencentSmsClient; +import cn.fuxiaoaio.ygg.framework.sms.core.enums.SmsChannelEnum; +import cn.fuxiaoaio.ygg.framework.sms.core.property.SmsChannelProperties; import lombok.extern.slf4j.Slf4j; import org.springframework.util.Assert; import org.springframework.validation.annotation.Validated; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java similarity index 90% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java index 59723c4c9..b22202efb 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java @@ -1,18 +1,18 @@ -package cn.iocoder.yudao.framework.sms.core.client.impl.aliyun; +package cn.fuxiaoaio.ygg.framework.sms.core.client.impl.aliyun; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.core.KeyValue; -import cn.iocoder.yudao.framework.common.util.collection.MapUtils; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; -import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsReceiveRespDTO; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO; -import cn.iocoder.yudao.framework.sms.core.client.impl.AbstractSmsClient; -import cn.iocoder.yudao.framework.sms.core.enums.SmsTemplateAuditStatusEnum; -import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties; +import cn.fuxiaoaio.ygg.framework.common.core.KeyValue; +import cn.fuxiaoaio.ygg.framework.common.util.collection.MapUtils; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsCommonResult; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsReceiveRespDTO; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsSendRespDTO; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsTemplateRespDTO; +import cn.fuxiaoaio.ygg.framework.sms.core.client.impl.AbstractSmsClient; +import cn.fuxiaoaio.ygg.framework.sms.core.enums.SmsTemplateAuditStatusEnum; +import cn.fuxiaoaio.ygg.framework.sms.core.property.SmsChannelProperties; import com.aliyuncs.AcsRequest; import com.aliyuncs.AcsResponse; import com.aliyuncs.DefaultAcsClient; @@ -34,8 +34,8 @@ import java.util.Objects; import java.util.function.Function; import java.util.stream.Collectors; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT; /** * 阿里短信客户端的实现类 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java similarity index 85% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java index fd188d9b2..641a4e766 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.framework.sms.core.client.impl.aliyun; +package cn.fuxiaoaio.ygg.framework.sms.core.client.impl.aliyun; -import cn.iocoder.yudao.framework.common.exception.ErrorCode; -import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.yudao.framework.sms.core.client.SmsCodeMapping; -import cn.iocoder.yudao.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.common.exception.ErrorCode; +import cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsCodeMapping; +import cn.fuxiaoaio.ygg.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; /** * 阿里云的 SmsCodeMapping 实现类 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java similarity index 55% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java index 0a7e48bfc..d4bfd5e3e 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.framework.sms.core.client.impl.debug; +package cn.fuxiaoaio.ygg.framework.sms.core.client.impl.debug; -import cn.iocoder.yudao.framework.common.exception.ErrorCode; -import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.yudao.framework.sms.core.client.SmsCodeMapping; -import cn.iocoder.yudao.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.common.exception.ErrorCode; +import cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsCodeMapping; +import cn.fuxiaoaio.ygg.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; import java.util.Objects; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java similarity index 83% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java index cedcfb6dc..904cc0b42 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.sms.core.client.impl.debug; +package cn.fuxiaoaio.ygg.framework.sms.core.client.impl.debug; import cn.hutool.core.codec.Base64; import cn.hutool.core.lang.Assert; @@ -7,16 +7,16 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.digest.DigestUtil; import cn.hutool.crypto.digest.HmacAlgorithm; import cn.hutool.http.HttpUtil; -import cn.iocoder.yudao.framework.common.core.KeyValue; -import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsReceiveRespDTO; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO; -import cn.iocoder.yudao.framework.sms.core.client.impl.AbstractSmsClient; -import cn.iocoder.yudao.framework.sms.core.enums.SmsTemplateAuditStatusEnum; -import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties; -import cn.iocoder.yudao.framework.common.util.collection.MapUtils; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.framework.common.core.KeyValue; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsCommonResult; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsReceiveRespDTO; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsSendRespDTO; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsTemplateRespDTO; +import cn.fuxiaoaio.ygg.framework.sms.core.client.impl.AbstractSmsClient; +import cn.fuxiaoaio.ygg.framework.sms.core.enums.SmsTemplateAuditStatusEnum; +import cn.fuxiaoaio.ygg.framework.sms.core.property.SmsChannelProperties; +import cn.fuxiaoaio.ygg.framework.common.util.collection.MapUtils; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; import java.util.HashMap; import java.util.List; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/tencent/TencentSmsChannelProperties.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/tencent/TencentSmsChannelProperties.java similarity index 92% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/tencent/TencentSmsChannelProperties.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/tencent/TencentSmsChannelProperties.java index 6b539c602..ee63b595f 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/tencent/TencentSmsChannelProperties.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/tencent/TencentSmsChannelProperties.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.sms.core.client.impl.tencent; +package cn.fuxiaoaio.ygg.framework.sms.core.client.impl.tencent; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; -import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties; +import cn.fuxiaoaio.ygg.framework.sms.core.property.SmsChannelProperties; import lombok.Data; /** diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/tencent/TencentSmsClient.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/tencent/TencentSmsClient.java similarity index 92% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/tencent/TencentSmsClient.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/tencent/TencentSmsClient.java index 743c1aed8..dfd042916 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/tencent/TencentSmsClient.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/tencent/TencentSmsClient.java @@ -1,18 +1,18 @@ -package cn.iocoder.yudao.framework.sms.core.client.impl.tencent; +package cn.fuxiaoaio.ygg.framework.sms.core.client.impl.tencent; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.core.KeyValue; -import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; -import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsReceiveRespDTO; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO; -import cn.iocoder.yudao.framework.sms.core.client.impl.AbstractSmsClient; -import cn.iocoder.yudao.framework.sms.core.enums.SmsTemplateAuditStatusEnum; -import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties; +import cn.fuxiaoaio.ygg.framework.common.core.KeyValue; +import cn.fuxiaoaio.ygg.framework.common.util.collection.ArrayUtils; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsCommonResult; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsReceiveRespDTO; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsSendRespDTO; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsTemplateRespDTO; +import cn.fuxiaoaio.ygg.framework.sms.core.client.impl.AbstractSmsClient; +import cn.fuxiaoaio.ygg.framework.sms.core.enums.SmsTemplateAuditStatusEnum; +import cn.fuxiaoaio.ygg.framework.sms.core.property.SmsChannelProperties; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.annotations.VisibleForTesting; @@ -27,8 +27,8 @@ import java.util.List; import java.util.function.Function; import java.util.function.Supplier; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT; /** * 腾讯云短信功能实现 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/tencent/TencentSmsCodeMapping.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/tencent/TencentSmsCodeMapping.java similarity index 86% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/tencent/TencentSmsCodeMapping.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/tencent/TencentSmsCodeMapping.java index 05ad355ef..16f8b05f1 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/client/impl/tencent/TencentSmsCodeMapping.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/tencent/TencentSmsCodeMapping.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.framework.sms.core.client.impl.tencent; +package cn.fuxiaoaio.ygg.framework.sms.core.client.impl.tencent; -import cn.iocoder.yudao.framework.common.exception.ErrorCode; -import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.yudao.framework.sms.core.client.SmsCodeMapping; -import cn.iocoder.yudao.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.common.exception.ErrorCode; +import cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsCodeMapping; +import cn.fuxiaoaio.ygg.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; -import static cn.iocoder.yudao.framework.sms.core.enums.SmsFrameworkErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.sms.core.enums.SmsFrameworkErrorCodeConstants.*; /** * 腾讯云的 SmsCodeMapping 实现类 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/enums/SmsChannelEnum.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/enums/SmsChannelEnum.java similarity index 92% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/enums/SmsChannelEnum.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/enums/SmsChannelEnum.java index 66410bd2c..3deabdab6 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/enums/SmsChannelEnum.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/enums/SmsChannelEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.sms.core.enums; +package cn.fuxiaoaio.ygg.framework.sms.core.enums; import cn.hutool.core.util.ArrayUtil; import lombok.AllArgsConstructor; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java similarity index 95% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java index 852f4e29b..a292b2a1d 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.sms.core.enums; +package cn.fuxiaoaio.ygg.framework.sms.core.enums; -import cn.iocoder.yudao.framework.common.exception.ErrorCode; +import cn.fuxiaoaio.ygg.framework.common.exception.ErrorCode; /** * 短信框架的错误码枚举 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java similarity index 84% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java index 255565002..add59f6c2 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.sms.core.enums; +package cn.fuxiaoaio.ygg.framework.sms.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/property/SmsChannelProperties.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/property/SmsChannelProperties.java similarity index 89% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/property/SmsChannelProperties.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/property/SmsChannelProperties.java index 943184b03..adb3b4b28 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/core/property/SmsChannelProperties.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/java/cn/fuxiaoaio/ygg/framework/sms/core/property/SmsChannelProperties.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.sms.core.property; +package cn.fuxiaoaio.ygg.framework.sms.core.property; -import cn.iocoder.yudao.framework.sms.core.enums.SmsChannelEnum; +import cn.fuxiaoaio.ygg.framework.sms.core.enums.SmsChannelEnum; import lombok.Data; import org.springframework.validation.annotation.Validated; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..9a520edb3 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +cn.fuxiaoaio.ygg.framework.sms.config.FuxiaoaioSmsAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/test-integration/java/cn/iocoder/yudao/framework/sms/core/client/impl/aliyun/AliyunSmsClientIntegrationTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/test-integration/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/aliyun/AliyunSmsClientIntegrationTest.java similarity index 75% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/test-integration/java/cn/iocoder/yudao/framework/sms/core/client/impl/aliyun/AliyunSmsClientIntegrationTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/test-integration/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/aliyun/AliyunSmsClientIntegrationTest.java index 36f9dec82..8533e059d 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/test-integration/java/cn/iocoder/yudao/framework/sms/core/client/impl/aliyun/AliyunSmsClientIntegrationTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/test-integration/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/aliyun/AliyunSmsClientIntegrationTest.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.framework.sms.core.client.impl.aliyun; +package cn.fuxiaoaio.ygg.framework.sms.core.client.impl.aliyun; -import cn.iocoder.yudao.framework.common.core.KeyValue; -import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO; -import cn.iocoder.yudao.framework.sms.core.client.impl.aliyun.AliyunSmsClient; -import cn.iocoder.yudao.framework.sms.core.enums.SmsChannelEnum; -import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties; +import cn.fuxiaoaio.ygg.framework.common.core.KeyValue; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsCommonResult; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsSendRespDTO; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsTemplateRespDTO; +import cn.fuxiaoaio.ygg.framework.sms.core.client.impl.aliyun.AliyunSmsClient; +import cn.fuxiaoaio.ygg.framework.sms.core.enums.SmsChannelEnum; +import cn.fuxiaoaio.ygg.framework.sms.core.property.SmsChannelProperties; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/test-integration/java/cn/iocoder/yudao/framework/sms/core/client/impl/debug/DebugDingTalkSmsClientIntegrationTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/test-integration/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/debug/DebugDingTalkSmsClientIntegrationTest.java similarity index 76% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/test-integration/java/cn/iocoder/yudao/framework/sms/core/client/impl/debug/DebugDingTalkSmsClientIntegrationTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/test-integration/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/debug/DebugDingTalkSmsClientIntegrationTest.java index 47de977cb..5a9a9f58c 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/test-integration/java/cn/iocoder/yudao/framework/sms/core/client/impl/debug/DebugDingTalkSmsClientIntegrationTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/test-integration/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/debug/DebugDingTalkSmsClientIntegrationTest.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.framework.sms.core.client.impl.debug; +package cn.fuxiaoaio.ygg.framework.sms.core.client.impl.debug; -import cn.iocoder.yudao.framework.common.core.KeyValue; -import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO; -import cn.iocoder.yudao.framework.sms.core.client.impl.debug.DebugDingTalkSmsClient; -import cn.iocoder.yudao.framework.sms.core.enums.SmsChannelEnum; -import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties; +import cn.fuxiaoaio.ygg.framework.common.core.KeyValue; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsCommonResult; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsSendRespDTO; +import cn.fuxiaoaio.ygg.framework.sms.core.client.impl.debug.DebugDingTalkSmsClient; +import cn.fuxiaoaio.ygg.framework.sms.core.enums.SmsChannelEnum; +import cn.fuxiaoaio.ygg.framework.sms.core.property.SmsChannelProperties; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/yudao/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/test/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java similarity index 91% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/yudao/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/test/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java index 4b02c5121..fdbf9082f 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/yudao/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/test/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java @@ -1,17 +1,17 @@ -package cn.iocoder.yudao.framework.sms.core.client.impl.aliyun; +package cn.fuxiaoaio.ygg.framework.sms.core.client.impl.aliyun; import cn.hutool.core.util.ReflectUtil; -import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; -import cn.iocoder.yudao.framework.common.core.KeyValue; -import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsReceiveRespDTO; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO; -import cn.iocoder.yudao.framework.sms.core.enums.SmsTemplateAuditStatusEnum; -import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties; -import cn.iocoder.yudao.framework.common.util.collection.MapUtils; -import cn.iocoder.yudao.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseMockitoUnitTest; +import cn.fuxiaoaio.ygg.framework.common.core.KeyValue; +import cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsCommonResult; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsReceiveRespDTO; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsSendRespDTO; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsTemplateRespDTO; +import cn.fuxiaoaio.ygg.framework.sms.core.enums.SmsTemplateAuditStatusEnum; +import cn.fuxiaoaio.ygg.framework.sms.core.property.SmsChannelProperties; +import cn.fuxiaoaio.ygg.framework.common.util.collection.MapUtils; +import cn.fuxiaoaio.ygg.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; import com.aliyuncs.AcsRequest; import com.aliyuncs.IAcsClient; import com.aliyuncs.dysmsapi.model.v20170525.QuerySmsTemplateRequest; @@ -30,8 +30,8 @@ import java.time.LocalDateTime; import java.util.List; import java.util.function.Function; -import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils.toJsonString; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/yudao/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/test/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java similarity index 90% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/yudao/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/test/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java index ef8901daf..ed6c831ca 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/yudao/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/test/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.sms.core.client.impl.aliyun; +package cn.fuxiaoaio.ygg.framework.sms.core.client.impl.aliyun; -import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; -import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.yudao.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseMockitoUnitTest; +import cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/yudao/framework/sms/core/client/impl/tencent/TencentSmsClientTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/test/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/tencent/TencentSmsClientTest.java similarity index 90% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/yudao/framework/sms/core/client/impl/tencent/TencentSmsClientTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/test/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/tencent/TencentSmsClientTest.java index 9269de724..f605fee9c 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/yudao/framework/sms/core/client/impl/tencent/TencentSmsClientTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/test/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/tencent/TencentSmsClientTest.java @@ -1,19 +1,19 @@ -package cn.iocoder.yudao.framework.sms.core.client.impl.tencent; +package cn.fuxiaoaio.ygg.framework.sms.core.client.impl.tencent; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.core.KeyValue; -import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils; -import cn.iocoder.yudao.framework.common.util.collection.MapUtils; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; -import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsReceiveRespDTO; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO; -import cn.iocoder.yudao.framework.sms.core.enums.SmsTemplateAuditStatusEnum; -import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties; -import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; +import cn.fuxiaoaio.ygg.framework.common.core.KeyValue; +import cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.common.util.collection.ArrayUtils; +import cn.fuxiaoaio.ygg.framework.common.util.collection.MapUtils; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsCommonResult; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsReceiveRespDTO; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsSendRespDTO; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsTemplateRespDTO; +import cn.fuxiaoaio.ygg.framework.sms.core.enums.SmsTemplateAuditStatusEnum; +import cn.fuxiaoaio.ygg.framework.sms.core.property.SmsChannelProperties; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseMockitoUnitTest; import com.google.common.collect.Lists; import com.tencentcloudapi.sms.v20210111.SmsClient; import com.tencentcloudapi.sms.v20210111.models.DescribeSmsTemplateListResponse; @@ -28,8 +28,8 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; -import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils.toJsonString; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.argThat; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/yudao/framework/sms/core/client/impl/tencent/TencentSmsCodeMappingTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/test/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/tencent/TencentSmsCodeMappingTest.java similarity index 93% rename from yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/yudao/framework/sms/core/client/impl/tencent/TencentSmsCodeMappingTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/test/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/tencent/TencentSmsCodeMappingTest.java index ebcdaf18a..079051a9c 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/yudao/framework/sms/core/client/impl/tencent/TencentSmsCodeMappingTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-sms/src/test/java/cn/fuxiaoaio/ygg/framework/sms/core/client/impl/tencent/TencentSmsCodeMappingTest.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.sms.core.client.impl.tencent; +package cn.fuxiaoaio.ygg.framework.sms.core.client.impl.tencent; -import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.yudao.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; -import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; +import cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseMockitoUnitTest; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-social/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-social/pom.xml similarity index 71% rename from yudao-framework/yudao-spring-boot-starter-biz-social/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-social/pom.xml index 61537e146..6d910544f 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-social/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-social/pom.xml @@ -3,20 +3,20 @@ 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"> - cn.iocoder.cloud - yudao-framework + cn.fuxiaoaio.ygg + fuxiaoaio-framework ${revision} jar 4.0.0 - yudao-spring-boot-starter-biz-social + fuxiaoaio-spring-boot-starter-biz-social ${project.artifactId} - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common @@ -25,8 +25,8 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-web + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-web @@ -40,8 +40,8 @@ justauth-spring-boot-starter - cn.iocoder.cloud - yudao-spring-boot-starter-redis + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-redis diff --git a/yudao-framework/yudao-spring-boot-starter-biz-social/src/main/java/cn/iocoder/yudao/framework/social/config/YudaoSocialAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-social/src/main/java/cn/fuxiaoaio/ygg/framework/social/config/FuxiaoaioSocialAutoConfiguration.java similarity index 68% rename from yudao-framework/yudao-spring-boot-starter-biz-social/src/main/java/cn/iocoder/yudao/framework/social/config/YudaoSocialAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-social/src/main/java/cn/fuxiaoaio/ygg/framework/social/config/FuxiaoaioSocialAutoConfiguration.java index a2538132c..c68818fe1 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-social/src/main/java/cn/iocoder/yudao/framework/social/config/YudaoSocialAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-social/src/main/java/cn/fuxiaoaio/ygg/framework/social/config/FuxiaoaioSocialAutoConfiguration.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.social.config; +package cn.fuxiaoaio.ygg.framework.social.config; -import cn.iocoder.yudao.framework.social.core.YudaoAuthRequestFactory; +import cn.fuxiaoaio.ygg.framework.social.core.FuxiaoaioAuthRequestFactory; import com.xkcoding.http.HttpUtil; import com.xkcoding.http.support.hutool.HutoolImpl; import com.xkcoding.justauth.autoconfigure.JustAuthProperties; @@ -20,15 +20,15 @@ import org.springframework.context.annotation.Bean; @AutoConfiguration @EnableConfigurationProperties(JustAuthProperties.class) @Slf4j -public class YudaoSocialAutoConfiguration { +public class FuxiaoaioSocialAutoConfiguration { @Bean @ConditionalOnProperty(prefix = "justauth", value = "enabled", havingValue = "true", matchIfMissing = true) - public YudaoAuthRequestFactory yudaoAuthRequestFactory(JustAuthProperties properties, AuthStateCache authStateCache) { + public FuxiaoaioAuthRequestFactory fuxiaoaioAuthRequestFactory(JustAuthProperties properties, AuthStateCache authStateCache) { // 需要修改 HttpUtil 使用的实现，避免类报错 HttpUtil.setHttp(new HutoolImpl()); - // 创建 YudaoAuthRequestFactory - return new YudaoAuthRequestFactory(properties, authStateCache); + // 创建 FuxiaoaioAuthRequestFactory + return new FuxiaoaioAuthRequestFactory(properties, authStateCache); } } diff --git a/yudao-framework/yudao-spring-boot-starter-biz-social/src/main/java/cn/iocoder/yudao/framework/social/core/YudaoAuthRequestFactory.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-social/src/main/java/cn/fuxiaoaio/ygg/framework/social/core/FuxiaoaioAuthRequestFactory.java similarity index 88% rename from yudao-framework/yudao-spring-boot-starter-biz-social/src/main/java/cn/iocoder/yudao/framework/social/core/YudaoAuthRequestFactory.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-social/src/main/java/cn/fuxiaoaio/ygg/framework/social/core/FuxiaoaioAuthRequestFactory.java index 1d762c35e..1398c75e4 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-social/src/main/java/cn/iocoder/yudao/framework/social/core/YudaoAuthRequestFactory.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-social/src/main/java/cn/fuxiaoaio/ygg/framework/social/core/FuxiaoaioAuthRequestFactory.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.framework.social.core; +package cn.fuxiaoaio.ygg.framework.social.core; import cn.hutool.core.util.EnumUtil; import cn.hutool.core.util.ReflectUtil; -import cn.iocoder.yudao.framework.social.core.enums.AuthExtendSource; -import cn.iocoder.yudao.framework.social.core.request.AuthWeChatMiniProgramRequest; +import cn.fuxiaoaio.ygg.framework.social.core.enums.AuthExtendSource; +import cn.fuxiaoaio.ygg.framework.social.core.request.AuthWeChatMiniProgramRequest; import com.xkcoding.justauth.AuthRequestFactory; import com.xkcoding.justauth.autoconfigure.JustAuthProperties; import me.zhyd.oauth.cache.AuthStateCache; @@ -22,7 +22,7 @@ import java.lang.reflect.Method; * @date 2021-10-31 */ // TODO @timfruit：单测 -public class YudaoAuthRequestFactory extends AuthRequestFactory { +public class FuxiaoaioAuthRequestFactory extends AuthRequestFactory { protected JustAuthProperties properties; protected AuthStateCache authStateCache; @@ -33,7 +33,7 @@ public class YudaoAuthRequestFactory extends AuthRequestFactory { private final Method configureHttpConfigMethod = ReflectUtil.getMethod(AuthRequestFactory.class, "configureHttpConfig", String.class, AuthConfig.class, JustAuthProperties.JustAuthHttpConfig.class); - public YudaoAuthRequestFactory(JustAuthProperties properties, AuthStateCache authStateCache) { + public FuxiaoaioAuthRequestFactory(JustAuthProperties properties, AuthStateCache authStateCache) { super(properties, authStateCache); this.properties = properties; this.authStateCache = authStateCache; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-social/src/main/java/cn/iocoder/yudao/framework/social/core/enums/AuthExtendSource.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-social/src/main/java/cn/fuxiaoaio/ygg/framework/social/core/enums/AuthExtendSource.java similarity index 95% rename from yudao-framework/yudao-spring-boot-starter-biz-social/src/main/java/cn/iocoder/yudao/framework/social/core/enums/AuthExtendSource.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-social/src/main/java/cn/fuxiaoaio/ygg/framework/social/core/enums/AuthExtendSource.java index a4b8a6224..2db22368e 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-social/src/main/java/cn/iocoder/yudao/framework/social/core/enums/AuthExtendSource.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-social/src/main/java/cn/fuxiaoaio/ygg/framework/social/core/enums/AuthExtendSource.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.social.core.enums; +package cn.fuxiaoaio.ygg.framework.social.core.enums; import me.zhyd.oauth.config.AuthSource; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-social/src/main/java/cn/iocoder/yudao/framework/social/core/model/AuthExtendToken.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-social/src/main/java/cn/fuxiaoaio/ygg/framework/social/core/model/AuthExtendToken.java similarity index 86% rename from yudao-framework/yudao-spring-boot-starter-biz-social/src/main/java/cn/iocoder/yudao/framework/social/core/model/AuthExtendToken.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-social/src/main/java/cn/fuxiaoaio/ygg/framework/social/core/model/AuthExtendToken.java index 02df75844..f271d1e8b 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-social/src/main/java/cn/iocoder/yudao/framework/social/core/model/AuthExtendToken.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-social/src/main/java/cn/fuxiaoaio/ygg/framework/social/core/model/AuthExtendToken.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.social.core.model; +package cn.fuxiaoaio.ygg.framework.social.core.model; import lombok.*; import me.zhyd.oauth.model.AuthToken; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-social/src/main/java/cn/iocoder/yudao/framework/social/core/request/AuthWeChatMiniProgramRequest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-social/src/main/java/cn/fuxiaoaio/ygg/framework/social/core/request/AuthWeChatMiniProgramRequest.java similarity index 93% rename from yudao-framework/yudao-spring-boot-starter-biz-social/src/main/java/cn/iocoder/yudao/framework/social/core/request/AuthWeChatMiniProgramRequest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-social/src/main/java/cn/fuxiaoaio/ygg/framework/social/core/request/AuthWeChatMiniProgramRequest.java index 2cd7f9b28..d97f9decf 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-social/src/main/java/cn/iocoder/yudao/framework/social/core/request/AuthWeChatMiniProgramRequest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-social/src/main/java/cn/fuxiaoaio/ygg/framework/social/core/request/AuthWeChatMiniProgramRequest.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.social.core.request; +package cn.fuxiaoaio.ygg.framework.social.core.request; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; -import cn.iocoder.yudao.framework.social.core.enums.AuthExtendSource; -import cn.iocoder.yudao.framework.social.core.model.AuthExtendToken; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.framework.social.core.enums.AuthExtendSource; +import cn.fuxiaoaio.ygg.framework.social.core.model.AuthExtendToken; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import me.zhyd.oauth.cache.AuthStateCache; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..882e9f229 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +cn.fuxiaoaio.ygg.framework.social.config.FuxiaoaioSocialAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/pom.xml similarity index 61% rename from yudao-framework/yudao-spring-boot-starter-biz-tenant/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/pom.xml index 7f74d71d5..605b6921e 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/pom.xml @@ -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"> - yudao-framework - cn.iocoder.cloud + fuxiaoaio-framework + cn.fuxiaoaio.ygg ${revision} 4.0.0 - yudao-spring-boot-starter-biz-tenant + fuxiaoaio-spring-boot-starter-biz-tenant jar ${project.artifactId} @@ -17,45 +17,45 @@ - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common - cn.iocoder.cloud - yudao-spring-boot-starter-security + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-security - cn.iocoder.cloud - yudao-spring-boot-starter-mybatis + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-mybatis - cn.iocoder.cloud - yudao-spring-boot-starter-redis + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-redis - cn.iocoder.cloud - yudao-spring-boot-starter-rpc + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-rpc true - cn.iocoder.cloud - yudao-spring-boot-starter-job + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-job true - cn.iocoder.cloud - yudao-spring-boot-starter-mq + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-mq true diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/config/FuxiaoaioTenantAutoConfiguration.java similarity index 79% rename from yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/config/FuxiaoaioTenantAutoConfiguration.java index fe9adca83..6b4d09aee 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/config/FuxiaoaioTenantAutoConfiguration.java @@ -1,20 +1,20 @@ -package cn.iocoder.yudao.framework.tenant.config; +package cn.fuxiaoaio.ygg.framework.tenant.config; -import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum; -import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils; -import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnoreAspect; -import cn.iocoder.yudao.framework.tenant.core.db.TenantDatabaseInterceptor; -import cn.iocoder.yudao.framework.tenant.core.job.TenantJobAspect; -import cn.iocoder.yudao.framework.tenant.core.mq.TenantChannelInterceptor; -import cn.iocoder.yudao.framework.tenant.core.mq.TenantFunctionAroundWrapper; -import cn.iocoder.yudao.framework.tenant.core.redis.TenantRedisCacheManager; -import cn.iocoder.yudao.framework.tenant.core.security.TenantSecurityWebFilter; -import cn.iocoder.yudao.framework.tenant.core.service.TenantFrameworkService; -import cn.iocoder.yudao.framework.tenant.core.service.TenantFrameworkServiceImpl; -import cn.iocoder.yudao.framework.tenant.core.web.TenantContextWebFilter; -import cn.iocoder.yudao.framework.web.config.WebProperties; -import cn.iocoder.yudao.framework.web.core.handler.GlobalExceptionHandler; -import cn.iocoder.yudao.module.system.api.tenant.TenantApi; +import cn.fuxiaoaio.ygg.framework.common.enums.WebFilterOrderEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.util.MyBatisUtils; +import cn.fuxiaoaio.ygg.framework.tenant.core.aop.TenantIgnoreAspect; +import cn.fuxiaoaio.ygg.framework.tenant.core.db.TenantDatabaseInterceptor; +import cn.fuxiaoaio.ygg.framework.tenant.core.job.TenantJobAspect; +import cn.fuxiaoaio.ygg.framework.tenant.core.mq.TenantChannelInterceptor; +import cn.fuxiaoaio.ygg.framework.tenant.core.mq.TenantFunctionAroundWrapper; +import cn.fuxiaoaio.ygg.framework.tenant.core.redis.TenantRedisCacheManager; +import cn.fuxiaoaio.ygg.framework.tenant.core.security.TenantSecurityWebFilter; +import cn.fuxiaoaio.ygg.framework.tenant.core.service.TenantFrameworkService; +import cn.fuxiaoaio.ygg.framework.tenant.core.service.TenantFrameworkServiceImpl; +import cn.fuxiaoaio.ygg.framework.tenant.core.web.TenantContextWebFilter; +import cn.fuxiaoaio.ygg.framework.web.config.WebProperties; +import cn.fuxiaoaio.ygg.framework.web.core.handler.GlobalExceptionHandler; +import cn.fuxiaoaio.ygg.module.system.api.tenant.TenantApi; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; import com.xxl.job.core.executor.XxlJobExecutor; @@ -39,9 +39,9 @@ import org.springframework.integration.config.GlobalChannelInterceptor; import java.util.Objects; @AutoConfiguration -@ConditionalOnProperty(prefix = "yudao.tenant", value = "enable", matchIfMissing = true) // 允许使用 yudao.tenant.enable=false 禁用多租户 +@ConditionalOnProperty(prefix = "fuxiaoaio.tenant", value = "enable", matchIfMissing = true) // 允许使用 fuxiaoaio.tenant.enable=false 禁用多租户 @EnableConfigurationProperties(TenantProperties.class) -public class YudaoTenantAutoConfiguration { +public class FuxiaoaioTenantAutoConfiguration { @Bean public TenantFrameworkService tenantFrameworkService(TenantApi tenantApi) { diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantMQAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/config/FuxiaoaioTenantMQAutoConfiguration.java similarity index 60% rename from yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantMQAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/config/FuxiaoaioTenantMQAutoConfiguration.java index da0640bcc..b28230768 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantMQAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/config/FuxiaoaioTenantMQAutoConfiguration.java @@ -1,20 +1,20 @@ -package cn.iocoder.yudao.framework.tenant.config; +package cn.fuxiaoaio.ygg.framework.tenant.config; -import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum; -import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils; -import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnoreAspect; -import cn.iocoder.yudao.framework.tenant.core.db.TenantDatabaseInterceptor; -import cn.iocoder.yudao.framework.tenant.core.job.TenantJobAspect; -import cn.iocoder.yudao.framework.tenant.core.mq.TenantChannelInterceptor; -import cn.iocoder.yudao.framework.tenant.core.mq.TenantFunctionAroundWrapper; -import cn.iocoder.yudao.framework.tenant.core.redis.TenantRedisCacheManager; -import cn.iocoder.yudao.framework.tenant.core.security.TenantSecurityWebFilter; -import cn.iocoder.yudao.framework.tenant.core.service.TenantFrameworkService; -import cn.iocoder.yudao.framework.tenant.core.service.TenantFrameworkServiceImpl; -import cn.iocoder.yudao.framework.tenant.core.web.TenantContextWebFilter; -import cn.iocoder.yudao.framework.web.config.WebProperties; -import cn.iocoder.yudao.framework.web.core.handler.GlobalExceptionHandler; -import cn.iocoder.yudao.module.system.api.tenant.TenantApi; +import cn.fuxiaoaio.ygg.framework.common.enums.WebFilterOrderEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.util.MyBatisUtils; +import cn.fuxiaoaio.ygg.framework.tenant.core.aop.TenantIgnoreAspect; +import cn.fuxiaoaio.ygg.framework.tenant.core.db.TenantDatabaseInterceptor; +import cn.fuxiaoaio.ygg.framework.tenant.core.job.TenantJobAspect; +import cn.fuxiaoaio.ygg.framework.tenant.core.mq.TenantChannelInterceptor; +import cn.fuxiaoaio.ygg.framework.tenant.core.mq.TenantFunctionAroundWrapper; +import cn.fuxiaoaio.ygg.framework.tenant.core.redis.TenantRedisCacheManager; +import cn.fuxiaoaio.ygg.framework.tenant.core.security.TenantSecurityWebFilter; +import cn.fuxiaoaio.ygg.framework.tenant.core.service.TenantFrameworkService; +import cn.fuxiaoaio.ygg.framework.tenant.core.service.TenantFrameworkServiceImpl; +import cn.fuxiaoaio.ygg.framework.tenant.core.web.TenantContextWebFilter; +import cn.fuxiaoaio.ygg.framework.web.config.WebProperties; +import cn.fuxiaoaio.ygg.framework.web.core.handler.GlobalExceptionHandler; +import cn.fuxiaoaio.ygg.module.system.api.tenant.TenantApi; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; import org.springframework.boot.autoconfigure.AutoConfiguration; @@ -35,13 +35,13 @@ import org.springframework.integration.config.GlobalChannelInterceptor; import java.util.Objects; @AutoConfiguration -@ConditionalOnProperty(prefix = "yudao.tenant", value = "enable", matchIfMissing = true) // 允许使用 yudao.tenant.enable=false 禁用多租户 +@ConditionalOnProperty(prefix = "fuxiaoaio.tenant", value = "enable", matchIfMissing = true) // 允许使用 fuxiaoaio.tenant.enable=false 禁用多租户 @ConditionalOnClass(name = { "org.springframework.messaging.support.ChannelInterceptor", "org.springframework.cloud.function.context.catalog.FunctionAroundWrapper" }) @EnableConfigurationProperties(TenantProperties.class) -public class YudaoTenantMQAutoConfiguration { +public class FuxiaoaioTenantMQAutoConfiguration { @Bean @GlobalChannelInterceptor // 必须添加在方法上，否则无法生效 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantRpcAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/config/FuxiaoaioTenantRpcAutoConfiguration.java similarity index 60% rename from yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantRpcAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/config/FuxiaoaioTenantRpcAutoConfiguration.java index 71c3806ab..34bc92197 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantRpcAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/config/FuxiaoaioTenantRpcAutoConfiguration.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.tenant.config; +package cn.fuxiaoaio.ygg.framework.tenant.config; -import cn.iocoder.yudao.framework.tenant.core.rpc.TenantRequestInterceptor; -import cn.iocoder.yudao.module.system.api.tenant.TenantApi; +import cn.fuxiaoaio.ygg.framework.tenant.core.rpc.TenantRequestInterceptor; +import cn.fuxiaoaio.ygg.module.system.api.tenant.TenantApi; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cloud.openfeign.EnableFeignClients; @@ -9,9 +9,9 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @AutoConfiguration -@ConditionalOnProperty(prefix = "yudao.tenant", value = "enable", matchIfMissing = true) // 允许使用 yudao.tenant.enable=false 禁用多租户 +@ConditionalOnProperty(prefix = "fuxiaoaio.tenant", value = "enable", matchIfMissing = true) // 允许使用 fuxiaoaio.tenant.enable=false 禁用多租户 @EnableFeignClients(clients = TenantApi.class) // 主要是引入相关的 API 服务 -public class YudaoTenantRpcAutoConfiguration { +public class FuxiaoaioTenantRpcAutoConfiguration { @Bean public TenantRequestInterceptor tenantRequestInterceptor() { diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/TenantProperties.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/config/TenantProperties.java similarity index 90% rename from yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/TenantProperties.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/config/TenantProperties.java index 7cb813ca9..33f2aa65b 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/TenantProperties.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/config/TenantProperties.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.tenant.config; +package cn.fuxiaoaio.ygg.framework.tenant.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -11,7 +11,7 @@ import java.util.Set; * * @author 芋道源码 */ -@ConfigurationProperties(prefix = "yudao.tenant") +@ConfigurationProperties(prefix = "fuxiaoaio.tenant") @Data public class TenantProperties { diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/aop/TenantIgnore.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/aop/TenantIgnore.java similarity index 91% rename from yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/aop/TenantIgnore.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/aop/TenantIgnore.java index f2fec502b..7efccdace 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/aop/TenantIgnore.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/aop/TenantIgnore.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.tenant.core.aop; +package cn.fuxiaoaio.ygg.framework.tenant.core.aop; import java.lang.annotation.*; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/aop/TenantIgnoreAspect.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/aop/TenantIgnoreAspect.java similarity index 85% rename from yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/aop/TenantIgnoreAspect.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/aop/TenantIgnoreAspect.java index b7d0fa362..573f18dd8 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/aop/TenantIgnoreAspect.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/aop/TenantIgnoreAspect.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.tenant.core.aop; +package cn.fuxiaoaio.ygg.framework.tenant.core.aop; -import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; -import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils; +import cn.fuxiaoaio.ygg.framework.tenant.core.context.TenantContextHolder; +import cn.fuxiaoaio.ygg.framework.tenant.core.util.TenantUtils; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/context/TenantContextHolder.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/context/TenantContextHolder.java similarity index 92% rename from yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/context/TenantContextHolder.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/context/TenantContextHolder.java index 3b15398d6..caa1ea758 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/context/TenantContextHolder.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/context/TenantContextHolder.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.tenant.core.context; +package cn.fuxiaoaio.ygg.framework.tenant.core.context; -import cn.iocoder.yudao.framework.common.enums.DocumentEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.DocumentEnum; import com.alibaba.ttl.TransmittableThreadLocal; /** diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/db/TenantBaseDO.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/db/TenantBaseDO.java similarity index 71% rename from yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/db/TenantBaseDO.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/db/TenantBaseDO.java index f4f0ea50a..37a6be3ee 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/db/TenantBaseDO.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/db/TenantBaseDO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.tenant.core.db; +package cn.fuxiaoaio.ygg.framework.tenant.core.db; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/db/TenantDatabaseInterceptor.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/db/TenantDatabaseInterceptor.java similarity index 88% rename from yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/db/TenantDatabaseInterceptor.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/db/TenantDatabaseInterceptor.java index 8ea1a96b8..0c1268274 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/db/TenantDatabaseInterceptor.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/db/TenantDatabaseInterceptor.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.tenant.core.db; +package cn.fuxiaoaio.ygg.framework.tenant.core.db; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.yudao.framework.tenant.config.TenantProperties; -import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; +import cn.fuxiaoaio.ygg.framework.tenant.config.TenantProperties; +import cn.fuxiaoaio.ygg.framework.tenant.core.context.TenantContextHolder; import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.LongValue; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/job/TenantJob.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/job/TenantJob.java similarity index 84% rename from yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/job/TenantJob.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/job/TenantJob.java index fd2ecada9..afa0436e3 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/job/TenantJob.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/job/TenantJob.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.tenant.core.job; +package cn.fuxiaoaio.ygg.framework.tenant.core.job; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/job/TenantJobAspect.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/job/TenantJobAspect.java similarity index 92% rename from yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/job/TenantJobAspect.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/job/TenantJobAspect.java index d3d0a1ac6..89075afa4 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/job/TenantJobAspect.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/job/TenantJobAspect.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.framework.tenant.core.job; +package cn.fuxiaoaio.ygg.framework.tenant.core.job; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; -import cn.iocoder.yudao.framework.tenant.core.service.TenantFrameworkService; -import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.framework.tenant.core.service.TenantFrameworkService; +import cn.fuxiaoaio.ygg.framework.tenant.core.util.TenantUtils; import com.xxl.job.core.context.XxlJobHelper; import com.xxl.job.core.handler.annotation.XxlJob; import lombok.RequiredArgsConstructor; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/mq/TenantChannelInterceptor.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/mq/TenantChannelInterceptor.java similarity index 83% rename from yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/mq/TenantChannelInterceptor.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/mq/TenantChannelInterceptor.java index 4eb471f52..80520c1be 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/mq/TenantChannelInterceptor.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/mq/TenantChannelInterceptor.java @@ -1,14 +1,14 @@ -package cn.iocoder.yudao.framework.tenant.core.mq; +package cn.fuxiaoaio.ygg.framework.tenant.core.mq; import cn.hutool.core.util.ReflectUtil; -import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; +import cn.fuxiaoaio.ygg.framework.tenant.core.context.TenantContextHolder; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.ChannelInterceptor; import java.util.Map; -import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.HEADER_TENANT_ID; +import static cn.fuxiaoaio.ygg.framework.web.core.util.WebFrameworkUtils.HEADER_TENANT_ID; /** * 多租户的 {@link ChannelInterceptor} 实现类 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/mq/TenantFunctionAroundWrapper.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/mq/TenantFunctionAroundWrapper.java similarity index 86% rename from yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/mq/TenantFunctionAroundWrapper.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/mq/TenantFunctionAroundWrapper.java index e1db0be9b..6d29db74b 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/mq/TenantFunctionAroundWrapper.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/mq/TenantFunctionAroundWrapper.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.framework.tenant.core.mq; +package cn.fuxiaoaio.ygg.framework.tenant.core.mq; import cn.hutool.core.map.MapUtil; -import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils; +import cn.fuxiaoaio.ygg.framework.tenant.core.util.TenantUtils; import org.springframework.cloud.function.context.catalog.FunctionAroundWrapper; import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry; import org.springframework.messaging.Message; -import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.HEADER_TENANT_ID; +import static cn.fuxiaoaio.ygg.framework.web.core.util.WebFrameworkUtils.HEADER_TENANT_ID; /** * 多租户 FunctionAroundWrapper 实现类 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/redis/TenantRedisCacheManager.java similarity index 90% rename from yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/redis/TenantRedisCacheManager.java index 8058b2f54..38a2d0061 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/redis/TenantRedisCacheManager.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.tenant.core.redis; +package cn.fuxiaoaio.ygg.framework.tenant.core.redis; -import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; +import cn.fuxiaoaio.ygg.framework.tenant.core.context.TenantContextHolder; import lombok.extern.slf4j.Slf4j; import org.springframework.cache.Cache; import org.springframework.data.redis.cache.RedisCacheConfiguration; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisKeyDefine.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/redis/TenantRedisKeyDefine.java similarity index 90% rename from yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisKeyDefine.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/redis/TenantRedisKeyDefine.java index c78ae44ec..0780f2c42 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisKeyDefine.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/redis/TenantRedisKeyDefine.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.tenant.core.redis; +package cn.fuxiaoaio.ygg.framework.tenant.core.redis; import cn.hutool.core.util.ArrayUtil; -import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine; -import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; +import cn.fuxiaoaio.ygg.framework.redis.core.RedisKeyDefine; +import cn.fuxiaoaio.ygg.framework.tenant.core.context.TenantContextHolder; import java.time.Duration; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/rpc/TenantRequestInterceptor.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/rpc/TenantRequestInterceptor.java similarity index 71% rename from yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/rpc/TenantRequestInterceptor.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/rpc/TenantRequestInterceptor.java index ac82fb9f1..464d19632 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/rpc/TenantRequestInterceptor.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/rpc/TenantRequestInterceptor.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.framework.tenant.core.rpc; +package cn.fuxiaoaio.ygg.framework.tenant.core.rpc; -import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; -import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; +import cn.fuxiaoaio.ygg.framework.tenant.core.context.TenantContextHolder; +import cn.fuxiaoaio.ygg.framework.web.core.util.WebFrameworkUtils; import feign.RequestInterceptor; import feign.RequestTemplate; -import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.HEADER_TENANT_ID; +import static cn.fuxiaoaio.ygg.framework.web.core.util.WebFrameworkUtils.HEADER_TENANT_ID; /** * Tenant 的 RequestInterceptor 实现类：Feign 请求时，将 {@link TenantContextHolder} 设置到 header 中，继续透传给被调用的服务 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/security/TenantSecurityWebFilter.java similarity index 85% rename from yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/security/TenantSecurityWebFilter.java index 27c75eb88..0c369c0b5 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/security/TenantSecurityWebFilter.java @@ -1,20 +1,20 @@ -package cn.iocoder.yudao.framework.tenant.core.security; +package cn.fuxiaoaio.ygg.framework.tenant.core.security; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.enums.RpcConstants; -import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; -import cn.iocoder.yudao.framework.security.core.LoginUser; -import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; -import cn.iocoder.yudao.framework.tenant.config.TenantProperties; -import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; -import cn.iocoder.yudao.framework.tenant.core.service.TenantFrameworkService; -import cn.iocoder.yudao.framework.web.config.WebProperties; -import cn.iocoder.yudao.framework.web.core.filter.ApiRequestFilter; -import cn.iocoder.yudao.framework.web.core.handler.GlobalExceptionHandler; -import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; +import cn.fuxiaoaio.ygg.framework.common.enums.RpcConstants; +import cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.util.servlet.ServletUtils; +import cn.fuxiaoaio.ygg.framework.security.core.LoginUser; +import cn.fuxiaoaio.ygg.framework.security.core.util.SecurityFrameworkUtils; +import cn.fuxiaoaio.ygg.framework.tenant.config.TenantProperties; +import cn.fuxiaoaio.ygg.framework.tenant.core.context.TenantContextHolder; +import cn.fuxiaoaio.ygg.framework.tenant.core.service.TenantFrameworkService; +import cn.fuxiaoaio.ygg.framework.web.config.WebProperties; +import cn.fuxiaoaio.ygg.framework.web.core.filter.ApiRequestFilter; +import cn.fuxiaoaio.ygg.framework.web.core.handler.GlobalExceptionHandler; +import cn.fuxiaoaio.ygg.framework.web.core.util.WebFrameworkUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.util.AntPathMatcher; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/service/TenantFrameworkService.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/service/TenantFrameworkService.java similarity index 87% rename from yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/service/TenantFrameworkService.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/service/TenantFrameworkService.java index 2ca474d0f..612285388 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/service/TenantFrameworkService.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/service/TenantFrameworkService.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.tenant.core.service; +package cn.fuxiaoaio.ygg.framework.tenant.core.service; import java.util.List; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/service/TenantFrameworkServiceImpl.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/service/TenantFrameworkServiceImpl.java similarity index 87% rename from yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/service/TenantFrameworkServiceImpl.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/service/TenantFrameworkServiceImpl.java index 7877ae1e0..49998f88b 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/service/TenantFrameworkServiceImpl.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/service/TenantFrameworkServiceImpl.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.tenant.core.service; +package cn.fuxiaoaio.ygg.framework.tenant.core.service; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.cache.CacheUtils; -import cn.iocoder.yudao.module.system.api.tenant.TenantApi; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.util.cache.CacheUtils; +import cn.fuxiaoaio.ygg.module.system.api.tenant.TenantApi; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import lombok.RequiredArgsConstructor; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/util/TenantUtils.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/util/TenantUtils.java similarity index 94% rename from yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/util/TenantUtils.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/util/TenantUtils.java index 9198b73f1..b3588a8d4 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/util/TenantUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/util/TenantUtils.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.tenant.core.util; +package cn.fuxiaoaio.ygg.framework.tenant.core.util; -import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; +import cn.fuxiaoaio.ygg.framework.tenant.core.context.TenantContextHolder; import java.util.function.Supplier; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/web/TenantContextWebFilter.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/web/TenantContextWebFilter.java similarity index 85% rename from yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/web/TenantContextWebFilter.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/web/TenantContextWebFilter.java index 8e37727d9..4f09c9b19 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/web/TenantContextWebFilter.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/core/web/TenantContextWebFilter.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.tenant.core.web; +package cn.fuxiaoaio.ygg.framework.tenant.core.web; -import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; -import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; +import cn.fuxiaoaio.ygg.framework.tenant.core.context.TenantContextHolder; +import cn.fuxiaoaio.ygg.framework.web.core.util.WebFrameworkUtils; import org.springframework.web.filter.OncePerRequestFilter; import javax.servlet.FilterChain; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/package-info.java similarity index 76% rename from yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/package-info.java index aa22cdb95..005ddfb92 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/java/cn/fuxiaoaio/ygg/framework/tenant/package-info.java @@ -8,10 +8,10 @@ * 6. MQ：在 Producer 发送消息时，Header 带上 tenant-id 租户编号；在 Consumer 消费消息时，将 Header 的 tenant-id 租户编号，添加到租户上下文。 * 7. Async：异步需要保证 ThreadLocal 的传递性，通过使用阿里开源的 TransmittableThreadLocal 实现。相关的改造点，可见： * 1）Spring Async： - * {@link cn.iocoder.yudao.framework.quartz.config.YudaoAsyncAutoConfiguration#threadPoolTaskExecutorBeanPostProcessor()} + * {@link cn.fuxiaoaio.ygg.framework.quartz.config.FuxiaoaioAsyncAutoConfiguration#threadPoolTaskExecutorBeanPostProcessor()} * 2）Spring Security： * TransmittableThreadLocalSecurityContextHolderStrategy - * 和 YudaoSecurityAutoConfiguration#securityContextHolderMethodInvokingFactoryBean() 方法 + * 和 FuxiaoaioSecurityAutoConfiguration#securityContextHolderMethodInvokingFactoryBean() 方法 * */ -package cn.iocoder.yudao.framework.tenant; +package cn.fuxiaoaio.ygg.framework.tenant; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..f6f9d5fc3 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,3 @@ +cn.fuxiaoaio.ygg.framework.tenant.config.FuxiaoaioTenantRpcAutoConfiguration +cn.fuxiaoaio.ygg.framework.tenant.config.FuxiaoaioTenantAutoConfiguration +cn.fuxiaoaio.ygg.framework.tenant.config.FuxiaoaioTenantMQAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/test/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisKeyDefineTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/test/java/cn/fuxiaoaio/ygg/framework/tenant/core/redis/TenantRedisKeyDefineTest.java similarity index 79% rename from yudao-framework/yudao-spring-boot-starter-biz-tenant/src/test/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisKeyDefineTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/test/java/cn/fuxiaoaio/ygg/framework/tenant/core/redis/TenantRedisKeyDefineTest.java index d456e011c..6a7e16753 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/test/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisKeyDefineTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-tenant/src/test/java/cn/fuxiaoaio/ygg/framework/tenant/core/redis/TenantRedisKeyDefineTest.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.tenant.core.redis; +package cn.fuxiaoaio.ygg.framework.tenant.core.redis; -import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine; -import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; +import cn.fuxiaoaio.ygg.framework.redis.core.RedisKeyDefine; +import cn.fuxiaoaio.ygg.framework.tenant.core.context.TenantContextHolder; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-weixin/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-weixin/pom.xml similarity index 75% rename from yudao-framework/yudao-spring-boot-starter-biz-weixin/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-weixin/pom.xml index d58e9104d..3ddbfb13e 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-weixin/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-weixin/pom.xml @@ -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"> - cn.iocoder.cloud - yudao-framework + cn.fuxiaoaio.ygg + fuxiaoaio-framework ${revision} 4.0.0 - yudao-spring-boot-starter-biz-weixin + fuxiaoaio-spring-boot-starter-biz-weixin jar ${project.artifactId} @@ -19,14 +19,14 @@ - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common - cn.iocoder.cloud - yudao-spring-boot-starter-test + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-test test diff --git a/yudao-framework/yudao-spring-boot-starter-biz-weixin/src/main/java/cn/iocoder/yudao/framework/weixin/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-weixin/src/main/java/cn/fuxiaoaio/ygg/framework/weixin/package-info.java similarity index 85% rename from yudao-framework/yudao-spring-boot-starter-biz-weixin/src/main/java/cn/iocoder/yudao/framework/weixin/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-weixin/src/main/java/cn/fuxiaoaio/ygg/framework/weixin/package-info.java index 260476dfb..07e4224f8 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-weixin/src/main/java/cn/iocoder/yudao/framework/weixin/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-weixin/src/main/java/cn/fuxiaoaio/ygg/framework/weixin/package-info.java @@ -3,4 +3,4 @@ * 1. 基于 weixin-java-mp 库，对接微信公众号平台。目前主要解决微信公众号的支付场景。 * 2. 基于 weixin-java-miniapp 库，对接微信小程序。目前主要解决微信小程序的一键登录场景。 */ -package cn.iocoder.yudao.framework.weixin; +package cn.fuxiaoaio.ygg.framework.weixin; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-weixin/src/test-integration/java/cn/iocoder/yudao/framework/weixin/WxMpServiceTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-weixin/src/test-integration/java/cn/fuxiaoaio/ygg/framework/weixin/WxMpServiceTest.java similarity index 95% rename from yudao-framework/yudao-spring-boot-starter-biz-weixin/src/test-integration/java/cn/iocoder/yudao/framework/weixin/WxMpServiceTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-weixin/src/test-integration/java/cn/fuxiaoaio/ygg/framework/weixin/WxMpServiceTest.java index 392e651c5..95f4022c5 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-weixin/src/test-integration/java/cn/iocoder/yudao/framework/weixin/WxMpServiceTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-weixin/src/test-integration/java/cn/fuxiaoaio/ygg/framework/weixin/WxMpServiceTest.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.weixin; +package cn.fuxiaoaio.ygg.framework.weixin; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.mp.api.WxMpService; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-weixin/src/test-integration/resources/application.yml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-weixin/src/test-integration/resources/application.yml similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-biz-weixin/src/test-integration/resources/application.yml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-biz-weixin/src/test-integration/resources/application.yml diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/pom.xml similarity index 79% rename from yudao-framework/yudao-spring-boot-starter-captcha/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/pom.xml index b77ef8886..448d17d9c 100644 --- a/yudao-framework/yudao-spring-boot-starter-captcha/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/pom.xml @@ -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"> - cn.iocoder.cloud - yudao-framework + cn.fuxiaoaio.ygg + fuxiaoaio-framework ${revision} 4.0.0 - yudao-spring-boot-starter-captcha + fuxiaoaio-spring-boot-starter-captcha jar ${project.artifactId} @@ -30,8 +30,8 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-redis + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-redis diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/config/YudaoCaptchaConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/java/cn/fuxiaoaio/ygg/framework/captcha/config/FuxiaoaioCaptchaConfiguration.java similarity index 84% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/config/YudaoCaptchaConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/java/cn/fuxiaoaio/ygg/framework/captcha/config/FuxiaoaioCaptchaConfiguration.java index 057445519..7e6683c7a 100644 --- a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/config/YudaoCaptchaConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/java/cn/fuxiaoaio/ygg/framework/captcha/config/FuxiaoaioCaptchaConfiguration.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.captcha.config; +package cn.fuxiaoaio.ygg.framework.captcha.config; import cn.hutool.core.util.ClassUtil; -import cn.iocoder.yudao.framework.captcha.core.enums.CaptchaRedisKeyConstants; -import cn.iocoder.yudao.framework.captcha.core.service.RedisCaptchaServiceImpl; +import cn.fuxiaoaio.ygg.framework.captcha.core.enums.CaptchaRedisKeyConstants; +import cn.fuxiaoaio.ygg.framework.captcha.core.service.RedisCaptchaServiceImpl; import com.xingyuv.captcha.properties.AjCaptchaProperties; import com.xingyuv.captcha.service.CaptchaCacheService; import com.xingyuv.captcha.service.impl.CaptchaServiceFactory; @@ -13,7 +13,7 @@ import org.springframework.data.redis.core.StringRedisTemplate; import javax.annotation.Resource; @AutoConfiguration -public class YudaoCaptchaConfiguration { +public class FuxiaoaioCaptchaConfiguration { static { // 手动加载 Lock4jRedisKeyConstants 类，因为它不会被使用到 diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/core/enums/CaptchaRedisKeyConstants.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/java/cn/fuxiaoaio/ygg/framework/captcha/core/enums/CaptchaRedisKeyConstants.java similarity index 80% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/core/enums/CaptchaRedisKeyConstants.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/java/cn/fuxiaoaio/ygg/framework/captcha/core/enums/CaptchaRedisKeyConstants.java index 3e1147c37..3ba8493ff 100644 --- a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/core/enums/CaptchaRedisKeyConstants.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/java/cn/fuxiaoaio/ygg/framework/captcha/core/enums/CaptchaRedisKeyConstants.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.framework.captcha.core.enums; +package cn.fuxiaoaio.ygg.framework.captcha.core.enums; -import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine; +import cn.fuxiaoaio.ygg.framework.redis.core.RedisKeyDefine; import com.xingyuv.captcha.model.vo.PointVO; import java.time.Duration; -import static cn.iocoder.yudao.framework.redis.core.RedisKeyDefine.KeyTypeEnum.STRING; +import static cn.fuxiaoaio.ygg.framework.redis.core.RedisKeyDefine.KeyTypeEnum.STRING; /** * 验证码 Redis Key 枚举类 diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/core/service/RedisCaptchaServiceImpl.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/java/cn/fuxiaoaio/ygg/framework/captcha/core/service/RedisCaptchaServiceImpl.java similarity index 96% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/core/service/RedisCaptchaServiceImpl.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/java/cn/fuxiaoaio/ygg/framework/captcha/core/service/RedisCaptchaServiceImpl.java index 4b47bd193..769fed231 100644 --- a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/core/service/RedisCaptchaServiceImpl.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/java/cn/fuxiaoaio/ygg/framework/captcha/core/service/RedisCaptchaServiceImpl.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.captcha.core.service; +package cn.fuxiaoaio.ygg.framework.captcha.core.service; import com.xingyuv.captcha.service.CaptchaCacheService; import lombok.AllArgsConstructor; diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/java/cn/fuxiaoaio/ygg/framework/captcha/package-info.java similarity index 77% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/java/cn/fuxiaoaio/ygg/framework/captcha/package-info.java index e78d9eab2..b158c1db7 100644 --- a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/java/cn/fuxiaoaio/ygg/framework/captcha/package-info.java @@ -4,4 +4,4 @@ * * @author 星语 */ -package cn.iocoder.yudao.framework.captcha; +package cn.fuxiaoaio.ygg.framework.captcha; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService new file mode 100644 index 000000000..ff50739e5 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService @@ -0,0 +1 @@ +cn.fuxiaoaio.ygg.framework.captcha.core.service.RedisCaptchaServiceImpl diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..8deb78a19 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +cn.fuxiaoaio.ygg.framework.captcha.config.FuxiaoaioCaptchaConfiguration \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg1.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg1.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg1.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg1.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg2.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg2.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg2.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg2.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg3.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg3.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg3.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg3.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg4.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg4.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg4.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg4.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg5.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg5.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg5.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg5.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg6.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg6.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg6.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg6.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg7.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg7.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg7.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg7.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg8.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg8.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg8.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg8.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg9.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg9.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg9.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg9.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/1.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/1.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/1.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/1.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/10.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/10.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/10.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/10.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/11.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/11.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/11.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/11.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/12.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/12.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/12.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/12.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/13.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/13.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/13.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/13.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/14.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/14.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/14.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/14.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/15.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/15.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/15.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/15.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/16.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/16.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/16.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/16.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/17.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/17.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/17.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/17.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/18.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/18.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/18.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/18.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/19.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/19.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/19.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/19.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/8.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/8.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/8.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/8.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/9.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/9.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/9.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/9.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/2.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/2.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/2.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/2.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/3.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/3.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/3.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/3.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/4.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/4.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/4.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/4.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg1.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg1.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg1.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg1.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg10.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg10.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg10.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg10.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg2.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg2.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg2.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg2.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg3.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg3.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg3.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg3.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg4.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg4.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg4.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg4.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg5.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg5.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg5.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg5.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg6.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg6.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg6.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg6.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg7.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg7.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg7.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg7.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg8.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg8.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg8.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg8.png diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg9.png b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg9.png similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg9.png rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg9.png diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/pom.xml similarity index 72% rename from yudao-framework/yudao-spring-boot-starter-desensitize/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/pom.xml index 32c640eb9..df604aff1 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/pom.xml @@ -4,18 +4,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.iocoder.cloud - yudao-framework + cn.fuxiaoaio.ygg + fuxiaoaio-framework ${revision} - yudao-spring-boot-starter-desensitize + fuxiaoaio-spring-boot-starter-desensitize 脱敏组件：支持 JSON 返回数据时，将邮箱、手机等字段进行脱敏 - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common @@ -30,8 +30,8 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-test + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-test test diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/annotation/DesensitizeBy.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/base/annotation/DesensitizeBy.java similarity index 83% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/annotation/DesensitizeBy.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/base/annotation/DesensitizeBy.java index 0166cb6ef..a029620c0 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/annotation/DesensitizeBy.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/base/annotation/DesensitizeBy.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.desensitize.core.base.annotation; +package cn.fuxiaoaio.ygg.framework.desensitize.core.base.annotation; -import cn.iocoder.yudao.framework.desensitize.core.base.handler.DesensitizationHandler; -import cn.iocoder.yudao.framework.desensitize.core.base.serializer.StringDesensitizeSerializer; +import cn.fuxiaoaio.ygg.framework.desensitize.core.base.handler.DesensitizationHandler; +import cn.fuxiaoaio.ygg.framework.desensitize.core.base.serializer.StringDesensitizeSerializer; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/handler/DesensitizationHandler.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/base/handler/DesensitizationHandler.java similarity index 85% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/handler/DesensitizationHandler.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/base/handler/DesensitizationHandler.java index 470a0becf..a561f53bb 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/handler/DesensitizationHandler.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/base/handler/DesensitizationHandler.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.desensitize.core.base.handler; +package cn.fuxiaoaio.ygg.framework.desensitize.core.base.handler; import java.lang.annotation.Annotation; diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/serializer/StringDesensitizeSerializer.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/base/serializer/StringDesensitizeSerializer.java similarity index 94% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/serializer/StringDesensitizeSerializer.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/base/serializer/StringDesensitizeSerializer.java index 2c15a747d..6791b586b 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/base/serializer/StringDesensitizeSerializer.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/base/serializer/StringDesensitizeSerializer.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.framework.desensitize.core.base.serializer; +package cn.fuxiaoaio.ygg.framework.desensitize.core.base.serializer; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.lang.Singleton; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy; -import cn.iocoder.yudao.framework.desensitize.core.base.handler.DesensitizationHandler; +import cn.fuxiaoaio.ygg.framework.desensitize.core.base.annotation.DesensitizeBy; +import cn.fuxiaoaio.ygg.framework.desensitize.core.base.handler.DesensitizationHandler; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.BeanProperty; import com.fasterxml.jackson.databind.JsonSerializer; diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/package-info.java similarity index 64% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/package-info.java index d56282535..4d9ca2c2f 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/package-info.java @@ -1,4 +1,4 @@ /** * 脱敏组件：支持 JSON 返回数据时，将邮箱、手机等字段进行脱敏 */ -package cn.iocoder.yudao.framework.desensitize.core; +package cn.fuxiaoaio.ygg.framework.desensitize.core; diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/regex/annotation/EmailDesensitize.java similarity index 81% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/regex/annotation/EmailDesensitize.java index 227f25499..633d553e3 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/EmailDesensitize.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/regex/annotation/EmailDesensitize.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.desensitize.core.regex.annotation; +package cn.fuxiaoaio.ygg.framework.desensitize.core.regex.annotation; -import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy; -import cn.iocoder.yudao.framework.desensitize.core.regex.handler.EmailDesensitizationHandler; +import cn.fuxiaoaio.ygg.framework.desensitize.core.base.annotation.DesensitizeBy; +import cn.fuxiaoaio.ygg.framework.desensitize.core.regex.handler.EmailDesensitizationHandler; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import java.lang.annotation.Documented; diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/RegexDesensitize.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/regex/annotation/RegexDesensitize.java similarity index 83% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/RegexDesensitize.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/regex/annotation/RegexDesensitize.java index 4ab7c7415..2210a2c7e 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/annotation/RegexDesensitize.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/regex/annotation/RegexDesensitize.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.desensitize.core.regex.annotation; +package cn.fuxiaoaio.ygg.framework.desensitize.core.regex.annotation; -import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy; -import cn.iocoder.yudao.framework.desensitize.core.regex.handler.DefaultRegexDesensitizationHandler; +import cn.fuxiaoaio.ygg.framework.desensitize.core.base.annotation.DesensitizeBy; +import cn.fuxiaoaio.ygg.framework.desensitize.core.regex.handler.DefaultRegexDesensitizationHandler; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import java.lang.annotation.Documented; diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/AbstractRegexDesensitizationHandler.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/regex/handler/AbstractRegexDesensitizationHandler.java similarity index 87% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/AbstractRegexDesensitizationHandler.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/regex/handler/AbstractRegexDesensitizationHandler.java index f43431b1d..67069bea9 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/AbstractRegexDesensitizationHandler.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/regex/handler/AbstractRegexDesensitizationHandler.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.desensitize.core.regex.handler; +package cn.fuxiaoaio.ygg.framework.desensitize.core.regex.handler; -import cn.iocoder.yudao.framework.desensitize.core.base.handler.DesensitizationHandler; +import cn.fuxiaoaio.ygg.framework.desensitize.core.base.handler.DesensitizationHandler; import java.lang.annotation.Annotation; diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java similarity index 77% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java index f92414e0c..359b45891 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/regex/handler/DefaultRegexDesensitizationHandler.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.desensitize.core.regex.handler; +package cn.fuxiaoaio.ygg.framework.desensitize.core.regex.handler; -import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.RegexDesensitize; +import cn.fuxiaoaio.ygg.framework.desensitize.core.regex.annotation.RegexDesensitize; /** * {@link RegexDesensitize} 的正则脱敏处理器 diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java similarity index 77% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java index 8d1867a64..ea68bc481 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/regex/handler/EmailDesensitizationHandler.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.desensitize.core.regex.handler; +package cn.fuxiaoaio.ygg.framework.desensitize.core.regex.handler; -import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.EmailDesensitize; +import cn.fuxiaoaio.ygg.framework.desensitize.core.regex.annotation.EmailDesensitize; /** * {@link EmailDesensitize} 的脱敏处理器 diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCardDesensitize.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/annotation/BankCardDesensitize.java similarity index 81% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCardDesensitize.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/annotation/BankCardDesensitize.java index 19ad54e25..5101a08e8 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/BankCardDesensitize.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/annotation/BankCardDesensitize.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.desensitize.core.slider.annotation; +package cn.fuxiaoaio.ygg.framework.desensitize.core.slider.annotation; -import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy; -import cn.iocoder.yudao.framework.desensitize.core.slider.handler.BankCardDesensitization; +import cn.fuxiaoaio.ygg.framework.desensitize.core.base.annotation.DesensitizeBy; +import cn.fuxiaoaio.ygg.framework.desensitize.core.slider.handler.BankCardDesensitization; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import java.lang.annotation.Documented; diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicenseDesensitize.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/annotation/CarLicenseDesensitize.java similarity index 81% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicenseDesensitize.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/annotation/CarLicenseDesensitize.java index 9000e1ec4..0cb0078e0 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/CarLicenseDesensitize.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/annotation/CarLicenseDesensitize.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.desensitize.core.slider.annotation; +package cn.fuxiaoaio.ygg.framework.desensitize.core.slider.annotation; -import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy; -import cn.iocoder.yudao.framework.desensitize.core.slider.handler.CarLicenseDesensitization; +import cn.fuxiaoaio.ygg.framework.desensitize.core.base.annotation.DesensitizeBy; +import cn.fuxiaoaio.ygg.framework.desensitize.core.slider.handler.CarLicenseDesensitization; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import java.lang.annotation.Documented; diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/ChineseNameDesensitize.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/annotation/ChineseNameDesensitize.java similarity index 81% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/ChineseNameDesensitize.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/annotation/ChineseNameDesensitize.java index 73a0d0ee5..db11fc49d 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/ChineseNameDesensitize.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/annotation/ChineseNameDesensitize.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.desensitize.core.slider.annotation; +package cn.fuxiaoaio.ygg.framework.desensitize.core.slider.annotation; -import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy; -import cn.iocoder.yudao.framework.desensitize.core.slider.handler.ChineseNameDesensitization; +import cn.fuxiaoaio.ygg.framework.desensitize.core.base.annotation.DesensitizeBy; +import cn.fuxiaoaio.ygg.framework.desensitize.core.slider.handler.ChineseNameDesensitization; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import java.lang.annotation.Documented; diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhoneDesensitize.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/annotation/FixedPhoneDesensitize.java similarity index 81% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhoneDesensitize.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/annotation/FixedPhoneDesensitize.java index 862235346..2912c477b 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/FixedPhoneDesensitize.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/annotation/FixedPhoneDesensitize.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.desensitize.core.slider.annotation; +package cn.fuxiaoaio.ygg.framework.desensitize.core.slider.annotation; -import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy; -import cn.iocoder.yudao.framework.desensitize.core.slider.handler.FixedPhoneDesensitization; +import cn.fuxiaoaio.ygg.framework.desensitize.core.base.annotation.DesensitizeBy; +import cn.fuxiaoaio.ygg.framework.desensitize.core.slider.handler.FixedPhoneDesensitization; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import java.lang.annotation.Documented; diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCardDesensitize.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/annotation/IdCardDesensitize.java similarity index 81% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCardDesensitize.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/annotation/IdCardDesensitize.java index 8a654c915..be721d622 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/IdCardDesensitize.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/annotation/IdCardDesensitize.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.desensitize.core.slider.annotation; +package cn.fuxiaoaio.ygg.framework.desensitize.core.slider.annotation; -import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy; -import cn.iocoder.yudao.framework.desensitize.core.slider.handler.IdCardDesensitization; +import cn.fuxiaoaio.ygg.framework.desensitize.core.base.annotation.DesensitizeBy; +import cn.fuxiaoaio.ygg.framework.desensitize.core.slider.handler.IdCardDesensitization; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import java.lang.annotation.Documented; diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/MobileDesensitize.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/annotation/MobileDesensitize.java similarity index 81% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/MobileDesensitize.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/annotation/MobileDesensitize.java index f0c42f192..8df15a7ba 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/MobileDesensitize.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/annotation/MobileDesensitize.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.desensitize.core.slider.annotation; +package cn.fuxiaoaio.ygg.framework.desensitize.core.slider.annotation; -import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy; -import cn.iocoder.yudao.framework.desensitize.core.slider.handler.MobileDesensitization; +import cn.fuxiaoaio.ygg.framework.desensitize.core.base.annotation.DesensitizeBy; +import cn.fuxiaoaio.ygg.framework.desensitize.core.slider.handler.MobileDesensitization; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import java.lang.annotation.Documented; diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PasswordDesensitize.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/annotation/PasswordDesensitize.java similarity index 81% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PasswordDesensitize.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/annotation/PasswordDesensitize.java index 6a3b2694f..3b262fe57 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/PasswordDesensitize.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/annotation/PasswordDesensitize.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.desensitize.core.slider.annotation; +package cn.fuxiaoaio.ygg.framework.desensitize.core.slider.annotation; -import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy; -import cn.iocoder.yudao.framework.desensitize.core.slider.handler.PasswordDesensitization; +import cn.fuxiaoaio.ygg.framework.desensitize.core.base.annotation.DesensitizeBy; +import cn.fuxiaoaio.ygg.framework.desensitize.core.slider.handler.PasswordDesensitization; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import java.lang.annotation.Documented; diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/SliderDesensitize.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/annotation/SliderDesensitize.java similarity index 84% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/SliderDesensitize.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/annotation/SliderDesensitize.java index ec79635b9..ec4dd1eb1 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/annotation/SliderDesensitize.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/annotation/SliderDesensitize.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.desensitize.core.slider.annotation; +package cn.fuxiaoaio.ygg.framework.desensitize.core.slider.annotation; -import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy; -import cn.iocoder.yudao.framework.desensitize.core.slider.handler.DefaultDesensitizationHandler; +import cn.fuxiaoaio.ygg.framework.desensitize.core.base.annotation.DesensitizeBy; +import cn.fuxiaoaio.ygg.framework.desensitize.core.slider.handler.DefaultDesensitizationHandler; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import java.lang.annotation.Documented; diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java similarity index 94% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java index e41c57319..2e424f3bd 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/AbstractDesensitizationHandler.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.desensitize.core.slider.handler; +package cn.fuxiaoaio.ygg.framework.desensitize.core.slider.handler; -import cn.iocoder.yudao.framework.desensitize.core.base.handler.DesensitizationHandler; +import cn.fuxiaoaio.ygg.framework.desensitize.core.base.handler.DesensitizationHandler; import java.lang.annotation.Annotation; diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractSliderDesensitizationHandler.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/AbstractSliderDesensitizationHandler.java similarity index 94% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractSliderDesensitizationHandler.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/AbstractSliderDesensitizationHandler.java index 7dd2a7fd1..0adb69566 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/AbstractSliderDesensitizationHandler.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/AbstractSliderDesensitizationHandler.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.desensitize.core.slider.handler; +package cn.fuxiaoaio.ygg.framework.desensitize.core.slider.handler; -import cn.iocoder.yudao.framework.desensitize.core.base.handler.DesensitizationHandler; +import cn.fuxiaoaio.ygg.framework.desensitize.core.base.handler.DesensitizationHandler; import java.lang.annotation.Annotation; diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/BankCardDesensitization.java similarity index 81% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/BankCardDesensitization.java index e1d90ea6d..d0c317594 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/BankCardDesensitization.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/BankCardDesensitization.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.desensitize.core.slider.handler; +package cn.fuxiaoaio.ygg.framework.desensitize.core.slider.handler; -import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.BankCardDesensitize; +import cn.fuxiaoaio.ygg.framework.desensitize.core.slider.annotation.BankCardDesensitize; /** * {@link BankCardDesensitize} 的脱敏处理器 diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java similarity index 82% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java index 34b3e9a69..229123b69 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/CarLicenseDesensitization.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.desensitize.core.slider.handler; +package cn.fuxiaoaio.ygg.framework.desensitize.core.slider.handler; -import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.CarLicenseDesensitize; +import cn.fuxiaoaio.ygg.framework.desensitize.core.slider.annotation.CarLicenseDesensitize; /** * {@link CarLicenseDesensitize} 的脱敏处理器 diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java similarity index 82% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java index f71dac0e0..a93ccbbf2 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/ChineseNameDesensitization.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.desensitize.core.slider.handler; +package cn.fuxiaoaio.ygg.framework.desensitize.core.slider.handler; -import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.ChineseNameDesensitize; +import cn.fuxiaoaio.ygg.framework.desensitize.core.slider.annotation.ChineseNameDesensitize; /** * {@link ChineseNameDesensitize} 的脱敏处理器 diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java similarity index 81% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java index 8b0adaeab..4ac442737 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/DefaultDesensitizationHandler.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.desensitize.core.slider.handler; +package cn.fuxiaoaio.ygg.framework.desensitize.core.slider.handler; -import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.SliderDesensitize; +import cn.fuxiaoaio.ygg.framework.desensitize.core.slider.annotation.SliderDesensitize; /** * {@link SliderDesensitize} 的脱敏处理器 diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java similarity index 82% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java index 6e2326171..cdb67ce39 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/FixedPhoneDesensitization.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.desensitize.core.slider.handler; +package cn.fuxiaoaio.ygg.framework.desensitize.core.slider.handler; -import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.FixedPhoneDesensitize; +import cn.fuxiaoaio.ygg.framework.desensitize.core.slider.annotation.FixedPhoneDesensitize; /** * {@link FixedPhoneDesensitize} 的脱敏处理器 diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/IdCardDesensitization.java similarity index 81% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/IdCardDesensitization.java index 9d525b34c..59bda7d39 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/IdCardDesensitization.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/IdCardDesensitization.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.desensitize.core.slider.handler; +package cn.fuxiaoaio.ygg.framework.desensitize.core.slider.handler; -import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.IdCardDesensitize; +import cn.fuxiaoaio.ygg.framework.desensitize.core.slider.annotation.IdCardDesensitize; /** * {@link IdCardDesensitize} 的脱敏处理器 diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/MobileDesensitization.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/MobileDesensitization.java similarity index 81% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/MobileDesensitization.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/MobileDesensitization.java index 582900ad4..ea867fb28 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/MobileDesensitization.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/MobileDesensitization.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.desensitize.core.slider.handler; +package cn.fuxiaoaio.ygg.framework.desensitize.core.slider.handler; -import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.MobileDesensitize; +import cn.fuxiaoaio.ygg.framework.desensitize.core.slider.annotation.MobileDesensitize; /** * {@link MobileDesensitize} 的脱敏处理器 diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/PasswordDesensitization.java similarity index 81% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/PasswordDesensitization.java index 1bccaa2a4..8fea66e8d 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/main/java/cn/iocoder/yudao/framework/desensitize/core/slider/handler/PasswordDesensitization.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/main/java/cn/fuxiaoaio/ygg/framework/desensitize/core/slider/handler/PasswordDesensitization.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.desensitize.core.slider.handler; +package cn.fuxiaoaio.ygg.framework.desensitize.core.slider.handler; -import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.PasswordDesensitize; +import cn.fuxiaoaio.ygg.framework.desensitize.core.slider.annotation.PasswordDesensitize; /** * {@link PasswordDesensitize} 的码脱敏处理器 diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/DesensitizeTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/test/java/cn/fuxiaoaio/ygg/framework/desensitize/core/DesensitizeTest.java similarity index 80% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/DesensitizeTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/test/java/cn/fuxiaoaio/ygg/framework/desensitize/core/DesensitizeTest.java index e5d22636c..ff8681aaf 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/DesensitizeTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/test/java/cn/fuxiaoaio/ygg/framework/desensitize/core/DesensitizeTest.java @@ -1,17 +1,17 @@ -package cn.iocoder.yudao.framework.desensitize.core; +package cn.fuxiaoaio.ygg.framework.desensitize.core; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; -import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.EmailDesensitize; -import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.RegexDesensitize; -import cn.iocoder.yudao.framework.desensitize.core.annotation.Address; -import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.BankCardDesensitize; -import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.CarLicenseDesensitize; -import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.ChineseNameDesensitize; -import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.FixedPhoneDesensitize; -import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.IdCardDesensitize; -import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.PasswordDesensitize; -import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.MobileDesensitize; -import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.SliderDesensitize; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.framework.desensitize.core.regex.annotation.EmailDesensitize; +import cn.fuxiaoaio.ygg.framework.desensitize.core.regex.annotation.RegexDesensitize; +import cn.fuxiaoaio.ygg.framework.desensitize.core.annotation.Address; +import cn.fuxiaoaio.ygg.framework.desensitize.core.slider.annotation.BankCardDesensitize; +import cn.fuxiaoaio.ygg.framework.desensitize.core.slider.annotation.CarLicenseDesensitize; +import cn.fuxiaoaio.ygg.framework.desensitize.core.slider.annotation.ChineseNameDesensitize; +import cn.fuxiaoaio.ygg.framework.desensitize.core.slider.annotation.FixedPhoneDesensitize; +import cn.fuxiaoaio.ygg.framework.desensitize.core.slider.annotation.IdCardDesensitize; +import cn.fuxiaoaio.ygg.framework.desensitize.core.slider.annotation.PasswordDesensitize; +import cn.fuxiaoaio.ygg.framework.desensitize.core.slider.annotation.MobileDesensitize; +import cn.fuxiaoaio.ygg.framework.desensitize.core.slider.annotation.SliderDesensitize; import lombok.Data; import org.junit.jupiter.api.Test; diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/annotation/Address.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/test/java/cn/fuxiaoaio/ygg/framework/desensitize/core/annotation/Address.java similarity index 70% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/annotation/Address.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/test/java/cn/fuxiaoaio/ygg/framework/desensitize/core/annotation/Address.java index 735d25b34..80cd49e4e 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/annotation/Address.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/test/java/cn/fuxiaoaio/ygg/framework/desensitize/core/annotation/Address.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.desensitize.core.annotation; +package cn.fuxiaoaio.ygg.framework.desensitize.core.annotation; -import cn.iocoder.yudao.framework.desensitize.core.DesensitizeTest; -import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy; -import cn.iocoder.yudao.framework.desensitize.core.handler.AddressHandler; +import cn.fuxiaoaio.ygg.framework.desensitize.core.DesensitizeTest; +import cn.fuxiaoaio.ygg.framework.desensitize.core.base.annotation.DesensitizeBy; +import cn.fuxiaoaio.ygg.framework.desensitize.core.handler.AddressHandler; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import java.lang.annotation.Documented; diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/handler/AddressHandler.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/test/java/cn/fuxiaoaio/ygg/framework/desensitize/core/handler/AddressHandler.java similarity index 57% rename from yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/handler/AddressHandler.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/test/java/cn/fuxiaoaio/ygg/framework/desensitize/core/handler/AddressHandler.java index 7a8455f8d..5b66f95b4 100644 --- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/handler/AddressHandler.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-desensitize/src/test/java/cn/fuxiaoaio/ygg/framework/desensitize/core/handler/AddressHandler.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.desensitize.core.handler; +package cn.fuxiaoaio.ygg.framework.desensitize.core.handler; -import cn.iocoder.yudao.framework.desensitize.core.DesensitizeTest; -import cn.iocoder.yudao.framework.desensitize.core.base.handler.DesensitizationHandler; -import cn.iocoder.yudao.framework.desensitize.core.annotation.Address; +import cn.fuxiaoaio.ygg.framework.desensitize.core.DesensitizeTest; +import cn.fuxiaoaio.ygg.framework.desensitize.core.base.handler.DesensitizationHandler; +import cn.fuxiaoaio.ygg.framework.desensitize.core.annotation.Address; /** * {@link Address} 的脱敏处理器 diff --git a/yudao-framework/yudao-spring-boot-starter-env/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/pom.xml similarity index 89% rename from yudao-framework/yudao-spring-boot-starter-env/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/pom.xml index 5e92fc081..41bf1b671 100644 --- a/yudao-framework/yudao-spring-boot-starter-env/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/pom.xml @@ -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"> - cn.iocoder.cloud - yudao-framework + cn.fuxiaoaio.ygg + fuxiaoaio-framework ${revision} 4.0.0 - yudao-spring-boot-starter-env + fuxiaoaio-spring-boot-starter-env jar ${project.artifactId} @@ -25,8 +25,8 @@ - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common diff --git a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/config/EnvEnvironmentPostProcessor.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/config/EnvEnvironmentPostProcessor.java similarity index 78% rename from yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/config/EnvEnvironmentPostProcessor.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/config/EnvEnvironmentPostProcessor.java index 4c1cb44fe..cbfeb2f0e 100644 --- a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/config/EnvEnvironmentPostProcessor.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/config/EnvEnvironmentPostProcessor.java @@ -1,19 +1,19 @@ -package cn.iocoder.yudao.framework.env.config; +package cn.fuxiaoaio.ygg.framework.env.config; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.util.collection.SetUtils; -import cn.iocoder.yudao.framework.env.core.util.EnvUtils; +import cn.fuxiaoaio.ygg.framework.common.util.collection.SetUtils; +import cn.fuxiaoaio.ygg.framework.env.core.util.EnvUtils; import org.springframework.boot.SpringApplication; import org.springframework.boot.env.EnvironmentPostProcessor; import org.springframework.core.env.ConfigurableEnvironment; import java.util.Set; -import static cn.iocoder.yudao.framework.env.core.util.EnvUtils.HOST_NAME_VALUE; +import static cn.fuxiaoaio.ygg.framework.env.core.util.EnvUtils.HOST_NAME_VALUE; /** * 多环境的 {@link EnvEnvironmentPostProcessor} 实现类 - * 将 yudao.env.tag 设置到 dubbo、nacos 等组件对应的 tag 配置项，当且仅当它们不存在时 + * 将 fuxiaoaio.env.tag 设置到 dubbo、nacos 等组件对应的 tag 配置项，当且仅当它们不存在时 * * @author 芋道源码 */ @@ -34,7 +34,7 @@ public class EnvEnvironmentPostProcessor implements EnvironmentPostProcessor { environment.getSystemProperties().put(hostNameKey, EnvUtils.getHostName()); } - // 1.1 如果没有 yudao.env.tag 配置项，则不进行配置项的修改 + // 1.1 如果没有 fuxiaoaio.env.tag 配置项，则不进行配置项的修改 String tag = EnvUtils.getTag(environment); if (StrUtil.isEmpty(tag)) { return; diff --git a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/config/EnvProperties.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/config/EnvProperties.java similarity index 60% rename from yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/config/EnvProperties.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/config/EnvProperties.java index 1c88ff27b..8c248991d 100644 --- a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/config/EnvProperties.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/config/EnvProperties.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.env.config; +package cn.fuxiaoaio.ygg.framework.env.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -8,11 +8,11 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * * @author 芋道源码 */ -@ConfigurationProperties(prefix = "yudao.env") +@ConfigurationProperties(prefix = "fuxiaoaio.env") @Data public class EnvProperties { - public static final String TAG_KEY = "yudao.env.tag"; + public static final String TAG_KEY = "fuxiaoaio.env.tag"; /** * 环境标签 diff --git a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/config/YudaoEnvRpcAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/config/FuxiaoaioEnvRpcAutoConfiguration.java similarity index 91% rename from yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/config/YudaoEnvRpcAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/config/FuxiaoaioEnvRpcAutoConfiguration.java index ab74f3205..223922f55 100644 --- a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/config/YudaoEnvRpcAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/config/FuxiaoaioEnvRpcAutoConfiguration.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.env.config; +package cn.fuxiaoaio.ygg.framework.env.config; -import cn.iocoder.yudao.framework.env.core.fegin.EnvLoadBalancerClientFactory; -import cn.iocoder.yudao.framework.env.core.fegin.EnvRequestInterceptor; +import cn.fuxiaoaio.ygg.framework.env.core.fegin.EnvLoadBalancerClientFactory; +import cn.fuxiaoaio.ygg.framework.env.core.fegin.EnvRequestInterceptor; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -20,7 +20,7 @@ import java.util.List; */ @AutoConfiguration @EnableConfigurationProperties(EnvProperties.class) -public class YudaoEnvRpcAutoConfiguration { +public class FuxiaoaioEnvRpcAutoConfiguration { // ========== Feign 相关 ========== diff --git a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/config/YudaoEnvWebAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/config/FuxiaoaioEnvWebAutoConfiguration.java similarity index 81% rename from yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/config/YudaoEnvWebAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/config/FuxiaoaioEnvWebAutoConfiguration.java index 0dc12237a..579e78156 100644 --- a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/config/YudaoEnvWebAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/config/FuxiaoaioEnvWebAutoConfiguration.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.env.config; +package cn.fuxiaoaio.ygg.framework.env.config; -import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum; -import cn.iocoder.yudao.framework.env.core.web.EnvWebFilter; +import cn.fuxiaoaio.ygg.framework.common.enums.WebFilterOrderEnum; +import cn.fuxiaoaio.ygg.framework.env.core.web.EnvWebFilter; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -16,7 +16,7 @@ import org.springframework.context.annotation.Bean; @AutoConfiguration @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) @EnableConfigurationProperties(EnvProperties.class) -public class YudaoEnvWebAutoConfiguration { +public class FuxiaoaioEnvWebAutoConfiguration { /** * 创建 {@link EnvWebFilter} Bean diff --git a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/context/EnvContextHolder.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/context/EnvContextHolder.java similarity index 94% rename from yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/context/EnvContextHolder.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/context/EnvContextHolder.java index a8eafc650..33d89d5cb 100644 --- a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/context/EnvContextHolder.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/context/EnvContextHolder.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.env.core.context; +package cn.fuxiaoaio.ygg.framework.env.core.context; import cn.hutool.core.collection.CollUtil; import com.alibaba.ttl.TransmittableThreadLocal; diff --git a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/dubbo/DubboConsumerRouterTagClusterInterceptor.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/dubbo/DubboConsumerRouterTagClusterInterceptor.java similarity index 92% rename from yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/dubbo/DubboConsumerRouterTagClusterInterceptor.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/dubbo/DubboConsumerRouterTagClusterInterceptor.java index b03c7c2c7..464ac0d6f 100644 --- a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/dubbo/DubboConsumerRouterTagClusterInterceptor.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/dubbo/DubboConsumerRouterTagClusterInterceptor.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.env.core.dubbo; +package cn.fuxiaoaio.ygg.framework.env.core.dubbo; -import cn.iocoder.yudao.framework.env.core.context.EnvContextHolder; +import cn.fuxiaoaio.ygg.framework.env.core.context.EnvContextHolder; import org.apache.dubbo.common.constants.CommonConstants; import org.apache.dubbo.common.extension.Activate; import org.apache.dubbo.rpc.Invocation; diff --git a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/dubbo/DubboProviderRouterTagFilter.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/dubbo/DubboProviderRouterTagFilter.java similarity index 94% rename from yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/dubbo/DubboProviderRouterTagFilter.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/dubbo/DubboProviderRouterTagFilter.java index d24f79bd1..4472f162e 100644 --- a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/dubbo/DubboProviderRouterTagFilter.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/dubbo/DubboProviderRouterTagFilter.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.env.core.dubbo; +package cn.fuxiaoaio.ygg.framework.env.core.dubbo; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.env.core.context.EnvContextHolder; +import cn.fuxiaoaio.ygg.framework.env.core.context.EnvContextHolder; import org.apache.dubbo.common.constants.CommonConstants; import org.apache.dubbo.common.extension.Activate; import org.apache.dubbo.rpc.*; diff --git a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/fegin/EnvLoadBalancerClient.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/fegin/EnvLoadBalancerClient.java similarity index 93% rename from yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/fegin/EnvLoadBalancerClient.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/fegin/EnvLoadBalancerClient.java index ac136e6ba..a0f8bc4e5 100644 --- a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/fegin/EnvLoadBalancerClient.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/fegin/EnvLoadBalancerClient.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.framework.env.core.fegin; +package cn.fuxiaoaio.ygg.framework.env.core.fegin; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.framework.env.core.context.EnvContextHolder; -import cn.iocoder.yudao.framework.env.core.util.EnvUtils; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.framework.env.core.context.EnvContextHolder; +import cn.fuxiaoaio.ygg.framework.env.core.util.EnvUtils; import com.alibaba.cloud.nacos.balancer.NacosBalancer; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/fegin/EnvLoadBalancerClientFactory.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/fegin/EnvLoadBalancerClientFactory.java similarity index 96% rename from yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/fegin/EnvLoadBalancerClientFactory.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/fegin/EnvLoadBalancerClientFactory.java index ebaeca97e..b92b74371 100644 --- a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/fegin/EnvLoadBalancerClientFactory.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/fegin/EnvLoadBalancerClientFactory.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.env.core.fegin; +package cn.fuxiaoaio.ygg.framework.env.core.fegin; import org.springframework.cloud.client.ServiceInstance; diff --git a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/fegin/EnvRequestInterceptor.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/fegin/EnvRequestInterceptor.java similarity index 76% rename from yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/fegin/EnvRequestInterceptor.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/fegin/EnvRequestInterceptor.java index 4c60eb556..5957779be 100644 --- a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/fegin/EnvRequestInterceptor.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/fegin/EnvRequestInterceptor.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.env.core.fegin; +package cn.fuxiaoaio.ygg.framework.env.core.fegin; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.env.core.context.EnvContextHolder; -import cn.iocoder.yudao.framework.env.core.util.EnvUtils; +import cn.fuxiaoaio.ygg.framework.env.core.context.EnvContextHolder; +import cn.fuxiaoaio.ygg.framework.env.core.util.EnvUtils; import feign.RequestInterceptor; import feign.RequestTemplate; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/package-info.java new file mode 100644 index 000000000..f627e8174 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/package-info.java @@ -0,0 +1 @@ +package cn.fuxiaoaio.ygg.framework.env.core; diff --git a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/util/EnvUtils.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/util/EnvUtils.java similarity index 93% rename from yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/util/EnvUtils.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/util/EnvUtils.java index 0b393deaf..e3f0e7d3e 100644 --- a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/util/EnvUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/util/EnvUtils.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.framework.env.core.util; +package cn.fuxiaoaio.ygg.framework.env.core.util; import cn.hutool.core.net.NetUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.env.config.EnvProperties; +import cn.fuxiaoaio.ygg.framework.env.config.EnvProperties; import feign.RequestTemplate; import org.springframework.cloud.client.ServiceInstance; import org.springframework.core.env.Environment; diff --git a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/web/EnvWebFilter.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/web/EnvWebFilter.java similarity index 87% rename from yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/web/EnvWebFilter.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/web/EnvWebFilter.java index 0c933a262..af013cae1 100644 --- a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/web/EnvWebFilter.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/core/web/EnvWebFilter.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.env.core.web; +package cn.fuxiaoaio.ygg.framework.env.core.web; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.env.core.context.EnvContextHolder; -import cn.iocoder.yudao.framework.env.core.util.EnvUtils; +import cn.fuxiaoaio.ygg.framework.env.core.context.EnvContextHolder; +import cn.fuxiaoaio.ygg.framework.env.core.util.EnvUtils; import org.springframework.web.filter.OncePerRequestFilter; import javax.servlet.FilterChain; diff --git a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/package-info.java similarity index 79% rename from yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/package-info.java index 20d1d3acb..947b89da6 100644 --- a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/java/cn/fuxiaoaio/ygg/framework/env/package-info.java @@ -4,4 +4,4 @@ * * @author 芋道源码 */ -package cn.iocoder.yudao.framework.env; +package cn.fuxiaoaio.ygg.framework.env; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter new file mode 100644 index 000000000..27ee0df68 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter @@ -0,0 +1 @@ +dubboProviderRouterTagFilter=cn.fuxiaoaio.ygg.framework.env.core.dubbo.DubboProviderRouterTagFilter diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.cluster.interceptor.ClusterInterceptor b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.cluster.interceptor.ClusterInterceptor new file mode 100644 index 000000000..0f868e947 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.cluster.interceptor.ClusterInterceptor @@ -0,0 +1 @@ +dubboConsumerRouterTagClusterInterceptor=cn.fuxiaoaio.ygg.framework.env.core.dubbo.DubboConsumerRouterTagClusterInterceptor diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/resources/META-INF/spring.factories b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/resources/META-INF/spring.factories new file mode 100644 index 000000000..5d8be96c2 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.env.EnvironmentPostProcessor=\ + cn.fuxiaoaio.ygg.framework.env.config.EnvEnvironmentPostProcessor diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..b015d6a4e --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-env/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +cn.fuxiaoaio.ygg.framework.env.config.FuxiaoaioEnvWebAutoConfiguration +cn.fuxiaoaio.ygg.framework.env.config.FuxiaoaioEnvRpcAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-excel/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-excel/pom.xml similarity index 79% rename from yudao-framework/yudao-spring-boot-starter-excel/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-excel/pom.xml index 45d1a10bd..dd8cce249 100644 --- a/yudao-framework/yudao-spring-boot-starter-excel/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-excel/pom.xml @@ -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"> - cn.iocoder.cloud - yudao-framework + cn.fuxiaoaio.ygg + fuxiaoaio-framework ${revision} 4.0.0 - yudao-spring-boot-starter-excel + fuxiaoaio-spring-boot-starter-excel jar ${project.artifactId} @@ -17,14 +17,14 @@ - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common - cn.iocoder.cloud - yudao-spring-boot-starter-biz-dict + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-dict true diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/annotations/DictFormat.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-excel/src/main/java/cn/fuxiaoaio/ygg/framework/excel/core/annotations/DictFormat.java similarity index 86% rename from yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/annotations/DictFormat.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-excel/src/main/java/cn/fuxiaoaio/ygg/framework/excel/core/annotations/DictFormat.java index 0d898b40a..ff4d2e24d 100644 --- a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/annotations/DictFormat.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-excel/src/main/java/cn/fuxiaoaio/ygg/framework/excel/core/annotations/DictFormat.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.excel.core.annotations; +package cn.fuxiaoaio.ygg.framework.excel.core.annotations; import java.lang.annotation.*; diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/DictConvert.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-excel/src/main/java/cn/fuxiaoaio/ygg/framework/excel/core/convert/DictConvert.java similarity index 93% rename from yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/DictConvert.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-excel/src/main/java/cn/fuxiaoaio/ygg/framework/excel/core/convert/DictConvert.java index 182c83a72..48cc8e3cb 100644 --- a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/DictConvert.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-excel/src/main/java/cn/fuxiaoaio/ygg/framework/excel/core/convert/DictConvert.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.excel.core.convert; +package cn.fuxiaoaio.ygg.framework.excel.core.convert; import cn.hutool.core.convert.Convert; -import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; +import cn.fuxiaoaio.ygg.framework.dict.core.util.DictFrameworkUtils; +import cn.fuxiaoaio.ygg.framework.excel.core.annotations.DictFormat; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.metadata.GlobalConfiguration; diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/JsonConvert.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-excel/src/main/java/cn/fuxiaoaio/ygg/framework/excel/core/convert/JsonConvert.java similarity index 89% rename from yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/JsonConvert.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-excel/src/main/java/cn/fuxiaoaio/ygg/framework/excel/core/convert/JsonConvert.java index 0d4794e5f..91023c5c7 100644 --- a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/JsonConvert.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-excel/src/main/java/cn/fuxiaoaio/ygg/framework/excel/core/convert/JsonConvert.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.excel.core.convert; +package cn.fuxiaoaio.ygg.framework.excel.core.convert; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.metadata.GlobalConfiguration; diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-excel/src/main/java/cn/fuxiaoaio/ygg/framework/excel/core/util/ExcelUtils.java similarity index 97% rename from yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-excel/src/main/java/cn/fuxiaoaio/ygg/framework/excel/core/util/ExcelUtils.java index 67d558f6b..f8d9db9db 100644 --- a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-excel/src/main/java/cn/fuxiaoaio/ygg/framework/excel/core/util/ExcelUtils.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.excel.core.util; +package cn.fuxiaoaio.ygg.framework.excel.core.util; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-excel/src/main/java/cn/fuxiaoaio/ygg/framework/excel/package-info.java similarity index 57% rename from yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-excel/src/main/java/cn/fuxiaoaio/ygg/framework/excel/package-info.java index 53bc5c01b..35a62a777 100644 --- a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-excel/src/main/java/cn/fuxiaoaio/ygg/framework/excel/package-info.java @@ -1,4 +1,4 @@ /** * 基于 EasyExcel 实现 Excel 相关的操作 */ -package cn.iocoder.yudao.framework.excel; +package cn.fuxiaoaio.ygg.framework.excel; diff --git a/yudao-framework/yudao-spring-boot-starter-file/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/pom.xml similarity index 86% rename from yudao-framework/yudao-spring-boot-starter-file/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/pom.xml index 905e0f7c1..1fee35b11 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/pom.xml @@ -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"> - yudao-framework - cn.iocoder.cloud + fuxiaoaio-framework + cn.fuxiaoaio.ygg ${revision} 4.0.0 - yudao-spring-boot-starter-file + fuxiaoaio-spring-boot-starter-file ${project.artifactId} 文件客户端，支持多种存储器 @@ -22,8 +22,8 @@ - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common @@ -74,8 +74,8 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-test + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-test test diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/config/YudaoFileAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/config/FuxiaoaioFileAutoConfiguration.java similarity index 59% rename from yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/config/YudaoFileAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/config/FuxiaoaioFileAutoConfiguration.java index e22ee3dd0..567524092 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/config/YudaoFileAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/config/FuxiaoaioFileAutoConfiguration.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.file.config; +package cn.fuxiaoaio.ygg.framework.file.config; -import cn.iocoder.yudao.framework.file.core.client.FileClientFactory; -import cn.iocoder.yudao.framework.file.core.client.FileClientFactoryImpl; +import cn.fuxiaoaio.ygg.framework.file.core.client.FileClientFactory; +import cn.fuxiaoaio.ygg.framework.file.core.client.FileClientFactoryImpl; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; @@ -11,7 +11,7 @@ import org.springframework.context.annotation.Bean; * @author 芋道源码 */ @AutoConfiguration -public class YudaoFileAutoConfiguration { +public class FuxiaoaioFileAutoConfiguration { @Bean public FileClientFactory fileClientFactory() { diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/AbstractFileClient.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/AbstractFileClient.java similarity index 96% rename from yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/AbstractFileClient.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/AbstractFileClient.java index a2d7304a8..e46fc5c76 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/AbstractFileClient.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/AbstractFileClient.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.file.core.client; +package cn.fuxiaoaio.ygg.framework.file.core.client; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/FileClient.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/FileClient.java similarity index 94% rename from yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/FileClient.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/FileClient.java index fb576d508..ac737b405 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/FileClient.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/FileClient.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.file.core.client; +package cn.fuxiaoaio.ygg.framework.file.core.client; /** * 文件客户端 diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/FileClientConfig.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/FileClientConfig.java similarity index 90% rename from yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/FileClientConfig.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/FileClientConfig.java index 9461c05d8..60c0b5428 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/FileClientConfig.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/FileClientConfig.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.file.core.client; +package cn.fuxiaoaio.ygg.framework.file.core.client; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/FileClientFactory.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/FileClientFactory.java similarity index 80% rename from yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/FileClientFactory.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/FileClientFactory.java index db90f4892..dee1a32e2 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/FileClientFactory.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/FileClientFactory.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.file.core.client; +package cn.fuxiaoaio.ygg.framework.file.core.client; public interface FileClientFactory { @@ -14,7 +14,7 @@ public interface FileClientFactory { * 创建文件客户端 * * @param configId 配置编号 - * @param storage 存储器的枚举 {@link cn.iocoder.yudao.framework.file.core.enums.FileStorageEnum} + * @param storage 存储器的枚举 {@link cn.fuxiaoaio.ygg.framework.file.core.enums.FileStorageEnum} * @param config 文件配置 */ void createOrUpdateFileClient(Long configId, Integer storage, Config config); diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/FileClientFactoryImpl.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/FileClientFactoryImpl.java similarity index 93% rename from yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/FileClientFactoryImpl.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/FileClientFactoryImpl.java index 980f8a310..e661ff5cb 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/FileClientFactoryImpl.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/FileClientFactoryImpl.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.file.core.client; +package cn.fuxiaoaio.ygg.framework.file.core.client; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ReflectUtil; -import cn.iocoder.yudao.framework.file.core.enums.FileStorageEnum; +import cn.fuxiaoaio.ygg.framework.file.core.enums.FileStorageEnum; import lombok.extern.slf4j.Slf4j; import java.util.concurrent.ConcurrentHashMap; diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/db/DBFileClient.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/db/DBFileClient.java similarity index 90% rename from yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/db/DBFileClient.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/db/DBFileClient.java index 1e2c082fe..1922474a8 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/db/DBFileClient.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/db/DBFileClient.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.file.core.client.db; +package cn.fuxiaoaio.ygg.framework.file.core.client.db; import cn.hutool.extra.spring.SpringUtil; -import cn.iocoder.yudao.framework.file.core.client.AbstractFileClient; +import cn.fuxiaoaio.ygg.framework.file.core.client.AbstractFileClient; /** * 基于 DB 存储的文件客户端的配置类 diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/db/DBFileClientConfig.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/db/DBFileClientConfig.java similarity index 78% rename from yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/db/DBFileClientConfig.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/db/DBFileClientConfig.java index 65d837b44..4402cf748 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/db/DBFileClientConfig.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/db/DBFileClientConfig.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.file.core.client.db; +package cn.fuxiaoaio.ygg.framework.file.core.client.db; -import cn.iocoder.yudao.framework.file.core.client.FileClientConfig; +import cn.fuxiaoaio.ygg.framework.file.core.client.FileClientConfig; import lombok.Data; import org.hibernate.validator.constraints.URL; diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/db/DBFileContentFrameworkDAO.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/db/DBFileContentFrameworkDAO.java similarity index 92% rename from yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/db/DBFileContentFrameworkDAO.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/db/DBFileContentFrameworkDAO.java index 9423e065d..821991c05 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/db/DBFileContentFrameworkDAO.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/db/DBFileContentFrameworkDAO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.file.core.client.db; +package cn.fuxiaoaio.ygg.framework.file.core.client.db; /** * 文件内容 Framework DAO 接口 diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/ftp/FtpFileClient.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/ftp/FtpFileClient.java similarity index 95% rename from yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/ftp/FtpFileClient.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/ftp/FtpFileClient.java index 796044f3f..8a155b285 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/ftp/FtpFileClient.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/ftp/FtpFileClient.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.file.core.client.ftp; +package cn.fuxiaoaio.ygg.framework.file.core.client.ftp; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.CharsetUtil; @@ -6,7 +6,7 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.extra.ftp.Ftp; import cn.hutool.extra.ftp.FtpException; import cn.hutool.extra.ftp.FtpMode; -import cn.iocoder.yudao.framework.file.core.client.AbstractFileClient; +import cn.fuxiaoaio.ygg.framework.file.core.client.AbstractFileClient; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/ftp/FtpFileClientConfig.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/ftp/FtpFileClientConfig.java similarity index 90% rename from yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/ftp/FtpFileClientConfig.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/ftp/FtpFileClientConfig.java index 5ccf86cd4..acd5c9f87 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/ftp/FtpFileClientConfig.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/ftp/FtpFileClientConfig.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.file.core.client.ftp; +package cn.fuxiaoaio.ygg.framework.file.core.client.ftp; -import cn.iocoder.yudao.framework.file.core.client.FileClientConfig; +import cn.fuxiaoaio.ygg.framework.file.core.client.FileClientConfig; import lombok.Data; import org.hibernate.validator.constraints.URL; diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/local/LocalFileClient.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/local/LocalFileClient.java similarity index 91% rename from yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/local/LocalFileClient.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/local/LocalFileClient.java index cac13f1fb..c104ec6a8 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/local/LocalFileClient.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/local/LocalFileClient.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.file.core.client.local; +package cn.fuxiaoaio.ygg.framework.file.core.client.local; import cn.hutool.core.io.FileUtil; -import cn.iocoder.yudao.framework.file.core.client.AbstractFileClient; +import cn.fuxiaoaio.ygg.framework.file.core.client.AbstractFileClient; import java.io.File; diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/local/LocalFileClientConfig.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/local/LocalFileClientConfig.java similarity index 81% rename from yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/local/LocalFileClientConfig.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/local/LocalFileClientConfig.java index 1f595ed89..799c6151a 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/local/LocalFileClientConfig.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/local/LocalFileClientConfig.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.file.core.client.local; +package cn.fuxiaoaio.ygg.framework.file.core.client.local; -import cn.iocoder.yudao.framework.file.core.client.FileClientConfig; +import cn.fuxiaoaio.ygg.framework.file.core.client.FileClientConfig; import lombok.Data; import org.hibernate.validator.constraints.URL; diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/s3/S3FileClient.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/s3/S3FileClient.java similarity index 94% rename from yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/s3/S3FileClient.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/s3/S3FileClient.java index b28051b76..e5eca1518 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/s3/S3FileClient.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/s3/S3FileClient.java @@ -1,15 +1,15 @@ -package cn.iocoder.yudao.framework.file.core.client.s3; +package cn.fuxiaoaio.ygg.framework.file.core.client.s3; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpUtil; -import cn.iocoder.yudao.framework.file.core.client.AbstractFileClient; +import cn.fuxiaoaio.ygg.framework.file.core.client.AbstractFileClient; import io.minio.*; import java.io.ByteArrayInputStream; -import static cn.iocoder.yudao.framework.file.core.client.s3.S3FileClientConfig.ENDPOINT_ALIYUN; -import static cn.iocoder.yudao.framework.file.core.client.s3.S3FileClientConfig.ENDPOINT_TENCENT; +import static cn.fuxiaoaio.ygg.framework.file.core.client.s3.S3FileClientConfig.ENDPOINT_ALIYUN; +import static cn.fuxiaoaio.ygg.framework.file.core.client.s3.S3FileClientConfig.ENDPOINT_TENCENT; /** * 基于 S3 协议的文件客户端，实现 MinIO、阿里云、腾讯云、七牛云、华为云等云服务 diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/s3/S3FileClientConfig.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/s3/S3FileClientConfig.java similarity index 95% rename from yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/s3/S3FileClientConfig.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/s3/S3FileClientConfig.java index 0c46e8aa6..f47aab8d2 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/s3/S3FileClientConfig.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/s3/S3FileClientConfig.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.file.core.client.s3; +package cn.fuxiaoaio.ygg.framework.file.core.client.s3; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.file.core.client.FileClientConfig; +import cn.fuxiaoaio.ygg.framework.file.core.client.FileClientConfig; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import org.hibernate.validator.constraints.URL; diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/sftp/SftpFileClient.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/sftp/SftpFileClient.java similarity index 89% rename from yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/sftp/SftpFileClient.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/sftp/SftpFileClient.java index facddcea0..b33987244 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/sftp/SftpFileClient.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/sftp/SftpFileClient.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.framework.file.core.client.sftp; +package cn.fuxiaoaio.ygg.framework.file.core.client.sftp; import cn.hutool.core.io.FileUtil; import cn.hutool.extra.ssh.Sftp; -import cn.iocoder.yudao.framework.common.util.io.FileUtils; -import cn.iocoder.yudao.framework.file.core.client.AbstractFileClient; +import cn.fuxiaoaio.ygg.framework.common.util.io.FileUtils; +import cn.fuxiaoaio.ygg.framework.file.core.client.AbstractFileClient; import java.io.File; diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/sftp/SftpFileClientConfig.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/sftp/SftpFileClientConfig.java similarity index 89% rename from yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/sftp/SftpFileClientConfig.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/sftp/SftpFileClientConfig.java index 1a976f5d9..29224634f 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/sftp/SftpFileClientConfig.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/client/sftp/SftpFileClientConfig.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.file.core.client.sftp; +package cn.fuxiaoaio.ygg.framework.file.core.client.sftp; -import cn.iocoder.yudao.framework.file.core.client.FileClientConfig; +import cn.fuxiaoaio.ygg.framework.file.core.client.FileClientConfig; import lombok.Data; import org.hibernate.validator.constraints.URL; diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/enums/FileStorageEnum.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/enums/FileStorageEnum.java similarity index 56% rename from yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/enums/FileStorageEnum.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/enums/FileStorageEnum.java index 03c6ed8a7..dfdfd7018 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/enums/FileStorageEnum.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/enums/FileStorageEnum.java @@ -1,18 +1,18 @@ -package cn.iocoder.yudao.framework.file.core.enums; +package cn.fuxiaoaio.ygg.framework.file.core.enums; import cn.hutool.core.util.ArrayUtil; -import cn.iocoder.yudao.framework.file.core.client.FileClient; -import cn.iocoder.yudao.framework.file.core.client.FileClientConfig; -import cn.iocoder.yudao.framework.file.core.client.db.DBFileClient; -import cn.iocoder.yudao.framework.file.core.client.db.DBFileClientConfig; -import cn.iocoder.yudao.framework.file.core.client.ftp.FtpFileClient; -import cn.iocoder.yudao.framework.file.core.client.ftp.FtpFileClientConfig; -import cn.iocoder.yudao.framework.file.core.client.local.LocalFileClient; -import cn.iocoder.yudao.framework.file.core.client.local.LocalFileClientConfig; -import cn.iocoder.yudao.framework.file.core.client.s3.S3FileClient; -import cn.iocoder.yudao.framework.file.core.client.s3.S3FileClientConfig; -import cn.iocoder.yudao.framework.file.core.client.sftp.SftpFileClient; -import cn.iocoder.yudao.framework.file.core.client.sftp.SftpFileClientConfig; +import cn.fuxiaoaio.ygg.framework.file.core.client.FileClient; +import cn.fuxiaoaio.ygg.framework.file.core.client.FileClientConfig; +import cn.fuxiaoaio.ygg.framework.file.core.client.db.DBFileClient; +import cn.fuxiaoaio.ygg.framework.file.core.client.db.DBFileClientConfig; +import cn.fuxiaoaio.ygg.framework.file.core.client.ftp.FtpFileClient; +import cn.fuxiaoaio.ygg.framework.file.core.client.ftp.FtpFileClientConfig; +import cn.fuxiaoaio.ygg.framework.file.core.client.local.LocalFileClient; +import cn.fuxiaoaio.ygg.framework.file.core.client.local.LocalFileClientConfig; +import cn.fuxiaoaio.ygg.framework.file.core.client.s3.S3FileClient; +import cn.fuxiaoaio.ygg.framework.file.core.client.s3.S3FileClientConfig; +import cn.fuxiaoaio.ygg.framework.file.core.client.sftp.SftpFileClient; +import cn.fuxiaoaio.ygg.framework.file.core.client.sftp.SftpFileClientConfig; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/utils/FileTypeUtils.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/utils/FileTypeUtils.java similarity index 96% rename from yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/utils/FileTypeUtils.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/utils/FileTypeUtils.java index 8b99227b1..2bca0ca91 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/utils/FileTypeUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/java/cn/fuxiaoaio/ygg/framework/file/core/utils/FileTypeUtils.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.file.core.utils; +package cn.fuxiaoaio.ygg.framework.file.core.utils; import com.alibaba.ttl.TransmittableThreadLocal; import lombok.SneakyThrows; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..87b2084a5 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +cn.fuxiaoaio.ygg.framework.file.config.FuxiaoaioFileAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/config/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/test/java/cn/fuxiaoaio/ygg/framework/file/config/package-info.java similarity index 56% rename from yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/config/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/test/java/cn/fuxiaoaio/ygg/framework/file/config/package-info.java index 113f3e5e5..32be6f564 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/config/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/test/java/cn/fuxiaoaio/ygg/framework/file/config/package-info.java @@ -1,4 +1,4 @@ /** * 占位，避免 package 无法提交到 Git 仓库 */ -package cn.iocoder.yudao.framework.file.config; +package cn.fuxiaoaio.ygg.framework.file.config; diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/ftp/FtpFileClientTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/test/java/cn/fuxiaoaio/ygg/framework/file/core/client/ftp/FtpFileClientTest.java similarity index 95% rename from yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/ftp/FtpFileClientTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/test/java/cn/fuxiaoaio/ygg/framework/file/core/client/ftp/FtpFileClientTest.java index 619e52db8..6ac48c600 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/ftp/FtpFileClientTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/test/java/cn/fuxiaoaio/ygg/framework/file/core/client/ftp/FtpFileClientTest.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.file.core.client.ftp; +package cn.fuxiaoaio.ygg.framework.file.core.client.ftp; import cn.hutool.core.io.resource.ResourceUtil; import cn.hutool.core.util.IdUtil; diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/local/LocalFileClientTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/test/java/cn/fuxiaoaio/ygg/framework/file/core/client/local/LocalFileClientTest.java similarity index 93% rename from yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/local/LocalFileClientTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/test/java/cn/fuxiaoaio/ygg/framework/file/core/client/local/LocalFileClientTest.java index d48609bc6..ca76f6db4 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/local/LocalFileClientTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/test/java/cn/fuxiaoaio/ygg/framework/file/core/client/local/LocalFileClientTest.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.file.core.client.local; +package cn.fuxiaoaio.ygg.framework.file.core.client.local; import cn.hutool.core.io.resource.ResourceUtil; import cn.hutool.core.util.IdUtil; diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/s3/S3FileClientTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/test/java/cn/fuxiaoaio/ygg/framework/file/core/client/s3/S3FileClientTest.java similarity index 92% rename from yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/s3/S3FileClientTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/test/java/cn/fuxiaoaio/ygg/framework/file/core/client/s3/S3FileClientTest.java index 1d0ed2091..8a84b65a8 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/s3/S3FileClientTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/test/java/cn/fuxiaoaio/ygg/framework/file/core/client/s3/S3FileClientTest.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.file.core.client.s3; +package cn.fuxiaoaio.ygg.framework.file.core.client.s3; import cn.hutool.core.io.resource.ResourceUtil; import cn.hutool.core.util.IdUtil; -import cn.iocoder.yudao.framework.common.util.validation.ValidationUtils; +import cn.fuxiaoaio.ygg.framework.common.util.validation.ValidationUtils; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -17,7 +17,7 @@ public class S3FileClientTest { // 配置成你自己的 config.setAccessKey("admin"); config.setAccessSecret("password"); - config.setBucket("yudaoyuanma"); + config.setBucket("fuxiaoaioyuanma"); config.setDomain(null); // 默认 9000 endpoint config.setEndpoint("http://127.0.0.1:9000"); @@ -68,7 +68,7 @@ public class S3FileClientTest { config.setAccessKey("b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8"); config.setAccessSecret("kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP"); config.setBucket("ruoyi-vue-pro"); - config.setDomain("http://test.yudao.iocoder.cn"); // 如果有自定义域名，则可以设置。http://static.yudao.iocoder.cn + config.setDomain("http://test.fuxiaoaio.iocoder.cn"); // 如果有自定义域名，则可以设置。http://static.fuxiaoaio.iocoder.cn // 默认上海的 endpoint config.setEndpoint("s3-cn-south-1.qiniucs.com"); @@ -83,7 +83,7 @@ public class S3FileClientTest { // 配置成你自己的 // config.setAccessKey(System.getenv("HUAWEI_CLOUD_ACCESS_KEY")); // config.setAccessSecret(System.getenv("HUAWEI_CLOUD_SECRET_KEY")); - config.setBucket("yudao"); + config.setBucket("fuxiaoaio"); config.setDomain(null); // 如果有自定义域名，则可以设置。 // 默认上海的 endpoint config.setEndpoint("obs.cn-east-3.myhuaweicloud.com"); diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/sftp/SftpFileClientTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/test/java/cn/fuxiaoaio/ygg/framework/file/core/client/sftp/SftpFileClientTest.java similarity index 95% rename from yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/sftp/SftpFileClientTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/test/java/cn/fuxiaoaio/ygg/framework/file/core/client/sftp/SftpFileClientTest.java index 4785c0d89..fed7fef7b 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/sftp/SftpFileClientTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/test/java/cn/fuxiaoaio/ygg/framework/file/core/client/sftp/SftpFileClientTest.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.file.core.client.sftp; +package cn.fuxiaoaio.ygg.framework.file.core.client.sftp; import cn.hutool.core.io.resource.ResourceUtil; import cn.hutool.core.util.IdUtil; diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/enums/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/test/java/cn/fuxiaoaio/ygg/framework/file/core/enums/package-info.java similarity index 54% rename from yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/enums/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/test/java/cn/fuxiaoaio/ygg/framework/file/core/enums/package-info.java index e1da5db23..0722ef3e8 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/enums/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/test/java/cn/fuxiaoaio/ygg/framework/file/core/enums/package-info.java @@ -1,4 +1,4 @@ /** * 占位，避免 package 无法提交到 Git 仓库 */ -package cn.iocoder.yudao.framework.file.core.enums; +package cn.fuxiaoaio.ygg.framework.file.core.enums; diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/test/resources/file/erweima.jpg b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/test/resources/file/erweima.jpg similarity index 100% rename from yudao-framework/yudao-spring-boot-starter-file/src/test/resources/file/erweima.jpg rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-file/src/test/resources/file/erweima.jpg diff --git a/yudao-framework/yudao-spring-boot-starter-flowable/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-flowable/pom.xml similarity index 69% rename from yudao-framework/yudao-spring-boot-starter-flowable/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-flowable/pom.xml index 8a6f33889..464277acb 100644 --- a/yudao-framework/yudao-spring-boot-starter-flowable/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-flowable/pom.xml @@ -3,24 +3,24 @@ 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"> - yudao-framework - cn.iocoder.cloud + fuxiaoaio-framework + cn.fuxiaoaio.ygg ${revision} 4.0.0 - yudao-spring-boot-starter-flowable + fuxiaoaio-spring-boot-starter-flowable - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common - cn.iocoder.cloud - yudao-spring-boot-starter-security + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-security diff --git a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/config/YudaoFlowableConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-flowable/src/main/java/cn/fuxiaoaio/ygg/framework/flowable/config/FuxiaoaioFlowableConfiguration.java similarity index 73% rename from yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/config/YudaoFlowableConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-flowable/src/main/java/cn/fuxiaoaio/ygg/framework/flowable/config/FuxiaoaioFlowableConfiguration.java index 7b5f1d47c..d59099298 100644 --- a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/config/YudaoFlowableConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-flowable/src/main/java/cn/fuxiaoaio/ygg/framework/flowable/config/FuxiaoaioFlowableConfiguration.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.framework.flowable.config; +package cn.fuxiaoaio.ygg.framework.flowable.config; -import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum; -import cn.iocoder.yudao.framework.flowable.core.web.FlowableWebFilter; +import cn.fuxiaoaio.ygg.framework.common.enums.WebFilterOrderEnum; +import cn.fuxiaoaio.ygg.framework.flowable.core.web.FlowableWebFilter; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; @AutoConfiguration -public class YudaoFlowableConfiguration { +public class FuxiaoaioFlowableConfiguration { /** * 配置 flowable Web 过滤器 diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-flowable/src/main/java/cn/fuxiaoaio/ygg/framework/flowable/core/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-flowable/src/main/java/cn/fuxiaoaio/ygg/framework/flowable/core/package-info.java new file mode 100644 index 000000000..a740ca3b0 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-flowable/src/main/java/cn/fuxiaoaio/ygg/framework/flowable/core/package-info.java @@ -0,0 +1 @@ +package cn.fuxiaoaio.ygg.framework.flowable.core; diff --git a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/util/FlowableUtils.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-flowable/src/main/java/cn/fuxiaoaio/ygg/framework/flowable/core/util/FlowableUtils.java similarity index 97% rename from yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/util/FlowableUtils.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-flowable/src/main/java/cn/fuxiaoaio/ygg/framework/flowable/core/util/FlowableUtils.java index b41f678d6..78c3a63f3 100644 --- a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/util/FlowableUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-flowable/src/main/java/cn/fuxiaoaio/ygg/framework/flowable/core/util/FlowableUtils.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.flowable.core.util; +package cn.fuxiaoaio.ygg.framework.flowable.core.util; import org.flowable.bpmn.converter.BpmnXMLConverter; import org.flowable.bpmn.model.BpmnModel; diff --git a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/web/FlowableWebFilter.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-flowable/src/main/java/cn/fuxiaoaio/ygg/framework/flowable/core/web/FlowableWebFilter.java similarity index 85% rename from yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/web/FlowableWebFilter.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-flowable/src/main/java/cn/fuxiaoaio/ygg/framework/flowable/core/web/FlowableWebFilter.java index d9845a394..7ba52d9a5 100644 --- a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/web/FlowableWebFilter.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-flowable/src/main/java/cn/fuxiaoaio/ygg/framework/flowable/core/web/FlowableWebFilter.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.flowable.core.web; +package cn.fuxiaoaio.ygg.framework.flowable.core.web; -import cn.iocoder.yudao.framework.flowable.core.util.FlowableUtils; -import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; +import cn.fuxiaoaio.ygg.framework.flowable.core.util.FlowableUtils; +import cn.fuxiaoaio.ygg.framework.security.core.util.SecurityFrameworkUtils; import org.springframework.web.filter.OncePerRequestFilter; import javax.servlet.FilterChain; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-flowable/src/main/java/cn/fuxiaoaio/ygg/framework/flowable/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-flowable/src/main/java/cn/fuxiaoaio/ygg/framework/flowable/package-info.java new file mode 100644 index 000000000..e20bea3f5 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-flowable/src/main/java/cn/fuxiaoaio/ygg/framework/flowable/package-info.java @@ -0,0 +1 @@ +package cn.fuxiaoaio.ygg.framework.flowable; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-flowable/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-flowable/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..d9d23c582 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-flowable/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +cn.fuxiaoaio.ygg.framework.flowable.config.FuxiaoaioFlowableConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-job/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-job/pom.xml similarity index 84% rename from yudao-framework/yudao-spring-boot-starter-job/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-job/pom.xml index 012a0fb46..55dae157a 100644 --- a/yudao-framework/yudao-spring-boot-starter-job/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-job/pom.xml @@ -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"> - cn.iocoder.cloud - yudao-framework + cn.fuxiaoaio.ygg + fuxiaoaio-framework ${revision} 4.0.0 - yudao-spring-boot-starter-job + fuxiaoaio-spring-boot-starter-job jar ${project.artifactId} @@ -17,8 +17,8 @@ - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common diff --git a/yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/config/YudaoAsyncAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-job/src/main/java/cn/fuxiaoaio/ygg/framework/quartz/config/FuxiaoaioAsyncAutoConfiguration.java similarity index 92% rename from yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/config/YudaoAsyncAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-job/src/main/java/cn/fuxiaoaio/ygg/framework/quartz/config/FuxiaoaioAsyncAutoConfiguration.java index bcf0e65ac..d007c8ddb 100644 --- a/yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/config/YudaoAsyncAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-job/src/main/java/cn/fuxiaoaio/ygg/framework/quartz/config/FuxiaoaioAsyncAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.quartz.config; +package cn.fuxiaoaio.ygg.framework.quartz.config; import com.alibaba.ttl.TtlRunnable; import org.springframework.beans.BeansException; @@ -14,7 +14,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; */ @AutoConfiguration @EnableAsync -public class YudaoAsyncAutoConfiguration { +public class FuxiaoaioAsyncAutoConfiguration { @Bean public BeanPostProcessor threadPoolTaskExecutorBeanPostProcessor() { diff --git a/yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/config/YudaoXxlJobAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-job/src/main/java/cn/fuxiaoaio/ygg/framework/quartz/config/FuxiaoaioXxlJobAutoConfiguration.java similarity index 95% rename from yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/config/YudaoXxlJobAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-job/src/main/java/cn/fuxiaoaio/ygg/framework/quartz/config/FuxiaoaioXxlJobAutoConfiguration.java index 6fa99cc1d..d3a287458 100644 --- a/yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/config/YudaoXxlJobAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-job/src/main/java/cn/fuxiaoaio/ygg/framework/quartz/config/FuxiaoaioXxlJobAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.quartz.config; +package cn.fuxiaoaio.ygg.framework.quartz.config; import com.xxl.job.core.executor.XxlJobExecutor; import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; @@ -23,7 +23,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; @EnableConfigurationProperties({XxlJobProperties.class}) @EnableScheduling // 开启 Spring 自带的定时任务 @Slf4j -public class YudaoXxlJobAutoConfiguration { +public class FuxiaoaioXxlJobAutoConfiguration { @Bean @ConditionalOnMissingBean diff --git a/yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/config/XxlJobProperties.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-job/src/main/java/cn/fuxiaoaio/ygg/framework/quartz/config/XxlJobProperties.java similarity index 97% rename from yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/config/XxlJobProperties.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-job/src/main/java/cn/fuxiaoaio/ygg/framework/quartz/config/XxlJobProperties.java index 037c0ce02..5aabaad18 100644 --- a/yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/config/XxlJobProperties.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-job/src/main/java/cn/fuxiaoaio/ygg/framework/quartz/config/XxlJobProperties.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.quartz.config; +package cn.fuxiaoaio.ygg.framework.quartz.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-job/src/main/java/cn/fuxiaoaio/ygg/framework/quartz/package-info.java similarity index 72% rename from yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-job/src/main/java/cn/fuxiaoaio/ygg/framework/quartz/package-info.java index 9781e8223..6e30b20be 100644 --- a/yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-job/src/main/java/cn/fuxiaoaio/ygg/framework/quartz/package-info.java @@ -2,4 +2,4 @@ * 1. 定时任务，基于 XXL-Job 实现。 * 2. 异步任务，采用 Spring Async 异步执行。 */ -package cn.iocoder.yudao.framework.quartz; +package cn.fuxiaoaio.ygg.framework.quartz; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..89d388843 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +cn.fuxiaoaio.ygg.framework.quartz.config.FuxiaoaioXxlJobAutoConfiguration +cn.fuxiaoaio.ygg.framework.quartz.config.FuxiaoaioAsyncAutoConfiguration diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-job/《芋道 Spring Boot 定时任务入门》.md b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-job/《芋道 Spring Boot 定时任务入门》.md new file mode 100644 index 000000000..105e8159c --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-job/《芋道 Spring Boot 定时任务入门》.md @@ -0,0 +1 @@ + diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-job/《芋道 Spring Boot 异步任务入门》.md b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-job/《芋道 Spring Boot 异步任务入门》.md new file mode 100644 index 000000000..17078cbeb --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-job/《芋道 Spring Boot 异步任务入门》.md @@ -0,0 +1 @@ + diff --git a/yudao-framework/yudao-spring-boot-starter-monitor/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/pom.xml similarity index 90% rename from yudao-framework/yudao-spring-boot-starter-monitor/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/pom.xml index bc8d235be..93bdc8b70 100644 --- a/yudao-framework/yudao-spring-boot-starter-monitor/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/pom.xml @@ -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"> - cn.iocoder.cloud - yudao-framework + cn.fuxiaoaio.ygg + fuxiaoaio-framework ${revision} 4.0.0 - yudao-spring-boot-starter-monitor + fuxiaoaio-spring-boot-starter-monitor jar ${project.artifactId} @@ -17,8 +17,8 @@ - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common diff --git a/yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/config/YudaoMetricsAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/java/cn/fuxiaoaio/ygg/framework/tracer/config/FuxiaoaioMetricsAutoConfiguration.java similarity index 78% rename from yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/config/YudaoMetricsAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/java/cn/fuxiaoaio/ygg/framework/tracer/config/FuxiaoaioMetricsAutoConfiguration.java index 9b75d960c..a9bd7621d 100644 --- a/yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/config/YudaoMetricsAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/java/cn/fuxiaoaio/ygg/framework/tracer/config/FuxiaoaioMetricsAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.tracer.config; +package cn.fuxiaoaio.ygg.framework.tracer.config; import io.micrometer.core.instrument.MeterRegistry; import org.springframework.beans.factory.annotation.Value; @@ -16,8 +16,8 @@ import org.springframework.context.annotation.Configuration; */ @AutoConfiguration @ConditionalOnClass({MeterRegistryCustomizer.class}) -@ConditionalOnProperty(prefix = "yudao.metrics", value = "enable", matchIfMissing = true) // 允许使用 yudao.metrics.enable=false 禁用 Metrics -public class YudaoMetricsAutoConfiguration { +@ConditionalOnProperty(prefix = "fuxiaoaio.metrics", value = "enable", matchIfMissing = true) // 允许使用 fuxiaoaio.metrics.enable=false 禁用 Metrics +public class FuxiaoaioMetricsAutoConfiguration { @Bean public MeterRegistryCustomizer metricsCommonTags( diff --git a/yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/config/YudaoTracerAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/java/cn/fuxiaoaio/ygg/framework/tracer/config/FuxiaoaioTracerAutoConfiguration.java similarity index 82% rename from yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/config/YudaoTracerAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/java/cn/fuxiaoaio/ygg/framework/tracer/config/FuxiaoaioTracerAutoConfiguration.java index c0d097517..f9a3cd253 100644 --- a/yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/config/YudaoTracerAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/java/cn/fuxiaoaio/ygg/framework/tracer/config/FuxiaoaioTracerAutoConfiguration.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.tracer.config; +package cn.fuxiaoaio.ygg.framework.tracer.config; -import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum; -import cn.iocoder.yudao.framework.tracer.core.aop.BizTraceAspect; -import cn.iocoder.yudao.framework.tracer.core.filter.TraceFilter; +import cn.fuxiaoaio.ygg.framework.common.enums.WebFilterOrderEnum; +import cn.fuxiaoaio.ygg.framework.tracer.core.aop.BizTraceAspect; +import cn.fuxiaoaio.ygg.framework.tracer.core.filter.TraceFilter; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -19,8 +19,8 @@ import org.springframework.context.annotation.Configuration; @AutoConfiguration @ConditionalOnClass({BizTraceAspect.class}) @EnableConfigurationProperties(TracerProperties.class) -@ConditionalOnProperty(prefix = "yudao.tracer", value = "enable", matchIfMissing = true) -public class YudaoTracerAutoConfiguration { +@ConditionalOnProperty(prefix = "fuxiaoaio.tracer", value = "enable", matchIfMissing = true) +public class FuxiaoaioTracerAutoConfiguration { // TODO @芋艿：重要。目前 opentracing 版本存在冲突，要么保证 skywalking，要么保证阿里云短信 sdk // @Bean diff --git a/yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/config/TracerProperties.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/java/cn/fuxiaoaio/ygg/framework/tracer/config/TracerProperties.java similarity index 66% rename from yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/config/TracerProperties.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/java/cn/fuxiaoaio/ygg/framework/tracer/config/TracerProperties.java index 11d25a869..4e0001225 100644 --- a/yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/config/TracerProperties.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/java/cn/fuxiaoaio/ygg/framework/tracer/config/TracerProperties.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.tracer.config; +package cn.fuxiaoaio.ygg.framework.tracer.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -8,7 +8,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * * @author 麻薯 */ -@ConfigurationProperties("yudao.tracer") +@ConfigurationProperties("fuxiaoaio.tracer") @Data public class TracerProperties { } diff --git a/yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/core/annotation/BizTrace.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/java/cn/fuxiaoaio/ygg/framework/tracer/core/annotation/BizTrace.java similarity index 93% rename from yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/core/annotation/BizTrace.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/java/cn/fuxiaoaio/ygg/framework/tracer/core/annotation/BizTrace.java index 8b121400a..0bf06a2e4 100644 --- a/yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/core/annotation/BizTrace.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/java/cn/fuxiaoaio/ygg/framework/tracer/core/annotation/BizTrace.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.tracer.core.annotation; +package cn.fuxiaoaio.ygg.framework.tracer.core.annotation; import java.lang.annotation.*; diff --git a/yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/core/aop/BizTraceAspect.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/java/cn/fuxiaoaio/ygg/framework/tracer/core/aop/BizTraceAspect.java similarity index 90% rename from yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/core/aop/BizTraceAspect.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/java/cn/fuxiaoaio/ygg/framework/tracer/core/aop/BizTraceAspect.java index 3c3b9f3bb..92c1954bc 100644 --- a/yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/core/aop/BizTraceAspect.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/java/cn/fuxiaoaio/ygg/framework/tracer/core/aop/BizTraceAspect.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.framework.tracer.core.aop; +package cn.fuxiaoaio.ygg.framework.tracer.core.aop; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.tracer.core.annotation.BizTrace; -import cn.iocoder.yudao.framework.common.util.spring.SpringExpressionUtils; -import cn.iocoder.yudao.framework.tracer.core.util.TracerFrameworkUtils; +import cn.fuxiaoaio.ygg.framework.tracer.core.annotation.BizTrace; +import cn.fuxiaoaio.ygg.framework.common.util.spring.SpringExpressionUtils; +import cn.fuxiaoaio.ygg.framework.tracer.core.util.TracerFrameworkUtils; import io.opentracing.Span; import io.opentracing.Tracer; import io.opentracing.tag.Tags; diff --git a/yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/core/filter/TraceFilter.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/java/cn/fuxiaoaio/ygg/framework/tracer/core/filter/TraceFilter.java similarity index 88% rename from yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/core/filter/TraceFilter.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/java/cn/fuxiaoaio/ygg/framework/tracer/core/filter/TraceFilter.java index 91ac30fd5..ca54d3bc5 100644 --- a/yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/core/filter/TraceFilter.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/java/cn/fuxiaoaio/ygg/framework/tracer/core/filter/TraceFilter.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.tracer.core.filter; +package cn.fuxiaoaio.ygg.framework.tracer.core.filter; -import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils; +import cn.fuxiaoaio.ygg.framework.common.util.monitor.TracerUtils; import org.springframework.web.filter.OncePerRequestFilter; import javax.servlet.FilterChain; diff --git a/yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/core/util/TracerFrameworkUtils.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/java/cn/fuxiaoaio/ygg/framework/tracer/core/util/TracerFrameworkUtils.java similarity index 96% rename from yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/core/util/TracerFrameworkUtils.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/java/cn/fuxiaoaio/ygg/framework/tracer/core/util/TracerFrameworkUtils.java index 51323e7c2..285cac15c 100644 --- a/yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/core/util/TracerFrameworkUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/java/cn/fuxiaoaio/ygg/framework/tracer/core/util/TracerFrameworkUtils.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.tracer.core.util; +package cn.fuxiaoaio.ygg.framework.tracer.core.util; import io.opentracing.Span; import io.opentracing.tag.Tags; diff --git a/yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/java/cn/fuxiaoaio/ygg/framework/tracer/package-info.java similarity index 70% rename from yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/java/cn/fuxiaoaio/ygg/framework/tracer/package-info.java index 43ee5e475..4be77c760 100644 --- a/yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/java/cn/fuxiaoaio/ygg/framework/tracer/package-info.java @@ -3,4 +3,4 @@ * * @author 芋道源码 */ -package cn.iocoder.yudao.framework.tracer; +package cn.fuxiaoaio.ygg.framework.tracer; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..a90ef2a92 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +cn.fuxiaoaio.ygg.framework.tracer.config.FuxiaoaioTracerAutoConfiguration +cn.fuxiaoaio.ygg.framework.tracer.config.FuxiaoaioMetricsAutoConfiguration diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md new file mode 100644 index 000000000..b12f82e4c --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md @@ -0,0 +1 @@ + diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/《芋道 Spring Boot 监控端点 Actuator 入门》.md b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/《芋道 Spring Boot 监控端点 Actuator 入门》.md new file mode 100644 index 000000000..a38266709 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/《芋道 Spring Boot 监控端点 Actuator 入门》.md @@ -0,0 +1 @@ + diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md new file mode 100644 index 000000000..be5204d69 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-monitor/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md @@ -0,0 +1 @@ + diff --git a/yudao-framework/yudao-spring-boot-starter-mq/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mq/pom.xml similarity index 89% rename from yudao-framework/yudao-spring-boot-starter-mq/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mq/pom.xml index 5a6b4b1ec..8f1b7ff0d 100644 --- a/yudao-framework/yudao-spring-boot-starter-mq/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mq/pom.xml @@ -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"> - cn.iocoder.cloud - yudao-framework + cn.fuxiaoaio.ygg + fuxiaoaio-framework ${revision} 4.0.0 - yudao-spring-boot-starter-mq + fuxiaoaio-spring-boot-starter-mq jar ${project.artifactId} diff --git a/yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/config/YudaoMQAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mq/src/main/java/cn/fuxiaoaio/ygg/framework/mq/config/FuxiaoaioMQAutoConfiguration.java similarity index 94% rename from yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/config/YudaoMQAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mq/src/main/java/cn/fuxiaoaio/ygg/framework/mq/config/FuxiaoaioMQAutoConfiguration.java index 32ff82c8c..b9d42092e 100644 --- a/yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/config/YudaoMQAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mq/src/main/java/cn/fuxiaoaio/ygg/framework/mq/config/FuxiaoaioMQAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.mq.config; +package cn.fuxiaoaio.ygg.framework.mq.config; import com.alibaba.cloud.stream.binder.rocketmq.convert.RocketMQMessageConverter; import org.springframework.boot.autoconfigure.AutoConfiguration; @@ -17,7 +17,7 @@ import java.util.List; * @author 芋道源码 */ @AutoConfiguration -public class YudaoMQAutoConfiguration { +public class FuxiaoaioMQAutoConfiguration { /** * 覆盖 {@link RocketMQMessageConverter} 的配置，去掉 fastjson 的转换器，解决不兼容的问题 diff --git a/yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/core/bus/AbstractBusProducer.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mq/src/main/java/cn/fuxiaoaio/ygg/framework/mq/core/bus/AbstractBusProducer.java similarity index 95% rename from yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/core/bus/AbstractBusProducer.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mq/src/main/java/cn/fuxiaoaio/ygg/framework/mq/core/bus/AbstractBusProducer.java index 9c85299fa..235ead024 100644 --- a/yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/core/bus/AbstractBusProducer.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mq/src/main/java/cn/fuxiaoaio/ygg/framework/mq/core/bus/AbstractBusProducer.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.mq.core.bus; +package cn.fuxiaoaio.ygg.framework.mq.core.bus; import org.springframework.beans.factory.annotation.Value; import org.springframework.cloud.bus.ServiceMatcher; diff --git a/yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/core/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mq/src/main/java/cn/fuxiaoaio/ygg/framework/mq/core/package-info.java similarity index 54% rename from yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/core/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mq/src/main/java/cn/fuxiaoaio/ygg/framework/mq/core/package-info.java index 9953ae6e0..f06ee9f90 100644 --- a/yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/core/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mq/src/main/java/cn/fuxiaoaio/ygg/framework/mq/core/package-info.java @@ -1,4 +1,4 @@ /** * TODO 芋艿，后续删除，临时占位 */ -package cn.iocoder.yudao.framework.mq.core; +package cn.fuxiaoaio.ygg.framework.mq.core; diff --git a/yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mq/src/main/java/cn/fuxiaoaio/ygg/framework/mq/package-info.java similarity index 76% rename from yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mq/src/main/java/cn/fuxiaoaio/ygg/framework/mq/package-info.java index 48eaf2386..b97253b9d 100644 --- a/yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mq/src/main/java/cn/fuxiaoaio/ygg/framework/mq/package-info.java @@ -3,4 +3,4 @@ * 1. 基于 Pub/Sub 实现广播消费 * 2. 基于 Stream 实现集群消费 */ -package cn.iocoder.yudao.framework.mq; +package cn.fuxiaoaio.ygg.framework.mq; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mq/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mq/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..fe02d9e28 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mq/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +cn.fuxiaoaio.ygg.framework.mq.config.FuxiaoaioMQAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/pom.xml similarity index 84% rename from yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/pom.xml index 4bb35b106..f038bea02 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/pom.xml @@ -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"> - cn.iocoder.cloud - yudao-framework + cn.fuxiaoaio.ygg + fuxiaoaio-framework ${revision} 4.0.0 - yudao-spring-boot-starter-mybatis + fuxiaoaio-spring-boot-starter-mybatis jar ${project.artifactId} @@ -17,14 +17,14 @@ - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common - cn.iocoder.cloud - yudao-spring-boot-starter-web + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-web provided diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/datasource/config/YudaoDataSourceAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/datasource/config/FuxiaoaioDataSourceAutoConfiguration.java similarity index 90% rename from yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/datasource/config/YudaoDataSourceAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/datasource/config/FuxiaoaioDataSourceAutoConfiguration.java index ccb8ef0fe..75f260dc5 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/datasource/config/YudaoDataSourceAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/datasource/config/FuxiaoaioDataSourceAutoConfiguration.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.datasource.config; +package cn.fuxiaoaio.ygg.framework.datasource.config; -import cn.iocoder.yudao.framework.datasource.core.filter.DruidAdRemoveFilter; +import cn.fuxiaoaio.ygg.framework.datasource.core.filter.DruidAdRemoveFilter; import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -17,7 +17,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @Configuration @EnableTransactionManagement(proxyTargetClass = true) // 启动事务管理 @EnableConfigurationProperties(DruidStatProperties.class) -public class YudaoDataSourceAutoConfiguration { +public class FuxiaoaioDataSourceAutoConfiguration { /** * 创建 DruidAdRemoveFilter 过滤器，过滤 common.js 的广告 diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/datasource/core/enums/DataSourceEnum.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/datasource/core/enums/DataSourceEnum.java similarity index 91% rename from yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/datasource/core/enums/DataSourceEnum.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/datasource/core/enums/DataSourceEnum.java index c99a256ce..e77ac1d16 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/datasource/core/enums/DataSourceEnum.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/datasource/core/enums/DataSourceEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.datasource.core.enums; +package cn.fuxiaoaio.ygg.framework.datasource.core.enums; /** * 对应于多数据源中不同数据源配置 diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/datasource/core/filter/DruidAdRemoveFilter.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/datasource/core/filter/DruidAdRemoveFilter.java similarity index 95% rename from yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/datasource/core/filter/DruidAdRemoveFilter.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/datasource/core/filter/DruidAdRemoveFilter.java index 78e8a3e64..088f0da66 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/datasource/core/filter/DruidAdRemoveFilter.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/datasource/core/filter/DruidAdRemoveFilter.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.datasource.core.filter; +package cn.fuxiaoaio.ygg.framework.datasource.core.filter; import com.alibaba.druid.util.Utils; import org.springframework.web.filter.OncePerRequestFilter; diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/datasource/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/datasource/package-info.java similarity index 62% rename from yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/datasource/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/datasource/package-info.java index 8512891d7..0b000e84c 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/datasource/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/datasource/package-info.java @@ -2,4 +2,4 @@ * 数据库连接池，采用 Druid * 多数据源，采用爆米花 */ -package cn.iocoder.yudao.framework.datasource; +package cn.fuxiaoaio.ygg.framework.datasource; diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/expression/AndExpressionX.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/expression/AndExpressionX.java similarity index 92% rename from yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/expression/AndExpressionX.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/expression/AndExpressionX.java index 54198e496..bdd0dd3c9 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/expression/AndExpressionX.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/expression/AndExpressionX.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.expression; +package cn.fuxiaoaio.ygg.framework.expression; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.operators.conditional.AndExpression; diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/expression/OrExpressionX.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/expression/OrExpressionX.java similarity index 92% rename from yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/expression/OrExpressionX.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/expression/OrExpressionX.java index 19b4695cf..c507d3f73 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/expression/OrExpressionX.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/expression/OrExpressionX.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.expression; +package cn.fuxiaoaio.ygg.framework.expression; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.operators.conditional.OrExpression; diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/config/YudaoMybatisAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/config/FuxiaoaioMybatisAutoConfiguration.java similarity index 90% rename from yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/config/YudaoMybatisAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/config/FuxiaoaioMybatisAutoConfiguration.java index bf15bfa5f..a1f874081 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/config/YudaoMybatisAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/config/FuxiaoaioMybatisAutoConfiguration.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.mybatis.config; +package cn.fuxiaoaio.ygg.framework.mybatis.config; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.mybatis.core.handler.DefaultDBFieldHandler; +import cn.fuxiaoaio.ygg.framework.mybatis.core.handler.DefaultDBFieldHandler; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.baomidou.mybatisplus.core.incrementer.IKeyGenerator; @@ -22,9 +22,9 @@ import org.springframework.core.env.ConfigurableEnvironment; * @author 芋道源码 */ @AutoConfiguration -@MapperScan(value = "${yudao.info.base-package}", annotationClass = Mapper.class, +@MapperScan(value = "${fuxiaoaio.info.base-package}", annotationClass = Mapper.class, lazyInitialization = "${mybatis.lazy-initialization:false}") // Mapper 懒加载，目前仅用于单元测试 -public class YudaoMybatisAutoConfiguration { +public class FuxiaoaioMybatisAutoConfiguration { @Bean public MybatisPlusInterceptor mybatisPlusInterceptor() { diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/config/IdTypeEnvironmentPostProcessor.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/config/IdTypeEnvironmentPostProcessor.java similarity index 94% rename from yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/config/IdTypeEnvironmentPostProcessor.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/config/IdTypeEnvironmentPostProcessor.java index b8c8e0b2c..ead896482 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/config/IdTypeEnvironmentPostProcessor.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/config/IdTypeEnvironmentPostProcessor.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.framework.mybatis.config; +package cn.fuxiaoaio.ygg.framework.mybatis.config; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.util.collection.SetUtils; -import cn.iocoder.yudao.framework.mybatis.core.enums.SqlConstants; -import cn.iocoder.yudao.framework.mybatis.core.util.JdbcUtils; +import cn.fuxiaoaio.ygg.framework.common.util.collection.SetUtils; +import cn.fuxiaoaio.ygg.framework.mybatis.core.enums.SqlConstants; +import cn.fuxiaoaio.ygg.framework.mybatis.core.util.JdbcUtils; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.annotation.IdType; import lombok.extern.slf4j.Slf4j; diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/dataobject/BaseDO.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/dataobject/BaseDO.java similarity index 95% rename from yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/dataobject/BaseDO.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/dataobject/BaseDO.java index 19abaa6fe..8647960d9 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/dataobject/BaseDO.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/dataobject/BaseDO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.mybatis.core.dataobject; +package cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/enums/SqlConstants.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/enums/SqlConstants.java similarity index 84% rename from yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/enums/SqlConstants.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/enums/SqlConstants.java index d775f17c7..850d6e90c 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/enums/SqlConstants.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/enums/SqlConstants.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.mybatis.core.enums; +package cn.fuxiaoaio.ygg.framework.mybatis.core.enums; import com.baomidou.mybatisplus.annotation.DbType; diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/handler/DefaultDBFieldHandler.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/handler/DefaultDBFieldHandler.java similarity index 92% rename from yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/handler/DefaultDBFieldHandler.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/handler/DefaultDBFieldHandler.java index 94dada129..67278b7c2 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/handler/DefaultDBFieldHandler.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/handler/DefaultDBFieldHandler.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.mybatis.core.handler; +package cn.fuxiaoaio.ygg.framework.mybatis.core.handler; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.web.core.util.WebFrameworkUtils; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import org.apache.ibatis.reflection.MetaObject; diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/mapper/BaseMapperX.java similarity index 93% rename from yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/mapper/BaseMapperX.java index a831337e8..aac1f1e5c 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/mapper/BaseMapperX.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.mybatis.core.mapper; +package cn.fuxiaoaio.ygg.framework.mybatis.core.mapper; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.util.MyBatisUtils; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/LambdaQueryWrapperX.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/query/LambdaQueryWrapperX.java similarity index 97% rename from yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/LambdaQueryWrapperX.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/query/LambdaQueryWrapperX.java index 9fd1d16f8..d131b1aa0 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/LambdaQueryWrapperX.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/query/LambdaQueryWrapperX.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.mybatis.core.query; +package cn.fuxiaoaio.ygg.framework.mybatis.core.query; import cn.hutool.core.util.ArrayUtil; -import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils; +import cn.fuxiaoaio.ygg.framework.common.util.collection.ArrayUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/QueryWrapperX.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/query/QueryWrapperX.java similarity index 97% rename from yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/QueryWrapperX.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/query/QueryWrapperX.java index 9661b7363..1d29a9769 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/QueryWrapperX.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/query/QueryWrapperX.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.mybatis.core.query; +package cn.fuxiaoaio.ygg.framework.mybatis.core.query; import cn.hutool.core.lang.Assert; -import cn.iocoder.yudao.framework.mybatis.core.enums.SqlConstants; +import cn.fuxiaoaio.ygg.framework.mybatis.core.enums.SqlConstants; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.ArrayUtils; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/type/EncryptTypeHandler.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/type/EncryptTypeHandler.java similarity index 97% rename from yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/type/EncryptTypeHandler.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/type/EncryptTypeHandler.java index 9327ebbfe..f3730e9a1 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/type/EncryptTypeHandler.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/type/EncryptTypeHandler.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.mybatis.core.type; +package cn.fuxiaoaio.ygg.framework.mybatis.core.type; import cn.hutool.core.lang.Assert; import cn.hutool.crypto.SecureUtil; diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/type/JsonLongSetTypeHandler.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/type/JsonLongSetTypeHandler.java similarity index 88% rename from yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/type/JsonLongSetTypeHandler.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/type/JsonLongSetTypeHandler.java index 052c7232e..a28b1c242 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/type/JsonLongSetTypeHandler.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/type/JsonLongSetTypeHandler.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.mybatis.core.type; +package cn.fuxiaoaio.ygg.framework.mybatis.core.type; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; import com.baomidou.mybatisplus.extension.handlers.AbstractJsonTypeHandler; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/type/StringListTypeHandler.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/type/StringListTypeHandler.java similarity index 96% rename from yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/type/StringListTypeHandler.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/type/StringListTypeHandler.java index 598a15ef7..d8ff39c63 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/type/StringListTypeHandler.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/type/StringListTypeHandler.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.mybatis.core.type; +package cn.fuxiaoaio.ygg.framework.mybatis.core.type; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/util/JdbcUtils.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/util/JdbcUtils.java similarity index 94% rename from yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/util/JdbcUtils.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/util/JdbcUtils.java index e9dc10f78..71fe49176 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/util/JdbcUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/util/JdbcUtils.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.mybatis.core.util; +package cn.fuxiaoaio.ygg.framework.mybatis.core.util; import com.baomidou.mybatisplus.annotation.DbType; diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/util/MyBatisUtils.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/util/MyBatisUtils.java similarity index 94% rename from yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/util/MyBatisUtils.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/util/MyBatisUtils.java index b9574dc23..abeda814c 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/util/MyBatisUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/core/util/MyBatisUtils.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.mybatis.core.util; +package cn.fuxiaoaio.ygg.framework.mybatis.core.util; import cn.hutool.core.collection.CollectionUtil; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.SortingField; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.SortingField; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/package-info.java similarity index 60% rename from yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/package-info.java index 50b1e851d..7d6ca2f2c 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/mybatis/package-info.java @@ -1,4 +1,4 @@ /** * 使用 MyBatis Plus 提升使用 MyBatis 的开发效率 */ -package cn.iocoder.yudao.framework.mybatis; +package cn.fuxiaoaio.ygg.framework.mybatis; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/package-info.java new file mode 100644 index 000000000..9f33cf3ec --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/java/cn/fuxiaoaio/ygg/framework/package-info.java @@ -0,0 +1 @@ +package cn.fuxiaoaio.ygg.framework; diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories similarity index 51% rename from yudao-framework/yudao-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories index eb172e4ce..3a16951be 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.env.EnvironmentPostProcessor=\ - cn.iocoder.yudao.framework.mybatis.config.IdTypeEnvironmentPostProcessor + cn.fuxiaoaio.ygg.framework.mybatis.config.IdTypeEnvironmentPostProcessor diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..02321b4a4 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +cn.fuxiaoaio.ygg.framework.datasource.config.FuxiaoaioDataSourceAutoConfiguration +cn.fuxiaoaio.ygg.framework.mybatis.config.FuxiaoaioMybatisAutoConfiguration diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/《芋道 Spring Boot MyBatis 入门》.md b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/《芋道 Spring Boot MyBatis 入门》.md new file mode 100644 index 000000000..364c3524c --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/《芋道 Spring Boot MyBatis 入门》.md @@ -0,0 +1 @@ + diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/《芋道 Spring Boot 多数据源（读写分离）入门》.md b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/《芋道 Spring Boot 多数据源（读写分离）入门》.md new file mode 100644 index 000000000..5efb96dd0 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/《芋道 Spring Boot 多数据源（读写分离）入门》.md @@ -0,0 +1 @@ + diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/《芋道 Spring Boot 数据库连接池入门》.md b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/《芋道 Spring Boot 数据库连接池入门》.md new file mode 100644 index 000000000..3d7b569e5 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-mybatis/《芋道 Spring Boot 数据库连接池入门》.md @@ -0,0 +1 @@ + diff --git a/yudao-framework/yudao-spring-boot-starter-protection/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/pom.xml similarity index 78% rename from yudao-framework/yudao-spring-boot-starter-protection/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/pom.xml index f0a81bd69..a45e86624 100644 --- a/yudao-framework/yudao-spring-boot-starter-protection/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/pom.xml @@ -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"> - cn.iocoder.cloud - yudao-framework + cn.fuxiaoaio.ygg + fuxiaoaio-framework ${revision} 4.0.0 - yudao-spring-boot-starter-protection + fuxiaoaio-spring-boot-starter-protection jar ${project.artifactId} @@ -18,8 +18,8 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-redis + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-redis diff --git a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/config/YudaoIdempotentConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/idempotent/config/FuxiaoaioIdempotentConfiguration.java similarity index 67% rename from yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/config/YudaoIdempotentConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/idempotent/config/FuxiaoaioIdempotentConfiguration.java index bad1d4a29..4561d4b81 100644 --- a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/config/YudaoIdempotentConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/idempotent/config/FuxiaoaioIdempotentConfiguration.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.framework.idempotent.config; +package cn.fuxiaoaio.ygg.framework.idempotent.config; -import cn.iocoder.yudao.framework.idempotent.core.aop.IdempotentAspect; -import cn.iocoder.yudao.framework.idempotent.core.keyresolver.IdempotentKeyResolver; -import cn.iocoder.yudao.framework.idempotent.core.keyresolver.impl.DefaultIdempotentKeyResolver; -import cn.iocoder.yudao.framework.idempotent.core.keyresolver.impl.ExpressionIdempotentKeyResolver; -import cn.iocoder.yudao.framework.idempotent.core.redis.IdempotentRedisDAO; -import cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration; +import cn.fuxiaoaio.ygg.framework.idempotent.core.aop.IdempotentAspect; +import cn.fuxiaoaio.ygg.framework.idempotent.core.keyresolver.IdempotentKeyResolver; +import cn.fuxiaoaio.ygg.framework.idempotent.core.keyresolver.impl.DefaultIdempotentKeyResolver; +import cn.fuxiaoaio.ygg.framework.idempotent.core.keyresolver.impl.ExpressionIdempotentKeyResolver; +import cn.fuxiaoaio.ygg.framework.idempotent.core.redis.IdempotentRedisDAO; +import cn.fuxiaoaio.ygg.framework.redis.config.FuxiaoaioRedisAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.context.annotation.Bean; @@ -14,8 +14,8 @@ import org.springframework.data.redis.core.StringRedisTemplate; import java.util.List; @AutoConfiguration -@AutoConfigureAfter(YudaoRedisAutoConfiguration.class) -public class YudaoIdempotentConfiguration { +@AutoConfigureAfter(FuxiaoaioRedisAutoConfiguration.class) +public class FuxiaoaioIdempotentConfiguration { @Bean public IdempotentAspect idempotentAspect(List keyResolvers, IdempotentRedisDAO idempotentRedisDAO) { diff --git a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/core/annotation/Idempotent.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/idempotent/core/annotation/Idempotent.java similarity index 84% rename from yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/core/annotation/Idempotent.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/idempotent/core/annotation/Idempotent.java index 579a07c58..fae85eff7 100644 --- a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/core/annotation/Idempotent.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/idempotent/core/annotation/Idempotent.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.idempotent.core.annotation; +package cn.fuxiaoaio.ygg.framework.idempotent.core.annotation; -import cn.iocoder.yudao.framework.idempotent.core.keyresolver.impl.DefaultIdempotentKeyResolver; -import cn.iocoder.yudao.framework.idempotent.core.keyresolver.IdempotentKeyResolver; +import cn.fuxiaoaio.ygg.framework.idempotent.core.keyresolver.impl.DefaultIdempotentKeyResolver; +import cn.fuxiaoaio.ygg.framework.idempotent.core.keyresolver.IdempotentKeyResolver; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/core/aop/IdempotentAspect.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/idempotent/core/aop/IdempotentAspect.java similarity index 80% rename from yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/core/aop/IdempotentAspect.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/idempotent/core/aop/IdempotentAspect.java index 9453444f8..1c505e310 100644 --- a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/core/aop/IdempotentAspect.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/idempotent/core/aop/IdempotentAspect.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.framework.idempotent.core.aop; +package cn.fuxiaoaio.ygg.framework.idempotent.core.aop; -import cn.iocoder.yudao.framework.common.exception.ServiceException; -import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.yudao.framework.idempotent.core.annotation.Idempotent; -import cn.iocoder.yudao.framework.idempotent.core.keyresolver.IdempotentKeyResolver; -import cn.iocoder.yudao.framework.idempotent.core.redis.IdempotentRedisDAO; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.framework.common.exception.ServiceException; +import cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.idempotent.core.annotation.Idempotent; +import cn.fuxiaoaio.ygg.framework.idempotent.core.keyresolver.IdempotentKeyResolver; +import cn.fuxiaoaio.ygg.framework.idempotent.core.redis.IdempotentRedisDAO; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; diff --git a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/core/keyresolver/IdempotentKeyResolver.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/idempotent/core/keyresolver/IdempotentKeyResolver.java similarity index 73% rename from yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/core/keyresolver/IdempotentKeyResolver.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/idempotent/core/keyresolver/IdempotentKeyResolver.java index 1617570f2..f075fbb50 100644 --- a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/core/keyresolver/IdempotentKeyResolver.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/idempotent/core/keyresolver/IdempotentKeyResolver.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.idempotent.core.keyresolver; +package cn.fuxiaoaio.ygg.framework.idempotent.core.keyresolver; -import cn.iocoder.yudao.framework.idempotent.core.annotation.Idempotent; +import cn.fuxiaoaio.ygg.framework.idempotent.core.annotation.Idempotent; import org.aspectj.lang.JoinPoint; /** diff --git a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/core/keyresolver/impl/DefaultIdempotentKeyResolver.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/idempotent/core/keyresolver/impl/DefaultIdempotentKeyResolver.java similarity index 78% rename from yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/core/keyresolver/impl/DefaultIdempotentKeyResolver.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/idempotent/core/keyresolver/impl/DefaultIdempotentKeyResolver.java index 56856993b..436be5596 100644 --- a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/core/keyresolver/impl/DefaultIdempotentKeyResolver.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/idempotent/core/keyresolver/impl/DefaultIdempotentKeyResolver.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.framework.idempotent.core.keyresolver.impl; +package cn.fuxiaoaio.ygg.framework.idempotent.core.keyresolver.impl; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; -import cn.iocoder.yudao.framework.idempotent.core.annotation.Idempotent; -import cn.iocoder.yudao.framework.idempotent.core.keyresolver.IdempotentKeyResolver; +import cn.fuxiaoaio.ygg.framework.idempotent.core.annotation.Idempotent; +import cn.fuxiaoaio.ygg.framework.idempotent.core.keyresolver.IdempotentKeyResolver; import org.aspectj.lang.JoinPoint; /** diff --git a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/core/keyresolver/impl/ExpressionIdempotentKeyResolver.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/idempotent/core/keyresolver/impl/ExpressionIdempotentKeyResolver.java similarity index 92% rename from yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/core/keyresolver/impl/ExpressionIdempotentKeyResolver.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/idempotent/core/keyresolver/impl/ExpressionIdempotentKeyResolver.java index 50b4a2c19..d9bc76a42 100644 --- a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/core/keyresolver/impl/ExpressionIdempotentKeyResolver.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/idempotent/core/keyresolver/impl/ExpressionIdempotentKeyResolver.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.idempotent.core.keyresolver.impl; +package cn.fuxiaoaio.ygg.framework.idempotent.core.keyresolver.impl; import cn.hutool.core.util.ArrayUtil; -import cn.iocoder.yudao.framework.idempotent.core.annotation.Idempotent; -import cn.iocoder.yudao.framework.idempotent.core.keyresolver.IdempotentKeyResolver; +import cn.fuxiaoaio.ygg.framework.idempotent.core.annotation.Idempotent; +import cn.fuxiaoaio.ygg.framework.idempotent.core.keyresolver.IdempotentKeyResolver; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.reflect.MethodSignature; import org.springframework.core.LocalVariableTableParameterNameDiscoverer; diff --git a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/core/redis/IdempotentRedisDAO.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/idempotent/core/redis/IdempotentRedisDAO.java similarity index 82% rename from yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/core/redis/IdempotentRedisDAO.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/idempotent/core/redis/IdempotentRedisDAO.java index 05e1c6bd2..aa7cbfd00 100644 --- a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/core/redis/IdempotentRedisDAO.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/idempotent/core/redis/IdempotentRedisDAO.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.framework.idempotent.core.redis; +package cn.fuxiaoaio.ygg.framework.idempotent.core.redis; -import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine; +import cn.fuxiaoaio.ygg.framework.redis.core.RedisKeyDefine; import lombok.AllArgsConstructor; import org.springframework.data.redis.core.StringRedisTemplate; import java.util.concurrent.TimeUnit; -import static cn.iocoder.yudao.framework.redis.core.RedisKeyDefine.KeyTypeEnum.STRING; +import static cn.fuxiaoaio.ygg.framework.redis.core.RedisKeyDefine.KeyTypeEnum.STRING; /** * 幂等 Redis DAO diff --git a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/idempotent/package-info.java similarity index 94% rename from yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/idempotent/package-info.java index 8cad5fc7a..f8b6179d1 100644 --- a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/idempotent/package-info.java @@ -9,4 +9,4 @@ * 此时，我们偏向使用 Lock4j 组件。原则上，一个组件只提供一种单一的能力。 * 2. 考虑到组件的通用性，我们并未像 it4alla/idempotent 组件一样使用 Redisson RMap 结构，而是直接使用 Redis 的 String 数据格式。 */ -package cn.iocoder.yudao.framework.idempotent; +package cn.fuxiaoaio.ygg.framework.idempotent; diff --git a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/config/YudaoLock4jConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/lock4j/config/FuxiaoaioLock4jConfiguration.java similarity index 77% rename from yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/config/YudaoLock4jConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/lock4j/config/FuxiaoaioLock4jConfiguration.java index 1777aabcf..533344d2d 100644 --- a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/config/YudaoLock4jConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/lock4j/config/FuxiaoaioLock4jConfiguration.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.lock4j.config; +package cn.fuxiaoaio.ygg.framework.lock4j.config; import cn.hutool.core.util.ClassUtil; -import cn.iocoder.yudao.framework.lock4j.core.DefaultLockFailureStrategy; -import cn.iocoder.yudao.framework.lock4j.core.Lock4jRedisKeyConstants; +import cn.fuxiaoaio.ygg.framework.lock4j.core.DefaultLockFailureStrategy; +import cn.fuxiaoaio.ygg.framework.lock4j.core.Lock4jRedisKeyConstants; import com.baomidou.lock.spring.boot.autoconfigure.LockAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureBefore; @@ -10,7 +10,7 @@ import org.springframework.context.annotation.Bean; @AutoConfiguration @AutoConfigureBefore(LockAutoConfiguration.class) -public class YudaoLock4jConfiguration { +public class FuxiaoaioLock4jConfiguration { static { // 手动加载 Lock4jRedisKeyConstants 类，因为它不会被使用到 diff --git a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/core/DefaultLockFailureStrategy.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/lock4j/core/DefaultLockFailureStrategy.java similarity index 77% rename from yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/core/DefaultLockFailureStrategy.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/lock4j/core/DefaultLockFailureStrategy.java index 2cea08bf8..b34305104 100644 --- a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/core/DefaultLockFailureStrategy.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/lock4j/core/DefaultLockFailureStrategy.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.lock4j.core; +package cn.fuxiaoaio.ygg.framework.lock4j.core; -import cn.iocoder.yudao.framework.common.exception.ServiceException; -import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.common.exception.ServiceException; +import cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants; import com.baomidou.lock.LockFailureStrategy; import lombok.extern.slf4j.Slf4j; diff --git a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/core/Lock4jRedisKeyConstants.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/lock4j/core/Lock4jRedisKeyConstants.java similarity index 70% rename from yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/core/Lock4jRedisKeyConstants.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/lock4j/core/Lock4jRedisKeyConstants.java index cc01a253b..8f94bde15 100644 --- a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/core/Lock4jRedisKeyConstants.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/lock4j/core/Lock4jRedisKeyConstants.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.framework.lock4j.core; +package cn.fuxiaoaio.ygg.framework.lock4j.core; -import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine; +import cn.fuxiaoaio.ygg.framework.redis.core.RedisKeyDefine; import org.redisson.api.RLock; -import static cn.iocoder.yudao.framework.redis.core.RedisKeyDefine.KeyTypeEnum.HASH; +import static cn.fuxiaoaio.ygg.framework.redis.core.RedisKeyDefine.KeyTypeEnum.HASH; /** * Lock4j Redis Key 枚举类 diff --git a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/lock4j/package-info.java similarity index 66% rename from yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/lock4j/package-info.java index 267b951dc..177bef1a1 100644 --- a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/lock4j/package-info.java @@ -1,4 +1,4 @@ /** * 分布式锁组件，使用 https://gitee.com/baomidou/lock4j 开源项目 */ -package cn.iocoder.yudao.framework.lock4j; +package cn.fuxiaoaio.ygg.framework.lock4j; diff --git a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/resilience4j/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/resilience4j/package-info.java similarity index 75% rename from yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/resilience4j/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/resilience4j/package-info.java index 649e8a0ea..d8065e0ba 100644 --- a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/resilience4j/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/resilience4j/package-info.java @@ -6,4 +6,4 @@ * 4. 重试 * 5. 限时器 */ -package cn.iocoder.yudao.framework.resilience4j; +package cn.fuxiaoaio.ygg.framework.resilience4j; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/resilience4j/《芋道 Spring Boot 服务容错 Resilience4j 入门》.md b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/resilience4j/《芋道 Spring Boot 服务容错 Resilience4j 入门》.md new file mode 100644 index 000000000..79ceb8fbe --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/java/cn/fuxiaoaio/ygg/framework/resilience4j/《芋道 Spring Boot 服务容错 Resilience4j 入门》.md @@ -0,0 +1 @@ + diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..a3f052b3d --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-protection/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +cn.fuxiaoaio.ygg.framework.idempotent.config.FuxiaoaioIdempotentConfiguration +cn.fuxiaoaio.ygg.framework.lock4j.config.FuxiaoaioLock4jConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-redis/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/pom.xml similarity index 81% rename from yudao-framework/yudao-spring-boot-starter-redis/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/pom.xml index 4b11789b4..a6320a926 100644 --- a/yudao-framework/yudao-spring-boot-starter-redis/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/pom.xml @@ -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"> - cn.iocoder.cloud - yudao-framework + cn.fuxiaoaio.ygg + fuxiaoaio-framework ${revision} 4.0.0 - yudao-spring-boot-starter-redis + fuxiaoaio-spring-boot-starter-redis jar ${project.artifactId} @@ -17,8 +17,8 @@ - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common diff --git a/yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/config/YudaoCacheAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/src/main/java/cn/fuxiaoaio/ygg/framework/redis/config/FuxiaoaioCacheAutoConfiguration.java similarity index 95% rename from yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/config/YudaoCacheAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/src/main/java/cn/fuxiaoaio/ygg/framework/redis/config/FuxiaoaioCacheAutoConfiguration.java index 0b837569e..dee0939ce 100644 --- a/yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/config/YudaoCacheAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/src/main/java/cn/fuxiaoaio/ygg/framework/redis/config/FuxiaoaioCacheAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.redis.config; +package cn.fuxiaoaio.ygg.framework.redis.config; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.cache.CacheProperties; @@ -16,7 +16,7 @@ import org.springframework.data.redis.serializer.RedisSerializer; @AutoConfiguration @EnableConfigurationProperties({CacheProperties.class}) @EnableCaching -public class YudaoCacheAutoConfiguration { +public class FuxiaoaioCacheAutoConfiguration { /** * RedisCacheConfiguration Bean diff --git a/yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/config/YudaoRedisAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/src/main/java/cn/fuxiaoaio/ygg/framework/redis/config/FuxiaoaioRedisAutoConfiguration.java similarity index 93% rename from yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/config/YudaoRedisAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/src/main/java/cn/fuxiaoaio/ygg/framework/redis/config/FuxiaoaioRedisAutoConfiguration.java index 901830c69..e5233ce8f 100644 --- a/yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/config/YudaoRedisAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/src/main/java/cn/fuxiaoaio/ygg/framework/redis/config/FuxiaoaioRedisAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.redis.config; +package cn.fuxiaoaio.ygg.framework.redis.config; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; @@ -10,7 +10,7 @@ import org.springframework.data.redis.serializer.RedisSerializer; * Redis 配置类 */ @AutoConfiguration -public class YudaoRedisAutoConfiguration { +public class FuxiaoaioRedisAutoConfiguration { /** * 创建 RedisTemplate Bean，使用 JSON 序列化方式 diff --git a/yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/core/RedisKeyDefine.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/src/main/java/cn/fuxiaoaio/ygg/framework/redis/core/RedisKeyDefine.java similarity index 98% rename from yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/core/RedisKeyDefine.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/src/main/java/cn/fuxiaoaio/ygg/framework/redis/core/RedisKeyDefine.java index ba4fccb66..51e1cab86 100644 --- a/yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/core/RedisKeyDefine.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/src/main/java/cn/fuxiaoaio/ygg/framework/redis/core/RedisKeyDefine.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.redis.core; +package cn.fuxiaoaio.ygg.framework.redis.core; import com.fasterxml.jackson.annotation.JsonValue; import lombok.AllArgsConstructor; diff --git a/yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/core/RedisKeyRegistry.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/src/main/java/cn/fuxiaoaio/ygg/framework/redis/core/RedisKeyRegistry.java similarity index 91% rename from yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/core/RedisKeyRegistry.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/src/main/java/cn/fuxiaoaio/ygg/framework/redis/core/RedisKeyRegistry.java index 4ef3b92f3..f7c7d9a6e 100644 --- a/yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/core/RedisKeyRegistry.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/src/main/java/cn/fuxiaoaio/ygg/framework/redis/core/RedisKeyRegistry.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.redis.core; +package cn.fuxiaoaio.ygg.framework.redis.core; import java.util.ArrayList; import java.util.List; diff --git a/yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/src/main/java/cn/fuxiaoaio/ygg/framework/redis/package-info.java similarity index 67% rename from yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/src/main/java/cn/fuxiaoaio/ygg/framework/redis/package-info.java index bd8a5d3e9..766b0e72b 100644 --- a/yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/src/main/java/cn/fuxiaoaio/ygg/framework/redis/package-info.java @@ -1,4 +1,4 @@ /** * 采用 Spring Data Redis 操作 Redis，底层使用 Redisson 作为客户端 */ -package cn.iocoder.yudao.framework.redis; +package cn.fuxiaoaio.ygg.framework.redis; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..d74a410bd --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +cn.fuxiaoaio.ygg.framework.redis.config.FuxiaoaioRedisAutoConfiguration +cn.fuxiaoaio.ygg.framework.redis.config.FuxiaoaioCacheAutoConfiguration diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/《芋道 Spring Boot Cache 入门》.md b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/《芋道 Spring Boot Cache 入门》.md new file mode 100644 index 000000000..528aec8c1 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/《芋道 Spring Boot Cache 入门》.md @@ -0,0 +1 @@ + diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/《芋道 Spring Boot Redis 入门》.md b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/《芋道 Spring Boot Redis 入门》.md new file mode 100644 index 000000000..636cf9e4d --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-redis/《芋道 Spring Boot Redis 入门》.md @@ -0,0 +1 @@ + diff --git a/yudao-framework/yudao-spring-boot-starter-rpc/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/pom.xml similarity index 88% rename from yudao-framework/yudao-spring-boot-starter-rpc/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/pom.xml index f48f81665..f2b59f48e 100644 --- a/yudao-framework/yudao-spring-boot-starter-rpc/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/pom.xml @@ -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"> - yudao-framework - cn.iocoder.cloud + fuxiaoaio-framework + cn.fuxiaoaio.ygg ${revision} 4.0.0 - yudao-spring-boot-starter-rpc + fuxiaoaio-spring-boot-starter-rpc jar ${project.artifactId} @@ -20,8 +20,8 @@ - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/src/main/java/cn/fuxiaoaio/ygg/framework/rpc/config/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/src/main/java/cn/fuxiaoaio/ygg/framework/rpc/config/package-info.java new file mode 100644 index 000000000..3f2d75a0a --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/src/main/java/cn/fuxiaoaio/ygg/framework/rpc/config/package-info.java @@ -0,0 +1,4 @@ +/** + * 占坑 TODO + */ +package cn.fuxiaoaio.ygg.framework.rpc.config; diff --git a/yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/core/dubbo/DubboProviderExceptionFilter.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/src/main/java/cn/fuxiaoaio/ygg/framework/rpc/core/dubbo/DubboProviderExceptionFilter.java similarity index 94% rename from yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/core/dubbo/DubboProviderExceptionFilter.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/src/main/java/cn/fuxiaoaio/ygg/framework/rpc/core/dubbo/DubboProviderExceptionFilter.java index 69cc6072b..bcc08172a 100644 --- a/yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/core/dubbo/DubboProviderExceptionFilter.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/src/main/java/cn/fuxiaoaio/ygg/framework/rpc/core/dubbo/DubboProviderExceptionFilter.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.framework.rpc.core.dubbo; +package cn.fuxiaoaio.ygg.framework.rpc.core.dubbo; import cn.hutool.core.exceptions.ExceptionUtil; -import cn.iocoder.yudao.framework.common.exception.ServerException; -import cn.iocoder.yudao.framework.common.exception.ServiceException; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.exception.ServerException; +import cn.fuxiaoaio.ygg.framework.common.exception.ServiceException; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.common.constants.CommonConstants; import org.apache.dubbo.common.extension.Activate; @@ -14,7 +14,7 @@ import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; import java.lang.reflect.Type; -import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants.*; @Activate(group = CommonConstants.PROVIDER) // TODO 优化点：设置下顺序 @Slf4j diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/src/main/java/cn/fuxiaoaio/ygg/framework/rpc/core/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/src/main/java/cn/fuxiaoaio/ygg/framework/rpc/core/package-info.java new file mode 100644 index 000000000..5c005bdae --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/src/main/java/cn/fuxiaoaio/ygg/framework/rpc/core/package-info.java @@ -0,0 +1,4 @@ +/** + * 占坑 TODO + */ +package cn.fuxiaoaio.ygg.framework.rpc.core; diff --git a/yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/core/util/FeignUtils.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/src/main/java/cn/fuxiaoaio/ygg/framework/rpc/core/util/FeignUtils.java similarity index 93% rename from yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/core/util/FeignUtils.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/src/main/java/cn/fuxiaoaio/ygg/framework/rpc/core/util/FeignUtils.java index af81e0be6..35c40b93d 100644 --- a/yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/core/util/FeignUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/src/main/java/cn/fuxiaoaio/ygg/framework/rpc/core/util/FeignUtils.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.rpc.core.util; +package cn.fuxiaoaio.ygg.framework.rpc.core.util; import cn.hutool.core.util.ReflectUtil; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; import feign.RequestTemplate; import feign.template.HeaderTemplate; import feign.template.Literal; diff --git a/yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/src/main/java/cn/fuxiaoaio/ygg/framework/rpc/package-info.java similarity index 74% rename from yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/src/main/java/cn/fuxiaoaio/ygg/framework/rpc/package-info.java index 004f14d37..db065bbc5 100644 --- a/yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/src/main/java/cn/fuxiaoaio/ygg/framework/rpc/package-info.java @@ -4,4 +4,4 @@ * * @author 芋道源码 */ -package cn.iocoder.yudao.framework.rpc; +package cn.fuxiaoaio.ygg.framework.rpc; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter new file mode 100644 index 000000000..3b6f96c53 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter @@ -0,0 +1 @@ +dubboExceptionFilter=cn.fuxiaoaio.ygg.framework.rpc.core.dubbo.DubboProviderExceptionFilter diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/《芋道 Spring Boot Dubbo 入门》.md b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/《芋道 Spring Boot Dubbo 入门》.md new file mode 100644 index 000000000..35b70d54e --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/《芋道 Spring Boot Dubbo 入门》.md @@ -0,0 +1 @@ + diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/《芋道 Spring Boot 声明式调用 Feign 入门》.md b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/《芋道 Spring Boot 声明式调用 Feign 入门》.md new file mode 100644 index 000000000..d99d37d78 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/《芋道 Spring Boot 声明式调用 Feign 入门》.md @@ -0,0 +1 @@ + diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/《芋道 Spring Cloud Alibaba 服务调用 Dubbo 入门》.md b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/《芋道 Spring Cloud Alibaba 服务调用 Dubbo 入门》.md new file mode 100644 index 000000000..49f0b1718 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/《芋道 Spring Cloud Alibaba 服务调用 Dubbo 入门》.md @@ -0,0 +1 @@ + diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/《芋道 Spring Cloud 声明式调用 Feign 入门》.md b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/《芋道 Spring Cloud 声明式调用 Feign 入门》.md new file mode 100644 index 000000000..a7169c3d6 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-rpc/《芋道 Spring Cloud 声明式调用 Feign 入门》.md @@ -0,0 +1 @@ + diff --git a/yudao-framework/yudao-spring-boot-starter-security/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/pom.xml similarity index 72% rename from yudao-framework/yudao-spring-boot-starter-security/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/pom.xml index 2e5dc7e2e..30f35820a 100644 --- a/yudao-framework/yudao-spring-boot-starter-security/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/pom.xml @@ -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"> - cn.iocoder.cloud - yudao-framework + cn.fuxiaoaio.ygg + fuxiaoaio-framework ${revision} 4.0.0 - yudao-spring-boot-starter-security + fuxiaoaio-spring-boot-starter-security jar ${project.artifactId} @@ -17,8 +17,8 @@ - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common @@ -29,8 +29,8 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-web + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-web @@ -46,15 +46,15 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-rpc + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-rpc true - cn.iocoder.cloud - yudao-module-system-api + cn.fuxiaoaio.ygg + fuxiaoaio-module-system-api ${revision} diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/AuthorizeRequestsCustomizer.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/config/AuthorizeRequestsCustomizer.java similarity index 89% rename from yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/AuthorizeRequestsCustomizer.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/config/AuthorizeRequestsCustomizer.java index 5c8629076..f66b68304 100644 --- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/AuthorizeRequestsCustomizer.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/config/AuthorizeRequestsCustomizer.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.security.config; +package cn.fuxiaoaio.ygg.framework.security.config; -import cn.iocoder.yudao.framework.web.config.WebProperties; +import cn.fuxiaoaio.ygg.framework.web.config.WebProperties; import org.springframework.core.Ordered; import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/config/FuxiaoaioSecurityAutoConfiguration.java similarity index 80% rename from yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/config/FuxiaoaioSecurityAutoConfiguration.java index 47c363446..90e0eb4dc 100644 --- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/config/FuxiaoaioSecurityAutoConfiguration.java @@ -1,15 +1,15 @@ -package cn.iocoder.yudao.framework.security.config; +package cn.fuxiaoaio.ygg.framework.security.config; -import cn.iocoder.yudao.framework.security.core.aop.PreAuthenticatedAspect; -import cn.iocoder.yudao.framework.security.core.context.TransmittableThreadLocalSecurityContextHolderStrategy; -import cn.iocoder.yudao.framework.security.core.filter.TokenAuthenticationFilter; -import cn.iocoder.yudao.framework.security.core.handler.AccessDeniedHandlerImpl; -import cn.iocoder.yudao.framework.security.core.handler.AuthenticationEntryPointImpl; -import cn.iocoder.yudao.framework.security.core.service.SecurityFrameworkService; -import cn.iocoder.yudao.framework.security.core.service.SecurityFrameworkServiceImpl; -import cn.iocoder.yudao.framework.web.core.handler.GlobalExceptionHandler; -import cn.iocoder.yudao.module.system.api.oauth2.OAuth2TokenApi; -import cn.iocoder.yudao.module.system.api.permission.PermissionApi; +import cn.fuxiaoaio.ygg.framework.security.core.aop.PreAuthenticatedAspect; +import cn.fuxiaoaio.ygg.framework.security.core.context.TransmittableThreadLocalSecurityContextHolderStrategy; +import cn.fuxiaoaio.ygg.framework.security.core.filter.TokenAuthenticationFilter; +import cn.fuxiaoaio.ygg.framework.security.core.handler.AccessDeniedHandlerImpl; +import cn.fuxiaoaio.ygg.framework.security.core.handler.AuthenticationEntryPointImpl; +import cn.fuxiaoaio.ygg.framework.security.core.service.SecurityFrameworkService; +import cn.fuxiaoaio.ygg.framework.security.core.service.SecurityFrameworkServiceImpl; +import cn.fuxiaoaio.ygg.framework.web.core.handler.GlobalExceptionHandler; +import cn.fuxiaoaio.ygg.module.system.api.oauth2.OAuth2TokenApi; +import cn.fuxiaoaio.ygg.module.system.api.permission.PermissionApi; import org.springframework.beans.factory.config.MethodInvokingFactoryBean; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -25,14 +25,14 @@ import javax.annotation.Resource; /** * Spring Security 自动配置类，主要用于相关组件的配置 * - * 注意，不能和 {@link YudaoWebSecurityConfigurerAdapter} 用一个，原因是会导致初始化报错。 + * 注意，不能和 {@link FuxiaoaioWebSecurityConfigurerAdapter} 用一个，原因是会导致初始化报错。 * 参见 https://stackoverflow.com/questions/53847050/spring-boot-delegatebuilder-cannot-be-null-on-autowiring-authenticationmanager 文档。 * * @author 芋道源码 */ @AutoConfiguration @EnableConfigurationProperties(SecurityProperties.class) -public class YudaoSecurityAutoConfiguration { +public class FuxiaoaioSecurityAutoConfiguration { @Resource private SecurityProperties securityProperties; diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityRpcAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/config/FuxiaoaioSecurityRpcAutoConfiguration.java similarity index 65% rename from yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityRpcAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/config/FuxiaoaioSecurityRpcAutoConfiguration.java index f39cc2a8d..9f1149853 100644 --- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityRpcAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/config/FuxiaoaioSecurityRpcAutoConfiguration.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.security.config; +package cn.fuxiaoaio.ygg.framework.security.config; -import cn.iocoder.yudao.framework.security.core.rpc.LoginUserRequestInterceptor; -import cn.iocoder.yudao.module.system.api.oauth2.OAuth2TokenApi; -import cn.iocoder.yudao.module.system.api.permission.PermissionApi; +import cn.fuxiaoaio.ygg.framework.security.core.rpc.LoginUserRequestInterceptor; +import cn.fuxiaoaio.ygg.module.system.api.oauth2.OAuth2TokenApi; +import cn.fuxiaoaio.ygg.module.system.api.permission.PermissionApi; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Bean; @@ -15,7 +15,7 @@ import org.springframework.context.annotation.Bean; @AutoConfiguration @EnableFeignClients(clients = {OAuth2TokenApi.class, // 主要是引入相关的 API 服务 PermissionApi.class}) -public class YudaoSecurityRpcAutoConfiguration { +public class FuxiaoaioSecurityRpcAutoConfiguration { @Bean public LoginUserRequestInterceptor loginUserRequestInterceptor() { diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/config/FuxiaoaioWebSecurityConfigurerAdapter.java similarity index 96% rename from yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/config/FuxiaoaioWebSecurityConfigurerAdapter.java index e17a023a6..e935559e7 100644 --- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/config/FuxiaoaioWebSecurityConfigurerAdapter.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.security.config; +package cn.fuxiaoaio.ygg.framework.security.config; -import cn.iocoder.yudao.framework.security.core.filter.TokenAuthenticationFilter; -import cn.iocoder.yudao.framework.web.config.WebProperties; +import cn.fuxiaoaio.ygg.framework.security.core.filter.TokenAuthenticationFilter; +import cn.fuxiaoaio.ygg.framework.web.config.WebProperties; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import org.springframework.boot.autoconfigure.AutoConfiguration; @@ -34,7 +34,7 @@ import java.util.Set; */ @AutoConfiguration @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) -public class YudaoWebSecurityConfigurerAdapter { +public class FuxiaoaioWebSecurityConfigurerAdapter { @Resource private WebProperties webProperties; @@ -123,7 +123,7 @@ public class YudaoWebSecurityConfigurerAdapter { .antMatchers(HttpMethod.POST, permitAllUrls.get(HttpMethod.POST).toArray(new String[0])).permitAll() .antMatchers(HttpMethod.PUT, permitAllUrls.get(HttpMethod.PUT).toArray(new String[0])).permitAll() .antMatchers(HttpMethod.DELETE, permitAllUrls.get(HttpMethod.DELETE).toArray(new String[0])).permitAll() - // 基于 yudao.security.permit-all-urls 无需认证 + // 基于 fuxiaoaio.security.permit-all-urls 无需认证 .antMatchers(securityProperties.getPermitAllUrls().toArray(new String[0])).permitAll() // 设置 App API 无需认证 .antMatchers(buildAppApi("/**")).permitAll() diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/SecurityProperties.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/config/SecurityProperties.java similarity index 91% rename from yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/SecurityProperties.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/config/SecurityProperties.java index 2560dcc0b..a7d30c570 100644 --- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/SecurityProperties.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/config/SecurityProperties.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.security.config; +package cn.fuxiaoaio.ygg.framework.security.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull; import java.util.Collections; import java.util.List; -@ConfigurationProperties(prefix = "yudao.security") +@ConfigurationProperties(prefix = "fuxiaoaio.security") @Validated @Data public class SecurityProperties { diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/LoginUser.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/LoginUser.java similarity index 90% rename from yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/LoginUser.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/LoginUser.java index 50523ca0a..529d79f16 100644 --- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/LoginUser.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/LoginUser.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.security.core; +package cn.fuxiaoaio.ygg.framework.security.core; import cn.hutool.core.map.MapUtil; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/annotations/PreAuthenticated.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/annotations/PreAuthenticated.java similarity index 86% rename from yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/annotations/PreAuthenticated.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/annotations/PreAuthenticated.java index efc85c678..5a829c893 100644 --- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/annotations/PreAuthenticated.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/annotations/PreAuthenticated.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.security.core.annotations; +package cn.fuxiaoaio.ygg.framework.security.core.annotations; import java.lang.annotation.*; diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/aop/PreAuthenticatedAspect.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/aop/PreAuthenticatedAspect.java similarity index 67% rename from yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/aop/PreAuthenticatedAspect.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/aop/PreAuthenticatedAspect.java index 808afc393..1ec5ae796 100644 --- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/aop/PreAuthenticatedAspect.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/aop/PreAuthenticatedAspect.java @@ -1,14 +1,14 @@ -package cn.iocoder.yudao.framework.security.core.aop; +package cn.fuxiaoaio.ygg.framework.security.core.aop; -import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated; -import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; +import cn.fuxiaoaio.ygg.framework.security.core.annotations.PreAuthenticated; +import cn.fuxiaoaio.ygg.framework.security.core.util.SecurityFrameworkUtils; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; -import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.UNAUTHORIZED; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants.UNAUTHORIZED; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; @Aspect @Slf4j diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/context/TransmittableThreadLocalSecurityContextHolderStrategy.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/context/TransmittableThreadLocalSecurityContextHolderStrategy.java similarity index 96% rename from yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/context/TransmittableThreadLocalSecurityContextHolderStrategy.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/context/TransmittableThreadLocalSecurityContextHolderStrategy.java index 1bdbe712f..e74347307 100644 --- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/context/TransmittableThreadLocalSecurityContextHolderStrategy.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/context/TransmittableThreadLocalSecurityContextHolderStrategy.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.security.core.context; +package cn.fuxiaoaio.ygg.framework.security.core.context; import com.alibaba.ttl.TransmittableThreadLocal; import org.springframework.security.core.context.SecurityContext; diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/filter/TokenAuthenticationFilter.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/filter/TokenAuthenticationFilter.java similarity index 86% rename from yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/filter/TokenAuthenticationFilter.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/filter/TokenAuthenticationFilter.java index 6efd48340..ed1c7ca59 100644 --- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/filter/TokenAuthenticationFilter.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/filter/TokenAuthenticationFilter.java @@ -1,18 +1,18 @@ -package cn.iocoder.yudao.framework.security.core.filter; +package cn.fuxiaoaio.ygg.framework.security.core.filter; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.exception.ServiceException; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; -import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; -import cn.iocoder.yudao.framework.security.config.SecurityProperties; -import cn.iocoder.yudao.framework.security.core.LoginUser; -import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; -import cn.iocoder.yudao.framework.web.core.handler.GlobalExceptionHandler; -import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; -import cn.iocoder.yudao.module.system.api.oauth2.OAuth2TokenApi; -import cn.iocoder.yudao.module.system.api.oauth2.dto.OAuth2AccessTokenCheckRespDTO; +import cn.fuxiaoaio.ygg.framework.common.exception.ServiceException; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.framework.common.util.servlet.ServletUtils; +import cn.fuxiaoaio.ygg.framework.security.config.SecurityProperties; +import cn.fuxiaoaio.ygg.framework.security.core.LoginUser; +import cn.fuxiaoaio.ygg.framework.security.core.util.SecurityFrameworkUtils; +import cn.fuxiaoaio.ygg.framework.web.core.handler.GlobalExceptionHandler; +import cn.fuxiaoaio.ygg.framework.web.core.util.WebFrameworkUtils; +import cn.fuxiaoaio.ygg.module.system.api.oauth2.OAuth2TokenApi; +import cn.fuxiaoaio.ygg.module.system.api.oauth2.dto.OAuth2AccessTokenCheckRespDTO; import lombok.RequiredArgsConstructor; import org.springframework.security.access.AccessDeniedException; import org.springframework.web.filter.OncePerRequestFilter; diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/handler/AccessDeniedHandlerImpl.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/handler/AccessDeniedHandlerImpl.java similarity index 78% rename from yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/handler/AccessDeniedHandlerImpl.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/handler/AccessDeniedHandlerImpl.java index 33f3f14f4..63d2627d8 100644 --- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/handler/AccessDeniedHandlerImpl.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/handler/AccessDeniedHandlerImpl.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.framework.security.core.handler; +package cn.fuxiaoaio.ygg.framework.security.core.handler; -import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; -import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; +import cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.security.core.util.SecurityFrameworkUtils; +import cn.fuxiaoaio.ygg.framework.common.util.servlet.ServletUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.web.access.AccessDeniedHandler; @@ -16,8 +16,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.FORBIDDEN; -import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.UNAUTHORIZED; +import static cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants.FORBIDDEN; +import static cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants.UNAUTHORIZED; /** * 访问一个需要认证的 URL 资源，已经认证（登录）但是没有权限的情况下，返回 {@link GlobalErrorCodeConstants#FORBIDDEN} 错误码。 diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/handler/AuthenticationEntryPointImpl.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/handler/AuthenticationEntryPointImpl.java similarity index 81% rename from yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/handler/AuthenticationEntryPointImpl.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/handler/AuthenticationEntryPointImpl.java index 0a451e076..be72d97a9 100644 --- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/handler/AuthenticationEntryPointImpl.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/handler/AuthenticationEntryPointImpl.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.security.core.handler; +package cn.fuxiaoaio.ygg.framework.security.core.handler; -import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; +import cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.util.servlet.ServletUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; @@ -12,7 +12,7 @@ import javax.servlet.FilterChain; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.UNAUTHORIZED; +import static cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants.UNAUTHORIZED; /** * 访问一个需要认证的 URL 资源，但是此时自己尚未认证（登录）的情况下，返回 {@link GlobalErrorCodeConstants#UNAUTHORIZED} 错误码，从而使前端重定向到登录页 diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/rpc/LoginUserRequestInterceptor.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/rpc/LoginUserRequestInterceptor.java similarity index 72% rename from yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/rpc/LoginUserRequestInterceptor.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/rpc/LoginUserRequestInterceptor.java index cb6c33ccf..dcd2f7ac0 100644 --- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/rpc/LoginUserRequestInterceptor.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/rpc/LoginUserRequestInterceptor.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.security.core.rpc; +package cn.fuxiaoaio.ygg.framework.security.core.rpc; -import cn.iocoder.yudao.framework.rpc.core.util.FeignUtils; -import cn.iocoder.yudao.framework.security.core.LoginUser; -import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; +import cn.fuxiaoaio.ygg.framework.rpc.core.util.FeignUtils; +import cn.fuxiaoaio.ygg.framework.security.core.LoginUser; +import cn.fuxiaoaio.ygg.framework.security.core.util.SecurityFrameworkUtils; import feign.RequestInterceptor; import feign.RequestTemplate; diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/service/SecurityFrameworkService.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/service/SecurityFrameworkService.java similarity index 95% rename from yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/service/SecurityFrameworkService.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/service/SecurityFrameworkService.java index bf2f7f31f..2ec56ac03 100644 --- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/service/SecurityFrameworkService.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/service/SecurityFrameworkService.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.security.core.service; +package cn.fuxiaoaio.ygg.framework.security.core.service; /** * Security 框架 Service 接口，定义权限相关的校验操作 diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/service/SecurityFrameworkServiceImpl.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/service/SecurityFrameworkServiceImpl.java similarity index 85% rename from yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/service/SecurityFrameworkServiceImpl.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/service/SecurityFrameworkServiceImpl.java index a3e4ad98c..d3fff51a2 100644 --- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/service/SecurityFrameworkServiceImpl.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/service/SecurityFrameworkServiceImpl.java @@ -1,16 +1,16 @@ -package cn.iocoder.yudao.framework.security.core.service; +package cn.fuxiaoaio.ygg.framework.security.core.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.HashUtil; import cn.hutool.core.util.ObjectUtil; -import cn.iocoder.yudao.framework.common.core.KeyValue; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.cache.CacheUtils; -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.fuxiaoaio.ygg.framework.common.core.KeyValue; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.util.cache.CacheUtils; +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 com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import lombok.AllArgsConstructor; @@ -20,7 +20,7 @@ import java.time.Duration; import java.util.Arrays; import java.util.List; -import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; +import static cn.fuxiaoaio.ygg.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; /** * 默认的 {@link SecurityFrameworkService} 实现类 diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/util/SecurityFrameworkUtils.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/util/SecurityFrameworkUtils.java similarity index 95% rename from yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/util/SecurityFrameworkUtils.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/util/SecurityFrameworkUtils.java index 3fa9c0004..2edd17686 100644 --- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/util/SecurityFrameworkUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/core/util/SecurityFrameworkUtils.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.security.core.util; +package cn.fuxiaoaio.ygg.framework.security.core.util; -import cn.iocoder.yudao.framework.security.core.LoginUser; -import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; +import cn.fuxiaoaio.ygg.framework.security.core.LoginUser; +import cn.fuxiaoaio.ygg.framework.web.core.util.WebFrameworkUtils; import org.springframework.lang.Nullable; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/package-info.java similarity index 68% rename from yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/package-info.java index dc95b4ed1..866309673 100644 --- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/java/cn/fuxiaoaio/ygg/framework/security/package-info.java @@ -4,4 +4,4 @@ * * @author 芋道源码 */ -package cn.iocoder.yudao.framework.security; +package cn.fuxiaoaio.ygg.framework.security; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..01a7e210a --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,3 @@ +cn.fuxiaoaio.ygg.framework.security.config.FuxiaoaioSecurityRpcAutoConfiguration +cn.fuxiaoaio.ygg.framework.security.config.FuxiaoaioSecurityAutoConfiguration +cn.fuxiaoaio.ygg.framework.security.config.FuxiaoaioWebSecurityConfigurerAdapter diff --git a/yudao-framework/yudao-spring-boot-starter-security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md similarity index 58% rename from yudao-framework/yudao-spring-boot-starter-security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md index b8a89316f..5428f9ab2 100644 --- a/yudao-framework/yudao-spring-boot-starter-security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md @@ -1,2 +1,2 @@ -* 芋道 Spring Security 入门： -* Spring Security 基本概念： +* 芋道 Spring Security 入门： +* Spring Security 基本概念： diff --git a/yudao-framework/yudao-spring-boot-starter-test/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/pom.xml similarity index 76% rename from yudao-framework/yudao-spring-boot-starter-test/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/pom.xml index 05e5c6813..f9a4d0725 100644 --- a/yudao-framework/yudao-spring-boot-starter-test/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/pom.xml @@ -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"> - cn.iocoder.cloud - yudao-framework + cn.fuxiaoaio.ygg + fuxiaoaio-framework ${revision} 4.0.0 - yudao-spring-boot-starter-test + fuxiaoaio-spring-boot-starter-test jar ${project.artifactId} @@ -17,19 +17,19 @@ - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common - cn.iocoder.cloud - yudao-spring-boot-starter-mybatis + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-mybatis - cn.iocoder.cloud - yudao-spring-boot-starter-redis + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-redis diff --git a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/config/RedisTestConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/config/RedisTestConfiguration.java similarity index 96% rename from yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/config/RedisTestConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/config/RedisTestConfiguration.java index f4b6bee72..b461eb18d 100644 --- a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/config/RedisTestConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/config/RedisTestConfiguration.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.test.config; +package cn.fuxiaoaio.ygg.framework.test.config; import com.github.fppt.jedismock.RedisServer; import org.springframework.boot.autoconfigure.AutoConfiguration; diff --git a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/config/SqlInitializationTestConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/config/SqlInitializationTestConfiguration.java similarity index 98% rename from yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/config/SqlInitializationTestConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/config/SqlInitializationTestConfiguration.java index a56139d9a..cec232071 100644 --- a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/config/SqlInitializationTestConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/config/SqlInitializationTestConfiguration.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.test.config; +package cn.fuxiaoaio.ygg.framework.test.config; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseDbAndRedisUnitTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/core/ut/BaseDbAndRedisUnitTest.java similarity index 75% rename from yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseDbAndRedisUnitTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/core/ut/BaseDbAndRedisUnitTest.java index 1ee8dfef2..360d0e423 100644 --- a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseDbAndRedisUnitTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/core/ut/BaseDbAndRedisUnitTest.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.framework.test.core.ut; +package cn.fuxiaoaio.ygg.framework.test.core.ut; -import cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration; -import cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration; -import cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration; -import cn.iocoder.yudao.framework.test.config.RedisTestConfiguration; -import cn.iocoder.yudao.framework.test.config.SqlInitializationTestConfiguration; +import cn.fuxiaoaio.ygg.framework.datasource.config.FuxiaoaioDataSourceAutoConfiguration; +import cn.fuxiaoaio.ygg.framework.mybatis.config.FuxiaoaioMybatisAutoConfiguration; +import cn.fuxiaoaio.ygg.framework.redis.config.FuxiaoaioRedisAutoConfiguration; +import cn.fuxiaoaio.ygg.framework.test.config.RedisTestConfiguration; +import cn.fuxiaoaio.ygg.framework.test.config.SqlInitializationTestConfiguration; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration; import org.redisson.spring.starter.RedissonAutoConfiguration; @@ -30,19 +30,19 @@ public class BaseDbAndRedisUnitTest { @Import({ // DB 配置类 - YudaoDataSourceAutoConfiguration.class, // 自己的 DB 配置类 + FuxiaoaioDataSourceAutoConfiguration.class, // 自己的 DB 配置类 DataSourceAutoConfiguration.class, // Spring DB 自动配置类 DataSourceTransactionManagerAutoConfiguration.class, // Spring 事务自动配置类 DruidDataSourceAutoConfigure.class, // Druid 自动配置类 SqlInitializationTestConfiguration.class, // SQL 初始化 // MyBatis 配置类 - YudaoMybatisAutoConfiguration.class, // 自己的 MyBatis 配置类 + FuxiaoaioMybatisAutoConfiguration.class, // 自己的 MyBatis 配置类 MybatisPlusAutoConfiguration.class, // MyBatis 的自动配置类 // Redis 配置类 RedisTestConfiguration.class, // Redis 测试配置类，用于启动 RedisServer RedisAutoConfiguration.class, // Spring Redis 自动配置类 - YudaoRedisAutoConfiguration.class, // 自己的 Redis 配置类 + FuxiaoaioRedisAutoConfiguration.class, // 自己的 Redis 配置类 RedissonAutoConfiguration.class, // Redisson 自动高配置类 }) public static class Application { diff --git a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseDbUnitTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/core/ut/BaseDbUnitTest.java similarity index 79% rename from yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseDbUnitTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/core/ut/BaseDbUnitTest.java index 6a9a3ffcb..92df17d76 100644 --- a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseDbUnitTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/core/ut/BaseDbUnitTest.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.framework.test.core.ut; +package cn.fuxiaoaio.ygg.framework.test.core.ut; -import cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration; -import cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration; -import cn.iocoder.yudao.framework.test.config.SqlInitializationTestConfiguration; +import cn.fuxiaoaio.ygg.framework.datasource.config.FuxiaoaioDataSourceAutoConfiguration; +import cn.fuxiaoaio.ygg.framework.mybatis.config.FuxiaoaioMybatisAutoConfiguration; +import cn.fuxiaoaio.ygg.framework.test.config.SqlInitializationTestConfiguration; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; @@ -26,13 +26,13 @@ public class BaseDbUnitTest { @Import({ // DB 配置类 - YudaoDataSourceAutoConfiguration.class, // 自己的 DB 配置类 + FuxiaoaioDataSourceAutoConfiguration.class, // 自己的 DB 配置类 DataSourceAutoConfiguration.class, // Spring DB 自动配置类 DataSourceTransactionManagerAutoConfiguration.class, // Spring 事务自动配置类 DruidDataSourceAutoConfigure.class, // Druid 自动配置类 SqlInitializationTestConfiguration.class, // SQL 初始化 // MyBatis 配置类 - YudaoMybatisAutoConfiguration.class, // 自己的 MyBatis 配置类 + FuxiaoaioMybatisAutoConfiguration.class, // 自己的 MyBatis 配置类 MybatisPlusAutoConfiguration.class, // MyBatis 的自动配置类 }) public static class Application { diff --git a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseMockitoUnitTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/core/ut/BaseMockitoUnitTest.java similarity index 83% rename from yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseMockitoUnitTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/core/ut/BaseMockitoUnitTest.java index 26048695c..0f70bec79 100644 --- a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseMockitoUnitTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/core/ut/BaseMockitoUnitTest.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.test.core.ut; +package cn.fuxiaoaio.ygg.framework.test.core.ut; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; diff --git a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseRedisUnitTest.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/core/ut/BaseRedisUnitTest.java similarity index 79% rename from yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseRedisUnitTest.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/core/ut/BaseRedisUnitTest.java index 7a112e05d..16c5bb64b 100644 --- a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseRedisUnitTest.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/core/ut/BaseRedisUnitTest.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.test.core.ut; +package cn.fuxiaoaio.ygg.framework.test.core.ut; -import cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration; -import cn.iocoder.yudao.framework.test.config.RedisTestConfiguration; +import cn.fuxiaoaio.ygg.framework.redis.config.FuxiaoaioRedisAutoConfiguration; +import cn.fuxiaoaio.ygg.framework.test.config.RedisTestConfiguration; import org.redisson.spring.starter.RedissonAutoConfiguration; import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; @@ -23,7 +23,7 @@ public class BaseRedisUnitTest { // Redis 配置类 RedisTestConfiguration.class, // Redis 测试配置类，用于启动 RedisServer RedisAutoConfiguration.class, // Spring Redis 自动配置类 - YudaoRedisAutoConfiguration.class, // 自己的 Redis 配置类 + FuxiaoaioRedisAutoConfiguration.class, // 自己的 Redis 配置类 RedissonAutoConfiguration.class, // Redisson 自动高配置类 }) public static class Application { diff --git a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/core/ut/package-info.java similarity index 50% rename from yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/core/ut/package-info.java index bda7aad25..b0bbfc72b 100644 --- a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/core/ut/package-info.java @@ -1,4 +1,4 @@ /** * 提供单元测试 Unit Test 的基类 */ -package cn.iocoder.yudao.framework.test.core.ut; +package cn.fuxiaoaio.ygg.framework.test.core.ut; diff --git a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/util/AssertUtils.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/core/util/AssertUtils.java similarity index 93% rename from yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/util/AssertUtils.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/core/util/AssertUtils.java index c18bd248c..f7bdc515b 100644 --- a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/util/AssertUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/core/util/AssertUtils.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.framework.test.core.util; +package cn.fuxiaoaio.ygg.framework.test.core.util; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ReflectUtil; -import cn.iocoder.yudao.framework.common.exception.ErrorCode; -import cn.iocoder.yudao.framework.common.exception.ServiceException; -import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; +import cn.fuxiaoaio.ygg.framework.common.exception.ErrorCode; +import cn.fuxiaoaio.ygg.framework.common.exception.ServiceException; +import cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.function.Executable; diff --git a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/util/RandomUtils.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/core/util/RandomUtils.java similarity index 97% rename from yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/util/RandomUtils.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/core/util/RandomUtils.java index 7f114e5b1..0ba0db8e0 100644 --- a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/util/RandomUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/core/util/RandomUtils.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.framework.test.core.util; +package cn.fuxiaoaio.ygg.framework.test.core.util; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; import uk.co.jemos.podam.api.PodamFactory; import uk.co.jemos.podam.api.PodamFactoryImpl; import uk.co.jemos.podam.common.AttributeStrategy; diff --git a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/package-info.java similarity index 61% rename from yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/package-info.java index 3a17f5190..080c23b80 100644 --- a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/src/main/java/cn/fuxiaoaio/ygg/framework/test/package-info.java @@ -1,4 +1,4 @@ /** * 测试组件，用于单元测试、集成测试等等 */ -package cn.iocoder.yudao.framework.test; +package cn.fuxiaoaio.ygg.framework.test; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/《芋道 Spring Boot 单元测试 Test 入门》.md b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/《芋道 Spring Boot 单元测试 Test 入门》.md new file mode 100644 index 000000000..f10ce2e44 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-test/《芋道 Spring Boot 单元测试 Test 入门》.md @@ -0,0 +1 @@ + diff --git a/yudao-framework/yudao-spring-boot-starter-web/pom.xml b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/pom.xml similarity index 81% rename from yudao-framework/yudao-spring-boot-starter-web/pom.xml rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/pom.xml index 0ee38a2b3..540386a6b 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/pom.xml +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/pom.xml @@ -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"> - cn.iocoder.cloud - yudao-framework + cn.fuxiaoaio.ygg + fuxiaoaio-framework ${revision} 4.0.0 - yudao-spring-boot-starter-web + fuxiaoaio-spring-boot-starter-web jar ${project.artifactId} @@ -17,8 +17,8 @@ - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common @@ -56,15 +56,15 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-rpc + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-rpc true - cn.iocoder.cloud - yudao-module-infra-api + cn.fuxiaoaio.ygg + fuxiaoaio-module-infra-api ${revision} diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/config/YudaoApiLogAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/config/FuxiaoaioApiLogAutoConfiguration.java similarity index 65% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/config/YudaoApiLogAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/config/FuxiaoaioApiLogAutoConfiguration.java index b6ccdfce7..7e0624f91 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/config/YudaoApiLogAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/config/FuxiaoaioApiLogAutoConfiguration.java @@ -1,15 +1,15 @@ -package cn.iocoder.yudao.framework.apilog.config; +package cn.fuxiaoaio.ygg.framework.apilog.config; -import cn.iocoder.yudao.framework.apilog.core.filter.ApiAccessLogFilter; -import cn.iocoder.yudao.framework.apilog.core.service.ApiAccessLogFrameworkService; -import cn.iocoder.yudao.framework.apilog.core.service.ApiAccessLogFrameworkServiceImpl; -import cn.iocoder.yudao.framework.apilog.core.service.ApiErrorLogFrameworkService; -import cn.iocoder.yudao.framework.apilog.core.service.ApiErrorLogFrameworkServiceImpl; -import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum; -import cn.iocoder.yudao.framework.web.config.WebProperties; -import cn.iocoder.yudao.framework.web.config.YudaoWebAutoConfiguration; -import cn.iocoder.yudao.module.infra.api.logger.ApiAccessLogApi; -import cn.iocoder.yudao.module.infra.api.logger.ApiErrorLogApi; +import cn.fuxiaoaio.ygg.framework.apilog.core.filter.ApiAccessLogFilter; +import cn.fuxiaoaio.ygg.framework.apilog.core.service.ApiAccessLogFrameworkService; +import cn.fuxiaoaio.ygg.framework.apilog.core.service.ApiAccessLogFrameworkServiceImpl; +import cn.fuxiaoaio.ygg.framework.apilog.core.service.ApiErrorLogFrameworkService; +import cn.fuxiaoaio.ygg.framework.apilog.core.service.ApiErrorLogFrameworkServiceImpl; +import cn.fuxiaoaio.ygg.framework.common.enums.WebFilterOrderEnum; +import cn.fuxiaoaio.ygg.framework.web.config.WebProperties; +import cn.fuxiaoaio.ygg.framework.web.config.FuxiaoaioWebAutoConfiguration; +import cn.fuxiaoaio.ygg.module.infra.api.logger.ApiAccessLogApi; +import cn.fuxiaoaio.ygg.module.infra.api.logger.ApiErrorLogApi; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; @@ -20,8 +20,8 @@ import org.springframework.context.annotation.Bean; import javax.servlet.Filter; @AutoConfiguration -@AutoConfigureAfter(YudaoWebAutoConfiguration.class) -public class YudaoApiLogAutoConfiguration { +@AutoConfigureAfter(FuxiaoaioWebAutoConfiguration.class) +public class FuxiaoaioApiLogAutoConfiguration { @Bean public ApiAccessLogFrameworkService apiAccessLogFrameworkService(ApiAccessLogApi apiAccessLogApi) { @@ -37,7 +37,7 @@ public class YudaoApiLogAutoConfiguration { * 创建 ApiAccessLogFilter Bean，记录 API 请求日志 */ @Bean - @ConditionalOnProperty(prefix = "yudao.access-log", value = "enable", matchIfMissing = true) // 允许使用 yudao.access-log.enable=false 禁用访问日志 + @ConditionalOnProperty(prefix = "fuxiaoaio.access-log", value = "enable", matchIfMissing = true) // 允许使用 fuxiaoaio.access-log.enable=false 禁用访问日志 public FilterRegistrationBean apiAccessLogFilter(WebProperties webProperties, @Value("${spring.application.name}") String applicationName, ApiAccessLogFrameworkService apiAccessLogFrameworkService) { diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/config/YudaoApiLogRpcAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/config/FuxiaoaioApiLogRpcAutoConfiguration.java similarity index 64% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/config/YudaoApiLogRpcAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/config/FuxiaoaioApiLogRpcAutoConfiguration.java index c69476699..2d97ef679 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/config/YudaoApiLogRpcAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/config/FuxiaoaioApiLogRpcAutoConfiguration.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.apilog.config; +package cn.fuxiaoaio.ygg.framework.apilog.config; -import cn.iocoder.yudao.module.infra.api.logger.ApiAccessLogApi; -import cn.iocoder.yudao.module.infra.api.logger.ApiErrorLogApi; +import cn.fuxiaoaio.ygg.module.infra.api.logger.ApiAccessLogApi; +import cn.fuxiaoaio.ygg.module.infra.api.logger.ApiErrorLogApi; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Configuration; @@ -14,5 +14,5 @@ import org.springframework.context.annotation.Configuration; @AutoConfiguration @EnableFeignClients(clients = {ApiAccessLogApi.class, // 主要是引入相关的 API 服务 ApiErrorLogApi.class}) -public class YudaoApiLogRpcAutoConfiguration { +public class FuxiaoaioApiLogRpcAutoConfiguration { } diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/filter/ApiAccessLogFilter.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/core/filter/ApiAccessLogFilter.java similarity index 86% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/filter/ApiAccessLogFilter.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/core/filter/ApiAccessLogFilter.java index 3a2ab6bd4..36faa0a4b 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/filter/ApiAccessLogFilter.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/core/filter/ApiAccessLogFilter.java @@ -1,18 +1,18 @@ -package cn.iocoder.yudao.framework.apilog.core.filter; +package cn.fuxiaoaio.ygg.framework.apilog.core.filter; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.extra.servlet.ServletUtil; -import cn.iocoder.yudao.framework.apilog.core.service.ApiAccessLog; -import cn.iocoder.yudao.framework.apilog.core.service.ApiAccessLogFrameworkService; -import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils; -import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; -import cn.iocoder.yudao.framework.web.config.WebProperties; -import cn.iocoder.yudao.framework.web.core.filter.ApiRequestFilter; -import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; +import cn.fuxiaoaio.ygg.framework.apilog.core.service.ApiAccessLog; +import cn.fuxiaoaio.ygg.framework.apilog.core.service.ApiAccessLogFrameworkService; +import cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.util.monitor.TracerUtils; +import cn.fuxiaoaio.ygg.framework.common.util.servlet.ServletUtils; +import cn.fuxiaoaio.ygg.framework.web.config.WebProperties; +import cn.fuxiaoaio.ygg.framework.web.core.filter.ApiRequestFilter; +import cn.fuxiaoaio.ygg.framework.web.core.util.WebFrameworkUtils; import lombok.extern.slf4j.Slf4j; import javax.servlet.FilterChain; @@ -24,7 +24,7 @@ import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; import java.util.Map; -import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString; +import static cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils.toJsonString; /** * API 访问日志 Filter diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiAccessLog.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/core/service/ApiAccessLog.java similarity index 96% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiAccessLog.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/core/service/ApiAccessLog.java index 7799c42f6..80de66625 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiAccessLog.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/core/service/ApiAccessLog.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.apilog.core.service; +package cn.fuxiaoaio.ygg.framework.apilog.core.service; import lombok.Data; diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiAccessLogFrameworkService.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/core/service/ApiAccessLogFrameworkService.java similarity index 83% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiAccessLogFrameworkService.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/core/service/ApiAccessLogFrameworkService.java index 9bfc3a573..0567ffbd7 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiAccessLogFrameworkService.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/core/service/ApiAccessLogFrameworkService.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.apilog.core.service; +package cn.fuxiaoaio.ygg.framework.apilog.core.service; /** * API 访问日志 Framework Service 接口 diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiAccessLogFrameworkServiceImpl.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/core/service/ApiAccessLogFrameworkServiceImpl.java similarity index 75% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiAccessLogFrameworkServiceImpl.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/core/service/ApiAccessLogFrameworkServiceImpl.java index 826897263..a6ebcdc49 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiAccessLogFrameworkServiceImpl.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/core/service/ApiAccessLogFrameworkServiceImpl.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.framework.apilog.core.service; +package cn.fuxiaoaio.ygg.framework.apilog.core.service; import cn.hutool.core.bean.BeanUtil; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.infra.api.logger.ApiAccessLogApi; -import cn.iocoder.yudao.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.infra.api.logger.ApiAccessLogApi; +import cn.fuxiaoaio.ygg.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; import lombok.RequiredArgsConstructor; import org.springframework.scheduling.annotation.Async; diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiErrorLog.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/core/service/ApiErrorLog.java similarity index 97% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiErrorLog.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/core/service/ApiErrorLog.java index 087dd5d08..b5408beb2 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiErrorLog.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/core/service/ApiErrorLog.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.apilog.core.service; +package cn.fuxiaoaio.ygg.framework.apilog.core.service; import lombok.Data; diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiErrorLogFrameworkService.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/core/service/ApiErrorLogFrameworkService.java similarity index 83% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiErrorLogFrameworkService.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/core/service/ApiErrorLogFrameworkService.java index 403c574bc..d93929857 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiErrorLogFrameworkService.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/core/service/ApiErrorLogFrameworkService.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.apilog.core.service; +package cn.fuxiaoaio.ygg.framework.apilog.core.service; /** * API 错误日志 Framework Service 接口 diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiErrorLogFrameworkServiceImpl.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/core/service/ApiErrorLogFrameworkServiceImpl.java similarity index 74% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiErrorLogFrameworkServiceImpl.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/core/service/ApiErrorLogFrameworkServiceImpl.java index d400faa7f..38fc1b59c 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiErrorLogFrameworkServiceImpl.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/core/service/ApiErrorLogFrameworkServiceImpl.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.framework.apilog.core.service; +package cn.fuxiaoaio.ygg.framework.apilog.core.service; import cn.hutool.core.bean.BeanUtil; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.infra.api.logger.ApiErrorLogApi; -import cn.iocoder.yudao.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.infra.api.logger.ApiErrorLogApi; +import cn.fuxiaoaio.ygg.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; import lombok.RequiredArgsConstructor; import org.springframework.scheduling.annotation.Async; diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/package-info.java similarity index 85% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/package-info.java index cb93f3d6c..15d91251e 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/apilog/package-info.java @@ -5,4 +5,4 @@ * * @author 芋道源码 */ -package cn.iocoder.yudao.framework.apilog; +package cn.fuxiaoaio.ygg.framework.apilog; diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/jackson/config/FuxiaoaioJacksonAutoConfiguration.java similarity index 83% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/jackson/config/FuxiaoaioJacksonAutoConfiguration.java index 26ef1de24..a95d3313d 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/jackson/config/FuxiaoaioJacksonAutoConfiguration.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.framework.jackson.config; +package cn.fuxiaoaio.ygg.framework.jackson.config; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; -import cn.iocoder.yudao.framework.jackson.core.databind.LocalDateTimeDeserializer; -import cn.iocoder.yudao.framework.jackson.core.databind.LocalDateTimeSerializer; -import cn.iocoder.yudao.framework.jackson.core.databind.NumberSerializer; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.framework.jackson.core.databind.LocalDateTimeDeserializer; +import cn.fuxiaoaio.ygg.framework.jackson.core.databind.LocalDateTimeSerializer; +import cn.fuxiaoaio.ygg.framework.jackson.core.databind.NumberSerializer; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import lombok.extern.slf4j.Slf4j; @@ -16,7 +16,7 @@ import java.time.LocalDateTime; @AutoConfiguration @Slf4j -public class YudaoJacksonAutoConfiguration { +public class FuxiaoaioJacksonAutoConfiguration { @Bean public BeanPostProcessor objectMapperBeanPostProcessor() { diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/core/databind/LocalDateTimeDeserializer.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/jackson/core/databind/LocalDateTimeDeserializer.java similarity index 93% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/core/databind/LocalDateTimeDeserializer.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/jackson/core/databind/LocalDateTimeDeserializer.java index f4cb71330..aadf72eaa 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/core/databind/LocalDateTimeDeserializer.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/jackson/core/databind/LocalDateTimeDeserializer.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.jackson.core.databind; +package cn.fuxiaoaio.ygg.framework.jackson.core.databind; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/core/databind/LocalDateTimeSerializer.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/jackson/core/databind/LocalDateTimeSerializer.java similarity index 92% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/core/databind/LocalDateTimeSerializer.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/jackson/core/databind/LocalDateTimeSerializer.java index 286fb733e..09566ed3c 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/core/databind/LocalDateTimeSerializer.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/jackson/core/databind/LocalDateTimeSerializer.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.jackson.core.databind; +package cn.fuxiaoaio.ygg.framework.jackson.core.databind; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/core/databind/NumberSerializer.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/jackson/core/databind/NumberSerializer.java similarity index 95% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/core/databind/NumberSerializer.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/jackson/core/databind/NumberSerializer.java index f6ddd3f27..a26e51e5a 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/core/databind/NumberSerializer.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/jackson/core/databind/NumberSerializer.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.jackson.core.databind; +package cn.fuxiaoaio.ygg.framework.jackson.core.databind; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/jackson/core/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/jackson/core/package-info.java new file mode 100644 index 000000000..3883d43fe --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/jackson/core/package-info.java @@ -0,0 +1 @@ +package cn.fuxiaoaio.ygg.framework.jackson.core; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/package-info.java new file mode 100644 index 000000000..9f33cf3ec --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/package-info.java @@ -0,0 +1 @@ +package cn.fuxiaoaio.ygg.framework; diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/swagger/config/FuxiaoaioSwaggerAutoConfiguration.java similarity index 97% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/swagger/config/FuxiaoaioSwaggerAutoConfiguration.java index 2481d2b74..bd83aa57b 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/swagger/config/FuxiaoaioSwaggerAutoConfiguration.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.swagger.config; +package cn.fuxiaoaio.ygg.framework.swagger.config; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.HEADER_TENANT_ID; +import static cn.fuxiaoaio.ygg.framework.web.core.util.WebFrameworkUtils.HEADER_TENANT_ID; /** * Swagger 自动配置类，基于 OpenAPI + Springdoc 实现。 @@ -41,7 +41,7 @@ import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.HEADER_ @ConditionalOnClass({OpenAPI.class}) @EnableConfigurationProperties(SwaggerProperties.class) @ConditionalOnProperty(prefix = "springdoc.api-docs", name = "enabled", havingValue = "true", matchIfMissing = true) // 设置为 false 时，禁用 -public class YudaoSwaggerAutoConfiguration { +public class FuxiaoaioSwaggerAutoConfiguration { // ========== 全局 OpenAPI 配置 ========== diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/SwaggerProperties.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/swagger/config/SwaggerProperties.java similarity index 92% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/SwaggerProperties.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/swagger/config/SwaggerProperties.java index 13a156881..7db64748b 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/SwaggerProperties.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/swagger/config/SwaggerProperties.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.swagger.config; +package cn.fuxiaoaio.ygg.framework.swagger.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -10,7 +10,7 @@ import javax.validation.constraints.NotEmpty; * * @author 芋道源码 */ -@ConfigurationProperties("yudao.swagger") +@ConfigurationProperties("fuxiaoaio.swagger") @Data public class SwaggerProperties { diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/core/SpringFoxHandlerProviderBeanPostProcessor.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/swagger/core/SpringFoxHandlerProviderBeanPostProcessor.java similarity index 93% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/core/SpringFoxHandlerProviderBeanPostProcessor.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/swagger/core/SpringFoxHandlerProviderBeanPostProcessor.java index 38374336a..5be61d672 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/core/SpringFoxHandlerProviderBeanPostProcessor.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/swagger/core/SpringFoxHandlerProviderBeanPostProcessor.java @@ -1,7 +1,7 @@ -//package cn.iocoder.yudao.framework.swagger.core; +//package cn.fuxiaoaio.ygg.framework.swagger.core; // //import cn.hutool.core.util.ReflectUtil; -//import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; +//import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; //import org.springframework.beans.BeansException; //import org.springframework.beans.factory.config.BeanPostProcessor; //import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping; diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/swagger/package-info.java similarity index 66% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/swagger/package-info.java index 5eb782272..d280e29e5 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/swagger/package-info.java @@ -3,4 +3,4 @@ * * @author 芋道源码 */ -package cn.iocoder.yudao.framework.swagger; +package cn.fuxiaoaio.ygg.framework.swagger; diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/config/FuxiaoaioWebAutoConfiguration.java similarity index 85% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/config/FuxiaoaioWebAutoConfiguration.java index 6069f8767..65fe55090 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/config/FuxiaoaioWebAutoConfiguration.java @@ -1,16 +1,16 @@ -package cn.iocoder.yudao.framework.web.config; +package cn.fuxiaoaio.ygg.framework.web.config; -import cn.iocoder.yudao.framework.apilog.core.service.ApiErrorLogFrameworkService; -import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum; -import cn.iocoder.yudao.framework.web.core.clean.JsoupXssCleaner; -import cn.iocoder.yudao.framework.web.core.clean.XssCleaner; -import cn.iocoder.yudao.framework.web.core.filter.CacheRequestBodyFilter; -import cn.iocoder.yudao.framework.web.core.filter.DemoFilter; -import cn.iocoder.yudao.framework.web.core.filter.XssFilter; -import cn.iocoder.yudao.framework.web.core.handler.GlobalExceptionHandler; -import cn.iocoder.yudao.framework.web.core.handler.GlobalResponseBodyHandler; -import cn.iocoder.yudao.framework.web.core.json.XssStringJsonDeserializer; -import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; +import cn.fuxiaoaio.ygg.framework.apilog.core.service.ApiErrorLogFrameworkService; +import cn.fuxiaoaio.ygg.framework.common.enums.WebFilterOrderEnum; +import cn.fuxiaoaio.ygg.framework.web.core.clean.JsoupXssCleaner; +import cn.fuxiaoaio.ygg.framework.web.core.clean.XssCleaner; +import cn.fuxiaoaio.ygg.framework.web.core.filter.CacheRequestBodyFilter; +import cn.fuxiaoaio.ygg.framework.web.core.filter.DemoFilter; +import cn.fuxiaoaio.ygg.framework.web.core.filter.XssFilter; +import cn.fuxiaoaio.ygg.framework.web.core.handler.GlobalExceptionHandler; +import cn.fuxiaoaio.ygg.framework.web.core.handler.GlobalResponseBodyHandler; +import cn.fuxiaoaio.ygg.framework.web.core.json.XssStringJsonDeserializer; +import cn.fuxiaoaio.ygg.framework.web.core.util.WebFrameworkUtils; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.AutoConfiguration; @@ -35,7 +35,7 @@ import javax.servlet.Filter; @AutoConfiguration @EnableConfigurationProperties({WebProperties.class, XssProperties.class}) -public class YudaoWebAutoConfiguration implements WebMvcConfigurer { +public class FuxiaoaioWebAutoConfiguration implements WebMvcConfigurer { @Resource private WebProperties webProperties; @@ -120,7 +120,7 @@ public class YudaoWebAutoConfiguration implements WebMvcConfigurer { * 创建 DemoFilter Bean，演示模式 */ @Bean - @ConditionalOnProperty(value = "yudao.demo", havingValue = "true") + @ConditionalOnProperty(value = "fuxiaoaio.demo", havingValue = "true") public FilterRegistrationBean demoFilter() { return createFilterBean(new DemoFilter(), WebFilterOrderEnum.DEMO_FILTER); } @@ -145,7 +145,7 @@ public class YudaoWebAutoConfiguration implements WebMvcConfigurer { @Bean @ConditionalOnMissingBean(name = "xssJacksonCustomizer") @ConditionalOnBean(ObjectMapper.class) - @ConditionalOnProperty(value = "yudao.xss.enable", havingValue = "true") + @ConditionalOnProperty(value = "fuxiaoaio.xss.enable", havingValue = "true") public Jackson2ObjectMapperBuilderCustomizer xssJacksonCustomizer(XssCleaner xssCleaner) { // 在反序列化时进行 xss 过滤，可以替换使用 XssStringJsonSerializer，在序列化时进行处理 return builder -> builder.deserializerByType(String.class, new XssStringJsonDeserializer(xssCleaner)); diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/WebProperties.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/config/WebProperties.java similarity index 90% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/WebProperties.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/config/WebProperties.java index 03f4d70b6..120d6492d 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/WebProperties.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/config/WebProperties.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.web.config; +package cn.fuxiaoaio.ygg.framework.web.config; import lombok.AllArgsConstructor; import lombok.Data; @@ -11,7 +11,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -@ConfigurationProperties(prefix = "yudao.web") +@ConfigurationProperties(prefix = "fuxiaoaio.web") @Validated @Data public class WebProperties { @@ -37,7 +37,7 @@ public class WebProperties { * 意义：通过该前缀，避免 Swagger、Actuator 意外通过 Nginx 暴露出来给外部，带来安全性问题 * 这样，Nginx 只需要配置转发到 /api/* 的所有接口即可。 * - * @see YudaoWebAutoConfiguration#configurePathMatch(PathMatchConfigurer) + * @see FuxiaoaioWebAutoConfiguration#configurePathMatch(PathMatchConfigurer) */ @NotEmpty(message = "API 前缀不能为空") private String prefix; diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/XssProperties.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/config/XssProperties.java similarity index 84% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/XssProperties.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/config/XssProperties.java index e4d123089..8dcc3f090 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/XssProperties.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/config/XssProperties.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.web.config; +package cn.fuxiaoaio.ygg.framework.web.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -12,7 +12,7 @@ import java.util.List; * * @author 芋道源码 */ -@ConfigurationProperties(prefix = "yudao.xss") +@ConfigurationProperties(prefix = "fuxiaoaio.xss") @Validated @Data public class XssProperties { diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/clean/JsoupXssCleaner.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/clean/JsoupXssCleaner.java similarity index 98% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/clean/JsoupXssCleaner.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/clean/JsoupXssCleaner.java index 559267c3f..16d6b3729 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/clean/JsoupXssCleaner.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/clean/JsoupXssCleaner.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.web.core.clean; +package cn.fuxiaoaio.ygg.framework.web.core.clean; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/clean/XssCleaner.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/clean/XssCleaner.java similarity index 83% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/clean/XssCleaner.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/clean/XssCleaner.java index 433f7e775..e9166b8e7 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/clean/XssCleaner.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/clean/XssCleaner.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.web.core.clean; +package cn.fuxiaoaio.ygg.framework.web.core.clean; /** * 对 html 文本中的有 Xss 风险的数据进行清理 diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/ApiRequestFilter.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/filter/ApiRequestFilter.java similarity index 86% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/ApiRequestFilter.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/filter/ApiRequestFilter.java index 8e78a3b72..2f9456ba6 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/ApiRequestFilter.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/filter/ApiRequestFilter.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.web.core.filter; +package cn.fuxiaoaio.ygg.framework.web.core.filter; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.web.config.WebProperties; +import cn.fuxiaoaio.ygg.framework.web.config.WebProperties; import lombok.RequiredArgsConstructor; import org.springframework.web.filter.OncePerRequestFilter; diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/CacheRequestBodyFilter.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/filter/CacheRequestBodyFilter.java similarity index 88% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/CacheRequestBodyFilter.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/filter/CacheRequestBodyFilter.java index 7051fc883..8551ae8fd 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/CacheRequestBodyFilter.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/filter/CacheRequestBodyFilter.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.web.core.filter; +package cn.fuxiaoaio.ygg.framework.web.core.filter; -import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; +import cn.fuxiaoaio.ygg.framework.common.util.servlet.ServletUtils; import org.springframework.web.filter.OncePerRequestFilter; import javax.servlet.FilterChain; diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/CacheRequestBodyWrapper.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/filter/CacheRequestBodyWrapper.java similarity index 96% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/CacheRequestBodyWrapper.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/filter/CacheRequestBodyWrapper.java index cf65ad3da..684e8bb33 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/CacheRequestBodyWrapper.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/filter/CacheRequestBodyWrapper.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.framework.web.core.filter; +package cn.fuxiaoaio.ygg.framework.web.core.filter; import cn.hutool.extra.servlet.ServletUtil; diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/DemoFilter.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/filter/DemoFilter.java similarity index 77% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/DemoFilter.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/filter/DemoFilter.java index 8e37247d2..076fcc3ba 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/DemoFilter.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/filter/DemoFilter.java @@ -1,16 +1,16 @@ -package cn.iocoder.yudao.framework.web.core.filter; +package cn.fuxiaoaio.ygg.framework.web.core.filter; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; -import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.util.servlet.ServletUtils; +import cn.fuxiaoaio.ygg.framework.web.core.util.WebFrameworkUtils; import org.springframework.web.filter.OncePerRequestFilter; import javax.servlet.FilterChain; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.DEMO_DENY; +import static cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants.DEMO_DENY; /** * 演示 Filter，禁止用户发起写操作，避免影响测试数据 diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/XssFilter.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/filter/XssFilter.java similarity index 89% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/XssFilter.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/filter/XssFilter.java index 2da18768d..6ef713925 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/XssFilter.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/filter/XssFilter.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.web.core.filter; +package cn.fuxiaoaio.ygg.framework.web.core.filter; -import cn.iocoder.yudao.framework.web.config.XssProperties; -import cn.iocoder.yudao.framework.web.core.clean.XssCleaner; +import cn.fuxiaoaio.ygg.framework.web.config.XssProperties; +import cn.fuxiaoaio.ygg.framework.web.core.clean.XssCleaner; import lombok.AllArgsConstructor; import org.springframework.util.PathMatcher; import org.springframework.web.filter.OncePerRequestFilter; diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/XssRequestWrapper.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/filter/XssRequestWrapper.java similarity index 95% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/XssRequestWrapper.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/filter/XssRequestWrapper.java index 9118229e3..ed0712901 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/filter/XssRequestWrapper.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/filter/XssRequestWrapper.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.web.core.filter; +package cn.fuxiaoaio.ygg.framework.web.core.filter; -import cn.iocoder.yudao.framework.web.core.clean.XssCleaner; +import cn.fuxiaoaio.ygg.framework.web.core.clean.XssCleaner; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/handler/GlobalExceptionHandler.java similarity index 95% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/handler/GlobalExceptionHandler.java index 1dd82c6fa..cc3a5dd0c 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/handler/GlobalExceptionHandler.java @@ -1,16 +1,16 @@ -package cn.iocoder.yudao.framework.web.core.handler; +package cn.fuxiaoaio.ygg.framework.web.core.handler; import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.extra.servlet.ServletUtil; -import cn.iocoder.yudao.framework.apilog.core.service.ApiErrorLog; -import cn.iocoder.yudao.framework.common.exception.ServiceException; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.apilog.core.service.ApiErrorLogFrameworkService; -import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils; -import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; -import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; +import cn.fuxiaoaio.ygg.framework.apilog.core.service.ApiErrorLog; +import cn.fuxiaoaio.ygg.framework.common.exception.ServiceException; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.apilog.core.service.ApiErrorLogFrameworkService; +import cn.fuxiaoaio.ygg.framework.common.util.monitor.TracerUtils; +import cn.fuxiaoaio.ygg.framework.web.core.util.WebFrameworkUtils; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.framework.common.util.servlet.ServletUtils; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.AccessDeniedException; @@ -32,7 +32,7 @@ import javax.validation.ValidationException; import java.time.LocalDateTime; import java.util.Map; -import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants.*; /** * 全局异常处理器，将 Exception 翻译成 CommonResult + 对应的异常编号 diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalResponseBodyHandler.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/handler/GlobalResponseBodyHandler.java similarity index 88% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalResponseBodyHandler.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/handler/GlobalResponseBodyHandler.java index 90da742ca..cc97dbcf3 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalResponseBodyHandler.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/handler/GlobalResponseBodyHandler.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.framework.web.core.handler; +package cn.fuxiaoaio.ygg.framework.web.core.handler; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.web.core.util.WebFrameworkUtils; import org.springframework.core.MethodParameter; import org.springframework.http.MediaType; import org.springframework.http.server.ServerHttpRequest; @@ -18,7 +18,7 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice; * 原因是，GlobalResponseBodyHandler 本质上是 AOP，它不应该改变 Controller 返回的数据结构 * * 目前，GlobalResponseBodyHandler 的主要作用是，记录 Controller 的返回结果， - * 方便 {@link cn.iocoder.yudao.framework.apilog.core.filter.ApiAccessLogFilter} 记录访问日志 + * 方便 {@link cn.fuxiaoaio.ygg.framework.apilog.core.filter.ApiAccessLogFilter} 记录访问日志 */ @ControllerAdvice public class GlobalResponseBodyHandler implements ResponseBodyAdvice { diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/json/XssStringJsonDeserializer.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/json/XssStringJsonDeserializer.java similarity index 94% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/json/XssStringJsonDeserializer.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/json/XssStringJsonDeserializer.java index 7e1f631c7..9f2050af7 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/json/XssStringJsonDeserializer.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/json/XssStringJsonDeserializer.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.framework.web.core.json; +package cn.fuxiaoaio.ygg.framework.web.core.json; -import cn.iocoder.yudao.framework.web.core.clean.XssCleaner; +import cn.fuxiaoaio.ygg.framework.web.core.clean.XssCleaner; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/util/WebFrameworkUtils.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/util/WebFrameworkUtils.java similarity index 93% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/util/WebFrameworkUtils.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/util/WebFrameworkUtils.java index cf3b57c62..6cad557ee 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/util/WebFrameworkUtils.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/core/util/WebFrameworkUtils.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.framework.web.core.util; +package cn.fuxiaoaio.ygg.framework.web.core.util; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.enums.RpcConstants; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.web.config.WebProperties; +import cn.fuxiaoaio.ygg.framework.common.enums.RpcConstants; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.web.config.WebProperties; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/package-info.java b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/package-info.java similarity index 52% rename from yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/package-info.java rename to fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/package-info.java index 43b70ebca..eb327e370 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/package-info.java +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/java/cn/fuxiaoaio/ygg/framework/web/package-info.java @@ -1,4 +1,4 @@ /** * 针对 SpringMVC 的基础封装 */ -package cn.iocoder.yudao.framework.web; +package cn.fuxiaoaio.ygg.framework.web; diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..b68cbd74f --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,5 @@ +cn.fuxiaoaio.ygg.framework.apilog.config.FuxiaoaioApiLogAutoConfiguration +cn.fuxiaoaio.ygg.framework.jackson.config.FuxiaoaioJacksonAutoConfiguration +cn.fuxiaoaio.ygg.framework.swagger.config.FuxiaoaioSwaggerAutoConfiguration +cn.fuxiaoaio.ygg.framework.web.config.FuxiaoaioWebAutoConfiguration +cn.fuxiaoaio.ygg.framework.apilog.config.FuxiaoaioApiLogRpcAutoConfiguration diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/《芋道 Spring Boot API 接口文档 Swagger 入门》.md b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/《芋道 Spring Boot API 接口文档 Swagger 入门》.md new file mode 100644 index 000000000..c952c29de --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/《芋道 Spring Boot API 接口文档 Swagger 入门》.md @@ -0,0 +1 @@ + diff --git a/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/《芋道 Spring Boot SpringMVC 入门》.md b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/《芋道 Spring Boot SpringMVC 入门》.md new file mode 100644 index 000000000..3086759e9 --- /dev/null +++ b/fuxiaoaio-framework/fuxiaoaio-spring-boot-starter-web/《芋道 Spring Boot SpringMVC 入门》.md @@ -0,0 +1 @@ + diff --git a/fuxiaoaio-framework/pom.xml b/fuxiaoaio-framework/pom.xml new file mode 100644 index 000000000..aac178d44 --- /dev/null +++ b/fuxiaoaio-framework/pom.xml @@ -0,0 +1,62 @@ + + + 4.0.0 + + fuxiaoaio + cn.fuxiaoaio.ygg + ${revision} + + pom + + fuxiaoaio-common + fuxiaoaio-spring-boot-starter-env + fuxiaoaio-spring-boot-starter-banner + fuxiaoaio-spring-boot-starter-mybatis + fuxiaoaio-spring-boot-starter-redis + fuxiaoaio-spring-boot-starter-web + fuxiaoaio-spring-boot-starter-security + + fuxiaoaio-spring-boot-starter-file + fuxiaoaio-spring-boot-starter-monitor + fuxiaoaio-spring-boot-starter-protection + + fuxiaoaio-spring-boot-starter-job + fuxiaoaio-spring-boot-starter-mq + fuxiaoaio-spring-boot-starter-rpc + + fuxiaoaio-spring-boot-starter-excel + fuxiaoaio-spring-boot-starter-test + + fuxiaoaio-spring-boot-starter-biz-operatelog + fuxiaoaio-spring-boot-starter-biz-dict + fuxiaoaio-spring-boot-starter-biz-sms + + fuxiaoaio-spring-boot-starter-biz-pay + fuxiaoaio-spring-boot-starter-biz-weixin + fuxiaoaio-spring-boot-starter-biz-social + fuxiaoaio-spring-boot-starter-biz-tenant + fuxiaoaio-spring-boot-starter-biz-data-permission + fuxiaoaio-spring-boot-starter-biz-error-code + fuxiaoaio-spring-boot-starter-biz-ip + + fuxiaoaio-spring-boot-starter-flowable + fuxiaoaio-spring-boot-starter-captcha + fuxiaoaio-spring-boot-starter-desensitize + + + fuxiaoaio-framework + + 该包是技术组件，每个子包，代表一个组件。每个组件包括两部分： + 1. core 包：是该组件的核心封装 + 2. config 包：是该组件基于 Spring 的配置 + + 技术组件，也分成两类： + 1. 框架组件：和我们熟悉的 MyBatis、Redis 等等的拓展 + 2. 业务组件：和业务相关的组件的封装，例如说数据字典、操作日志等等。 + 如果是业务组件，Maven 名字会包含 biz + + https://github.com/YunaiV/ruoyi-vue-pro + + diff --git a/yudao-gateway/pom.xml b/fuxiaoaio-gateway/pom.xml similarity index 87% rename from yudao-gateway/pom.xml rename to fuxiaoaio-gateway/pom.xml index f2ee12212..c25cd3ffa 100644 --- a/yudao-gateway/pom.xml +++ b/fuxiaoaio-gateway/pom.xml @@ -3,17 +3,17 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - yudao - cn.iocoder.cloud + fuxiaoaio + cn.fuxiaoaio.ygg ${revision} 4.0.0 - yudao-gateway + fuxiaoaio-gateway jar ${project.artifactId} API 服务网关，基于 Spring Cloud Gateway 实现 - https://github.com/YunaiV/yudao-cloud + https://github.com/YunaiV/fuxiaoaio-cloud @@ -24,8 +24,8 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-banner + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-banner org.springdoc @@ -34,8 +34,8 @@ - cn.iocoder.cloud - yudao-module-system-api + cn.fuxiaoaio.ygg + fuxiaoaio-module-system-api ${revision} @@ -81,8 +81,8 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-monitor + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-monitor diff --git a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/GatewayServerApplication.java b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/GatewayServerApplication.java similarity index 91% rename from yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/GatewayServerApplication.java rename to fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/GatewayServerApplication.java index 99984699f..0664f79d7 100644 --- a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/GatewayServerApplication.java +++ b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/GatewayServerApplication.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.gateway; +package cn.fuxiaoaio.ygg.gateway; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/cors/CorsFilter.java b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/filter/cors/CorsFilter.java similarity index 97% rename from yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/cors/CorsFilter.java rename to fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/filter/cors/CorsFilter.java index 16432ee0e..822e88054 100644 --- a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/cors/CorsFilter.java +++ b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/filter/cors/CorsFilter.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.gateway.filter.cors; +package cn.fuxiaoaio.ygg.gateway.filter.cors; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; diff --git a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/cors/CorsResponseHeaderFilter.java b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/filter/cors/CorsResponseHeaderFilter.java similarity index 97% rename from yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/cors/CorsResponseHeaderFilter.java rename to fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/filter/cors/CorsResponseHeaderFilter.java index 3ea0bd218..239426710 100644 --- a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/cors/CorsResponseHeaderFilter.java +++ b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/filter/cors/CorsResponseHeaderFilter.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.gateway.filter.cors; +package cn.fuxiaoaio.ygg.gateway.filter.cors; import org.springframework.cloud.gateway.filter.GatewayFilterChain; import org.springframework.cloud.gateway.filter.GlobalFilter; diff --git a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/grey/GrayLoadBalancer.java b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/filter/grey/GrayLoadBalancer.java similarity index 96% rename from yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/grey/GrayLoadBalancer.java rename to fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/filter/grey/GrayLoadBalancer.java index 452e5fdb0..aee6ac38e 100644 --- a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/grey/GrayLoadBalancer.java +++ b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/filter/grey/GrayLoadBalancer.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.gateway.filter.grey; +package cn.fuxiaoaio.ygg.gateway.filter.grey; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.gateway.util.EnvUtils; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.gateway.util.EnvUtils; import com.alibaba.cloud.nacos.balancer.NacosBalancer; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/grey/GrayReactiveLoadBalancerClientFilter.java b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/filter/grey/GrayReactiveLoadBalancerClientFilter.java similarity index 99% rename from yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/grey/GrayReactiveLoadBalancerClientFilter.java rename to fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/filter/grey/GrayReactiveLoadBalancerClientFilter.java index 91c226020..da8d5182c 100644 --- a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/grey/GrayReactiveLoadBalancerClientFilter.java +++ b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/filter/grey/GrayReactiveLoadBalancerClientFilter.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.gateway.filter.grey; +package cn.fuxiaoaio.ygg.gateway.filter.grey; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/logging/AccessLog.java b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/filter/logging/AccessLog.java similarity index 97% rename from yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/logging/AccessLog.java rename to fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/filter/logging/AccessLog.java index 52b46fc23..558278ce6 100644 --- a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/logging/AccessLog.java +++ b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/filter/logging/AccessLog.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.gateway.filter.logging; +package cn.fuxiaoaio.ygg.gateway.filter.logging; import lombok.Data; import org.springframework.cloud.gateway.route.Route; diff --git a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/logging/AccessLogFilter.java b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/filter/logging/AccessLogFilter.java similarity index 97% rename from yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/logging/AccessLogFilter.java rename to fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/filter/logging/AccessLogFilter.java index ae79bf605..44e281725 100644 --- a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/logging/AccessLogFilter.java +++ b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/filter/logging/AccessLogFilter.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.gateway.filter.logging; +package cn.fuxiaoaio.ygg.gateway.filter.logging; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.json.JSONUtil; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; -import cn.iocoder.yudao.gateway.util.SecurityFrameworkUtils; -import cn.iocoder.yudao.gateway.util.WebFrameworkUtils; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.gateway.util.SecurityFrameworkUtils; +import cn.fuxiaoaio.ygg.gateway.util.WebFrameworkUtils; import com.alibaba.nacos.common.utils.StringUtils; import lombok.extern.slf4j.Slf4j; import org.reactivestreams.Publisher; @@ -48,7 +48,7 @@ import static cn.hutool.core.date.DatePattern.NORM_DATETIME_MS_FORMATTER; /** * 网关的访问日志过滤器 * - * 从功能上，它类似 yudao-spring-boot-starter-web 的 ApiAccessLogFilter 过滤器 + * 从功能上，它类似 fuxiaoaio-spring-boot-starter-web 的 ApiAccessLogFilter 过滤器 * * TODO 芋艿：如果网关执行异常，不会记录访问日志，后续研究下 https://github.com/Silvmike/webflux-demo/blob/master/tests/src/test/java/ru/hardcoders/demo/webflux/web_handler/filters/logging * diff --git a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/security/LoginUser.java b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/filter/security/LoginUser.java similarity index 76% rename from yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/security/LoginUser.java rename to fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/filter/security/LoginUser.java index 7c7fc407b..d693b1599 100644 --- a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/security/LoginUser.java +++ b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/filter/security/LoginUser.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.gateway.filter.security; +package cn.fuxiaoaio.ygg.gateway.filter.security; import lombok.Data; @@ -7,7 +7,7 @@ import java.util.List; /** * 登录用户信息 * - * copy from yudao-spring-boot-starter-security 的 LoginUser 类 + * copy from fuxiaoaio-spring-boot-starter-security 的 LoginUser 类 * * @author 芋道源码 */ diff --git a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/security/TokenAuthenticationFilter.java b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/filter/security/TokenAuthenticationFilter.java similarity index 92% rename from yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/security/TokenAuthenticationFilter.java rename to fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/filter/security/TokenAuthenticationFilter.java index c944c18fa..d9ec29c07 100644 --- a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/security/TokenAuthenticationFilter.java +++ b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/filter/security/TokenAuthenticationFilter.java @@ -1,14 +1,14 @@ -package cn.iocoder.yudao.gateway.filter.security; +package cn.fuxiaoaio.ygg.gateway.filter.security; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.core.KeyValue; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.cache.CacheUtils; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; -import cn.iocoder.yudao.gateway.util.SecurityFrameworkUtils; -import cn.iocoder.yudao.gateway.util.WebFrameworkUtils; -import cn.iocoder.yudao.module.system.api.oauth2.OAuth2TokenApi; -import cn.iocoder.yudao.module.system.api.oauth2.dto.OAuth2AccessTokenCheckRespDTO; +import cn.fuxiaoaio.ygg.framework.common.core.KeyValue; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.util.cache.CacheUtils; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.gateway.util.SecurityFrameworkUtils; +import cn.fuxiaoaio.ygg.gateway.util.WebFrameworkUtils; +import cn.fuxiaoaio.ygg.module.system.api.oauth2.OAuth2TokenApi; +import cn.fuxiaoaio.ygg.module.system.api.oauth2.dto.OAuth2AccessTokenCheckRespDTO; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; diff --git a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/handler/GlobalExceptionHandler.java b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/handler/GlobalExceptionHandler.java similarity index 90% rename from yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/handler/GlobalExceptionHandler.java rename to fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/handler/GlobalExceptionHandler.java index 51ca11773..0a2b0e467 100644 --- a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/handler/GlobalExceptionHandler.java +++ b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/handler/GlobalExceptionHandler.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.gateway.handler; +package cn.fuxiaoaio.ygg.gateway.handler; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.gateway.util.WebFrameworkUtils; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.gateway.util.WebFrameworkUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.web.reactive.error.ErrorWebExceptionHandler; import org.springframework.core.annotation.Order; @@ -13,12 +13,12 @@ import org.springframework.web.server.ResponseStatusException; import org.springframework.web.server.ServerWebExchange; import reactor.core.publisher.Mono; -import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR; +import static cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR; /** * Gateway 的全局异常处理器，将 Exception 翻译成 CommonResult + 对应的异常编号 * - * 在功能上，和 yudao-spring-boot-starter-web 的 GlobalExceptionHandler 类是一致的 + * 在功能上，和 fuxiaoaio-spring-boot-starter-web 的 GlobalExceptionHandler 类是一致的 * * @author 芋道源码 */ diff --git a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/route/dynamic/package-info.java b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/route/dynamic/package-info.java similarity index 75% rename from yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/route/dynamic/package-info.java rename to fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/route/dynamic/package-info.java index 565bfd526..27061b691 100644 --- a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/route/dynamic/package-info.java +++ b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/route/dynamic/package-info.java @@ -1,10 +1,10 @@ /** * 在 Nacos 配置发生变化时，Spring Cloud Alibaba Nacos Config 内置的监听器，会监听到配置刷新，最终触发 Gateway 的路由信息刷新。 * - * 参见 https://www.iocoder.cn/Spring-Cloud/Spring-Cloud-Gateway/?yudao 博客的「6. 基于配置中心 Nacos 实现动态路由」小节 + * 参见 https://www.iocoder.cn/Spring-Cloud/Spring-Cloud-Gateway/?fuxiaoaio 博客的「6. 基于配置中心 Nacos 实现动态路由」小节 * * 使用方式：在 Nacos 修改 DataId 为 gateway-server.yaml 的配置，修改 spring.cloud.gateway.routes 配置项 * * @author 芋道源码 */ -package cn.iocoder.yudao.gateway.route.dynamic; +package cn.fuxiaoaio.ygg.gateway.route.dynamic; diff --git a/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/route/package-info.java b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/route/package-info.java new file mode 100644 index 000000000..b3ab85a24 --- /dev/null +++ b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/route/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位符 + */ +package cn.fuxiaoaio.ygg.gateway.route; diff --git a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/util/EnvUtils.java b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/util/EnvUtils.java similarity index 91% rename from yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/util/EnvUtils.java rename to fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/util/EnvUtils.java index 5f690460b..573c402a1 100644 --- a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/util/EnvUtils.java +++ b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/util/EnvUtils.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.gateway.util; +package cn.fuxiaoaio.ygg.gateway.util; import cn.hutool.core.net.NetUtil; import cn.hutool.core.util.IdUtil; @@ -11,7 +11,7 @@ import java.util.Objects; /** * 环境 Utils * - * copy from yudao-spring-boot-starter-env 的 EnvUtils 类 + * copy from fuxiaoaio-spring-boot-starter-env 的 EnvUtils 类 * * @author 芋道源码 */ diff --git a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/util/SecurityFrameworkUtils.java b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/util/SecurityFrameworkUtils.java similarity index 92% rename from yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/util/SecurityFrameworkUtils.java rename to fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/util/SecurityFrameworkUtils.java index c0b16635b..027e4e55e 100644 --- a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/util/SecurityFrameworkUtils.java +++ b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/util/SecurityFrameworkUtils.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.gateway.util; +package cn.fuxiaoaio.ygg.gateway.util; import cn.hutool.core.map.MapUtil; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; -import cn.iocoder.yudao.gateway.filter.security.LoginUser; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.gateway.filter.security.LoginUser; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.util.StringUtils; import org.springframework.web.server.ServerWebExchange; @@ -10,7 +10,7 @@ import org.springframework.web.server.ServerWebExchange; /** * 安全服务工具类 * - * copy from yudao-spring-boot-starter-security 的 SecurityFrameworkUtils 类 + * copy from fuxiaoaio-spring-boot-starter-security 的 SecurityFrameworkUtils 类 * * @author 芋道源码 */ diff --git a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/util/WebFrameworkUtils.java b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/util/WebFrameworkUtils.java similarity index 95% rename from yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/util/WebFrameworkUtils.java rename to fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/util/WebFrameworkUtils.java index bc28664bc..95e60bc2a 100644 --- a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/util/WebFrameworkUtils.java +++ b/fuxiaoaio-gateway/src/main/java/cn/fuxiaoaio/ygg/gateway/util/WebFrameworkUtils.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.gateway.util; +package cn.fuxiaoaio.ygg.gateway.util; import cn.hutool.core.net.NetUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.NumberUtil; 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 lombok.extern.slf4j.Slf4j; import org.springframework.cloud.gateway.route.Route; import org.springframework.cloud.gateway.support.ServerWebExchangeUtils; @@ -19,7 +19,7 @@ import reactor.core.publisher.Mono; /** * Web 工具类 * - * copy from yudao-spring-boot-starter-web 的 WebFrameworkUtils 类 + * copy from fuxiaoaio-spring-boot-starter-web 的 WebFrameworkUtils 类 * * @author 芋道源码 */ diff --git a/yudao-gateway/src/main/resources/application-local.yaml b/fuxiaoaio-gateway/src/main/resources/application-local.yaml similarity index 100% rename from yudao-gateway/src/main/resources/application-local.yaml rename to fuxiaoaio-gateway/src/main/resources/application-local.yaml diff --git a/yudao-gateway/src/main/resources/application.yaml b/fuxiaoaio-gateway/src/main/resources/application.yaml similarity index 100% rename from yudao-gateway/src/main/resources/application.yaml rename to fuxiaoaio-gateway/src/main/resources/application.yaml diff --git a/fuxiaoaio-gateway/src/main/resources/bootstrap-dev.yaml b/fuxiaoaio-gateway/src/main/resources/bootstrap-dev.yaml new file mode 100644 index 000000000..141177153 --- /dev/null +++ b/fuxiaoaio-gateway/src/main/resources/bootstrap-dev.yaml @@ -0,0 +1,21 @@ +--- #################### 注册中心相关配置 #################### + +spring: + cloud: + nacos: + server-addr: 101.43.138.73:8848 + discovery: + namespace: dev # 命名空间。这里使用 dev 开发环境 + +--- #################### 配置中心相关配置 #################### + +spring: + cloud: + nacos: + # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类 + config: + server-addr: 101.43.138.73:8848 # Nacos 服务器地址 + namespace: dev # 命名空间。这里使用 dev 开发环境 + group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP + name: # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name + file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties diff --git a/yudao-gateway/src/main/resources/bootstrap-local.yaml b/fuxiaoaio-gateway/src/main/resources/bootstrap-local.yaml similarity index 100% rename from yudao-gateway/src/main/resources/bootstrap-local.yaml rename to fuxiaoaio-gateway/src/main/resources/bootstrap-local.yaml diff --git a/yudao-gateway/src/main/resources/bootstrap.yaml b/fuxiaoaio-gateway/src/main/resources/bootstrap.yaml similarity index 95% rename from yudao-gateway/src/main/resources/bootstrap.yaml rename to fuxiaoaio-gateway/src/main/resources/bootstrap.yaml index 3eed7be68..e7e8ccdea 100644 --- a/yudao-gateway/src/main/resources/bootstrap.yaml +++ b/fuxiaoaio-gateway/src/main/resources/bootstrap.yaml @@ -3,7 +3,7 @@ spring: name: gateway-server profiles: - active: local + active: dev server: port: 48080 diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/logback-spring.xml b/fuxiaoaio-gateway/src/main/resources/logback-spring.xml similarity index 95% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/logback-spring.xml rename to fuxiaoaio-gateway/src/main/resources/logback-spring.xml index 5f4b30d04..509b469f8 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/logback-spring.xml +++ b/fuxiaoaio-gateway/src/main/resources/logback-spring.xml @@ -1,8 +1,8 @@ - - + + diff --git a/yudao-gateway/src/main/resources/static/favicon.ico b/fuxiaoaio-gateway/src/main/resources/static/favicon.ico similarity index 100% rename from yudao-gateway/src/main/resources/static/favicon.ico rename to fuxiaoaio-gateway/src/main/resources/static/favicon.ico diff --git a/yudao-gateway/src/test/java/cn/iocoder/yudao/ProjectReactor.java b/fuxiaoaio-gateway/src/test/java/cn/fuxiaoaio/ygg/ProjectReactor.java similarity index 91% rename from yudao-gateway/src/test/java/cn/iocoder/yudao/ProjectReactor.java rename to fuxiaoaio-gateway/src/test/java/cn/fuxiaoaio/ygg/ProjectReactor.java index edcb06598..870ec97df 100644 --- a/yudao-gateway/src/test/java/cn/iocoder/yudao/ProjectReactor.java +++ b/fuxiaoaio-gateway/src/test/java/cn/fuxiaoaio/ygg/ProjectReactor.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao; +package cn.fuxiaoaio.ygg; import cn.hutool.core.io.FileTypeUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.util.collection.SetUtils; +import cn.fuxiaoaio.ygg.framework.common.util.collection.SetUtils; import lombok.extern.slf4j.Slf4j; import java.io.File; @@ -25,10 +25,10 @@ import static java.io.File.separator; @Slf4j public class ProjectReactor { - private static final String GROUP_ID = "cn.iocoder.cloud"; - private static final String ARTIFACT_ID = "yudao"; - private static final String PACKAGE_NAME = "cn.iocoder.yudao"; - private static final String TITLE = "芋道管理系统"; + private static final String GROUP_ID = "cn.fuxiaoaio.ygg"; + private static final String ARTIFACT_ID = "fuxiaoaio"; + private static final String PACKAGE_NAME = "cn.fuxiaoaio.ygg"; + private static final String TITLE = "西木"; /** * 白名单文件，不进行重写，避免出问题 @@ -42,11 +42,11 @@ public class ProjectReactor { log.info("[main][原项目路劲改地址 ({})]", projectBaseDir); // ========== 配置，需要你手动修改 ========== - String groupIdNew = "cn.star.gg"; - String artifactIdNew = "star"; - String packageNameNew = "cn.start.pp"; - String titleNew = "土豆管理系统"; - String projectBaseDirNew = projectBaseDir + "-new"; // 一键改名后，“新”项目所在的目录 + String groupIdNew = "cn.fuxiaoaio.ygg"; + String artifactIdNew = "fuxiaoaio"; + String packageNameNew = "cn.fuxiaoaio.ygg"; + String titleNew = "西木"; + String projectBaseDirNew = "/Users/chenyang/ww" + "-new"; // 一键改名后，“新”项目所在的目录 log.info("[main][检测新项目目录 ({})是否存在]", projectBaseDirNew); if (FileUtil.exist(projectBaseDirNew)) { log.error("[main][新项目目录检测 ({})已存在，请更改新的目录！程序退出]", projectBaseDirNew); diff --git a/yudao-module-bpm/yudao-module-bpm-api/pom.xml b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/pom.xml similarity index 77% rename from yudao-module-bpm/yudao-module-bpm-api/pom.xml rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/pom.xml index ba89fc7f6..6a1fcb9cb 100644 --- a/yudao-module-bpm/yudao-module-bpm-api/pom.xml +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/pom.xml @@ -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"> - cn.iocoder.cloud - yudao-module-bpm + cn.fuxiaoaio.ygg + fuxiaoaio-module-bpm ${revision} 4.0.0 - yudao-module-bpm-api + fuxiaoaio-module-bpm-api jar ${project.artifactId} @@ -18,8 +18,8 @@ - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/package-info.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/api/package-info.java similarity index 59% rename from yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/package-info.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/api/package-info.java index 37a92219f..1de34e70b 100644 --- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/package-info.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/api/package-info.java @@ -1,4 +1,4 @@ /** * bpm API 包，定义暴露给其它模块的 API */ -package cn.iocoder.yudao.module.bpm.api; +package cn.fuxiaoaio.ygg.module.bpm.api; diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApi.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/api/task/BpmProcessInstanceApi.java similarity index 79% rename from yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApi.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/api/task/BpmProcessInstanceApi.java index e94a2c84f..8742b03cf 100644 --- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApi.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/api/task/BpmProcessInstanceApi.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.bpm.api.task; +package cn.fuxiaoaio.ygg.module.bpm.api.task; -import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; +import cn.fuxiaoaio.ygg.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; import javax.validation.Valid; diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/task/dto/BpmProcessInstanceCreateReqDTO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/api/task/dto/BpmProcessInstanceCreateReqDTO.java similarity index 92% rename from yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/task/dto/BpmProcessInstanceCreateReqDTO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/api/task/dto/BpmProcessInstanceCreateReqDTO.java index 5d7edbe80..302c45c84 100644 --- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/task/dto/BpmProcessInstanceCreateReqDTO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/api/task/dto/BpmProcessInstanceCreateReqDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.api.task.dto; +package cn.fuxiaoaio.ygg.module.bpm.api.task.dto; import lombok.Data; diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/DictTypeConstants.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/DictTypeConstants.java similarity index 87% rename from yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/DictTypeConstants.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/DictTypeConstants.java index 7abb3e1db..89e9bb19a 100644 --- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/DictTypeConstants.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/DictTypeConstants.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.enums; +package cn.fuxiaoaio.ygg.module.bpm.enums; /** * BPM 字典类型的枚举类 diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/ErrorCodeConstants.java similarity index 97% rename from yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/ErrorCodeConstants.java index 760985804..937adbfe1 100644 --- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/ErrorCodeConstants.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.bpm.enums; +package cn.fuxiaoaio.ygg.module.bpm.enums; -import cn.iocoder.yudao.framework.common.exception.ErrorCode; +import cn.fuxiaoaio.ygg.framework.common.exception.ErrorCode; /** * Bpm 错误码枚举类 diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmModelFormTypeEnum.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/definition/BpmModelFormTypeEnum.java similarity index 88% rename from yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmModelFormTypeEnum.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/definition/BpmModelFormTypeEnum.java index c21d6f999..20ab7faca 100644 --- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmModelFormTypeEnum.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/definition/BpmModelFormTypeEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.enums.definition; +package cn.fuxiaoaio.ygg.module.bpm.enums.definition; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmTaskAssignRuleTypeEnum.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/definition/BpmTaskAssignRuleTypeEnum.java similarity index 92% rename from yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmTaskAssignRuleTypeEnum.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/definition/BpmTaskAssignRuleTypeEnum.java index b7ccc7ae8..d69d1dcee 100644 --- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmTaskAssignRuleTypeEnum.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/definition/BpmTaskAssignRuleTypeEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.enums.definition; +package cn.fuxiaoaio.ygg.module.bpm.enums.definition; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmTaskRuleScriptEnum.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/definition/BpmTaskRuleScriptEnum.java similarity index 91% rename from yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmTaskRuleScriptEnum.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/definition/BpmTaskRuleScriptEnum.java index 7fc0e3b8b..069fc91c6 100644 --- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmTaskRuleScriptEnum.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/definition/BpmTaskRuleScriptEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.enums.definition; +package cn.fuxiaoaio.ygg.module.bpm.enums.definition; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/message/BpmMessageEnum.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/message/BpmMessageEnum.java similarity index 92% rename from yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/message/BpmMessageEnum.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/message/BpmMessageEnum.java index 79001fccd..fb830343f 100644 --- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/message/BpmMessageEnum.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/message/BpmMessageEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.enums.message; +package cn.fuxiaoaio.ygg.module.bpm.enums.message; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceDeleteReasonEnum.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/task/BpmProcessInstanceDeleteReasonEnum.java similarity index 96% rename from yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceDeleteReasonEnum.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/task/BpmProcessInstanceDeleteReasonEnum.java index 4f99d0a3d..5aece66ad 100644 --- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceDeleteReasonEnum.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/task/BpmProcessInstanceDeleteReasonEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.enums.task; +package cn.fuxiaoaio.ygg.module.bpm.enums.task; import cn.hutool.core.util.StrUtil; import lombok.AllArgsConstructor; diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceResultEnum.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/task/BpmProcessInstanceResultEnum.java similarity index 90% rename from yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceResultEnum.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/task/BpmProcessInstanceResultEnum.java index 3b57554cf..4f1c24956 100644 --- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceResultEnum.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/task/BpmProcessInstanceResultEnum.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.bpm.enums.task; +package cn.fuxiaoaio.ygg.module.bpm.enums.task; -import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; +import cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java similarity index 88% rename from yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java index 70a31dd34..097b169c1 100644 --- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-api/src/main/java/cn/fuxiaoaio/ygg/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.enums.task; +package cn.fuxiaoaio.ygg.module.bpm.enums.task; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/pom.xml b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/pom.xml similarity index 61% rename from yudao-module-bpm/yudao-module-bpm-biz/pom.xml rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/pom.xml index 03e87839d..bed11ac37 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/pom.xml +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/pom.xml @@ -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"> - cn.iocoder.cloud - yudao-module-bpm + cn.fuxiaoaio.ygg + fuxiaoaio-module-bpm ${revision} 4.0.0 - yudao-module-bpm-biz + fuxiaoaio-module-bpm-biz ${project.artifactId} @@ -23,55 +23,55 @@ - cn.iocoder.cloud - yudao-module-bpm-api + cn.fuxiaoaio.ygg + fuxiaoaio-module-bpm-api ${revision} - cn.iocoder.cloud - yudao-module-system-api + cn.fuxiaoaio.ygg + fuxiaoaio-module-system-api ${revision} - cn.iocoder.cloud - yudao-spring-boot-starter-biz-operatelog + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-operatelog - cn.iocoder.cloud - yudao-spring-boot-starter-biz-data-permission + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-data-permission - cn.iocoder.cloud - yudao-spring-boot-starter-biz-tenant + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-tenant - cn.iocoder.cloud - yudao-spring-boot-starter-biz-error-code + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-error-code - cn.iocoder.cloud - yudao-spring-boot-starter-security + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-security - cn.iocoder.cloud - yudao-spring-boot-starter-mybatis + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-mybatis - cn.iocoder.cloud - yudao-spring-boot-starter-redis + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-redis - cn.iocoder.cloud - yudao-spring-boot-starter-rpc + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-rpc @@ -88,38 +88,38 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-job + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-job - cn.iocoder.cloud - yudao-spring-boot-starter-mq + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-mq - - + + - cn.iocoder.cloud - yudao-spring-boot-starter-test + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-test - cn.iocoder.cloud - yudao-spring-boot-starter-monitor + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-monitor - cn.iocoder.cloud - yudao-spring-boot-starter-flowable + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-flowable diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/BpmServerApplication.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/BpmServerApplication.java similarity index 97% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/BpmServerApplication.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/BpmServerApplication.java index d86a045a2..8c01ce27b 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/BpmServerApplication.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/BpmServerApplication.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm; +package cn.fuxiaoaio.ygg.module.bpm; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/api/package-info.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/api/package-info.java similarity index 61% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/api/package-info.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/api/package-info.java index 2137e2203..ad474e6ee 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/api/package-info.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/api/package-info.java @@ -1,4 +1,4 @@ /** * bpm API 实现类，定义暴露给其它模块的 API */ -package cn.iocoder.yudao.module.bpm.api; +package cn.fuxiaoaio.ygg.module.bpm.api; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApiImpl.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/api/task/BpmProcessInstanceApiImpl.java similarity index 79% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApiImpl.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/api/task/BpmProcessInstanceApiImpl.java index 596c9981a..793e0e819 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApiImpl.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/api/task/BpmProcessInstanceApiImpl.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.bpm.api.task; +package cn.fuxiaoaio.ygg.module.bpm.api.task; -import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; -import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService; +import cn.fuxiaoaio.ygg.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; +import cn.fuxiaoaio.ygg.module.bpm.service.task.BpmProcessInstanceService; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmFormController.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/BpmFormController.java similarity index 84% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmFormController.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/BpmFormController.java index b1c9e4087..7e8d5d92a 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmFormController.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/BpmFormController.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.*; -import cn.iocoder.yudao.module.bpm.convert.definition.BpmFormConvert; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO; -import cn.iocoder.yudao.module.bpm.service.definition.BpmFormService; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.form.*; +import cn.fuxiaoaio.ygg.module.bpm.convert.definition.BpmFormConvert; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmFormDO; +import cn.fuxiaoaio.ygg.module.bpm.service.definition.BpmFormService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -17,7 +17,7 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 动态表单") @RestController diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/BpmModelController.java similarity index 87% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/BpmModelController.java index d629b7546..7170dabac 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/BpmModelController.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.io.IoUtils; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.*; -import cn.iocoder.yudao.module.bpm.convert.definition.BpmModelConvert; -import cn.iocoder.yudao.module.bpm.service.definition.BpmModelService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.io.IoUtils; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.model.*; +import cn.fuxiaoaio.ygg.module.bpm.convert.definition.BpmModelConvert; +import cn.fuxiaoaio.ygg.module.bpm.service.definition.BpmModelService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -18,7 +18,7 @@ import javax.validation.Valid; import java.io.IOException; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 流程模型") @RestController diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java similarity index 79% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java index f7035f0e8..93d49d539 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionListReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageItemRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO; -import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionListReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageItemRespVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO; +import cn.fuxiaoaio.ygg.module.bpm.service.definition.BpmProcessDefinitionService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -21,7 +21,7 @@ import javax.annotation.Resource; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 流程定义") @RestController diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmTaskAssignRuleController.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/BpmTaskAssignRuleController.java similarity index 83% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmTaskAssignRuleController.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/BpmTaskAssignRuleController.java index 2933ec116..286d30e8d 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmTaskAssignRuleController.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/BpmTaskAssignRuleController.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleUpdateReqVO; -import cn.iocoder.yudao.module.bpm.service.definition.BpmTaskAssignRuleService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleCreateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleRespVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleUpdateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.service.definition.BpmTaskAssignRuleService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -17,7 +17,7 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 任务分配规则") @RestController diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmUserGroupController.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/BpmUserGroupController.java similarity index 81% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmUserGroupController.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/BpmUserGroupController.java index 6d86667c0..46a94537f 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmUserGroupController.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/BpmUserGroupController.java @@ -1,15 +1,15 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupPageReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupUpdateReqVO; -import cn.iocoder.yudao.module.bpm.convert.definition.BpmUserGroupConvert; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO; -import cn.iocoder.yudao.module.bpm.service.definition.BpmUserGroupService; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.group.BpmUserGroupCreateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.group.BpmUserGroupPageReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.group.BpmUserGroupRespVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.group.BpmUserGroupUpdateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.convert.definition.BpmUserGroupConvert; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmUserGroupDO; +import cn.fuxiaoaio.ygg.module.bpm.service.definition.BpmUserGroupService; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -21,7 +21,7 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 用户组") @RestController diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormBaseVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/form/BpmFormBaseVO.java similarity index 92% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormBaseVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/form/BpmFormBaseVO.java index b094ec5a4..c359b6d9d 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormBaseVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/form/BpmFormBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.form; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormCreateReqVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/form/BpmFormCreateReqVO.java similarity index 91% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormCreateReqVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/form/BpmFormCreateReqVO.java index ade43bc27..ce3e226c2 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormCreateReqVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/form/BpmFormCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.form; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormPageReqVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/form/BpmFormPageReqVO.java similarity index 79% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormPageReqVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/form/BpmFormPageReqVO.java index 60e5df7f6..ed7da761f 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormPageReqVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/form/BpmFormPageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.form; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormRespVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/form/BpmFormRespVO.java similarity index 93% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormRespVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/form/BpmFormRespVO.java index 563dde569..9cf59fe4e 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormRespVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/form/BpmFormRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.form; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormSimpleRespVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/form/BpmFormSimpleRespVO.java similarity index 87% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormSimpleRespVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/form/BpmFormSimpleRespVO.java index f62d63766..2e6ca1173 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormSimpleRespVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/form/BpmFormSimpleRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.form; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormUpdateReqVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/form/BpmFormUpdateReqVO.java similarity index 92% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormUpdateReqVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/form/BpmFormUpdateReqVO.java index 1d8d48b46..aaa823a0d 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormUpdateReqVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/form/BpmFormUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.form; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupBaseVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/group/BpmUserGroupBaseVO.java similarity index 93% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupBaseVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/group/BpmUserGroupBaseVO.java index 92c8e3be1..59af8696d 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupBaseVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/group/BpmUserGroupBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.group; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupCreateReqVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/group/BpmUserGroupCreateReqVO.java similarity index 81% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupCreateReqVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/group/BpmUserGroupCreateReqVO.java index fbfcbe39d..4806ec5ba 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupCreateReqVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/group/BpmUserGroupCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.group; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupPageReqVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/group/BpmUserGroupPageReqVO.java similarity index 81% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupPageReqVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/group/BpmUserGroupPageReqVO.java index 3e60fe774..a0b644a6e 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupPageReqVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/group/BpmUserGroupPageReqVO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.group; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.util.date.DateUtils; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupRespVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/group/BpmUserGroupRespVO.java similarity index 88% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupRespVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/group/BpmUserGroupRespVO.java index 607f56727..f5e02c27d 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupRespVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/group/BpmUserGroupRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.group; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupSimpleRespVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/group/BpmUserGroupSimpleRespVO.java similarity index 89% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupSimpleRespVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/group/BpmUserGroupSimpleRespVO.java index 5afcc5375..1b3a584ef 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupSimpleRespVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/group/BpmUserGroupSimpleRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.group; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupUpdateReqVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/group/BpmUserGroupUpdateReqVO.java similarity index 87% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupUpdateReqVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/group/BpmUserGroupUpdateReqVO.java index fb011a6d3..14d689140 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupUpdateReqVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/group/BpmUserGroupUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.group; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModeImportReqVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/model/BpmModeImportReqVO.java similarity index 91% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModeImportReqVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/model/BpmModeImportReqVO.java index acf68a3fb..36ca89834 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModeImportReqVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/model/BpmModeImportReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.model; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelBaseVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/model/BpmModelBaseVO.java similarity index 94% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelBaseVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/model/BpmModelBaseVO.java index 803065282..cfe3f093b 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelBaseVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/model/BpmModelBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.model; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -12,7 +12,7 @@ import javax.validation.constraints.NotEmpty; @Data public class BpmModelBaseVO { - @Schema(description = "流程标识", required = true, example = "process_yudao") + @Schema(description = "流程标识", required = true, example = "process_fuxiaoaio") @NotEmpty(message = "流程标识不能为空") private String key; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelCreateReqVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/model/BpmModelCreateReqVO.java similarity index 89% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelCreateReqVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/model/BpmModelCreateReqVO.java index 3b5605e1c..54de969ce 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelCreateReqVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/model/BpmModelCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.model; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -12,7 +12,7 @@ import javax.validation.constraints.NotEmpty; @Data public class BpmModelCreateReqVO { - @Schema(description = "流程标识", required = true, example = "process_yudao") + @Schema(description = "流程标识", required = true, example = "process_fuxiaoaio") @NotEmpty(message = "流程标识不能为空") private String key; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelPageItemRespVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/model/BpmModelPageItemRespVO.java similarity index 95% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelPageItemRespVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/model/BpmModelPageItemRespVO.java index 9c543503e..4875d96f8 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelPageItemRespVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/model/BpmModelPageItemRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.model; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelPageReqVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/model/BpmModelPageReqVO.java similarity index 85% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelPageReqVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/model/BpmModelPageReqVO.java index 9e9bbde5a..0a89b8e97 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelPageReqVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/model/BpmModelPageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.model; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelRespVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/model/BpmModelRespVO.java similarity index 91% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelRespVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/model/BpmModelRespVO.java index 251853bb0..4509ddf66 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelRespVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/model/BpmModelRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.model; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateReqVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateReqVO.java similarity index 96% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateReqVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateReqVO.java index bf20f225e..0eaf9425a 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateReqVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.model; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateStateReqVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateStateReqVO.java similarity index 90% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateStateReqVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateStateReqVO.java index bc5632f3f..b652993dc 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateStateReqVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateStateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.model; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionListReqVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionListReqVO.java similarity index 81% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionListReqVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionListReqVO.java index 1a1230adb..d3f5fc03c 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionListReqVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionListReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.process; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionPageItemRespVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionPageItemRespVO.java similarity index 91% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionPageItemRespVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionPageItemRespVO.java index 18f3a214e..2eadfef90 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionPageItemRespVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionPageItemRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.process; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionPageReqVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionPageReqVO.java similarity index 80% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionPageReqVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionPageReqVO.java index e197e83cc..88e62b752 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionPageReqVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionPageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.process; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionRespVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionRespVO.java similarity index 97% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionRespVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionRespVO.java index 84b183627..f9a3e6721 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionRespVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.process; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleBaseVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleBaseVO.java similarity index 92% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleBaseVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleBaseVO.java index 0ec4097d0..fe129eb19 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleBaseVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.rule; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleCreateReqVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleCreateReqVO.java similarity index 92% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleCreateReqVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleCreateReqVO.java index 37976bafb..1da47ddda 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleCreateReqVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.rule; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleRespVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleRespVO.java similarity index 94% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleRespVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleRespVO.java index 622c8b02e..7227e1a1a 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleRespVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.rule; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleUpdateReqVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleUpdateReqVO.java similarity index 90% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleUpdateReqVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleUpdateReqVO.java index ffb5a4a88..dcb8309fd 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleUpdateReqVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.rule; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOALeaveController.http b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/oa/BpmOALeaveController.http similarity index 100% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOALeaveController.http rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/oa/BpmOALeaveController.http diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOALeaveController.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/oa/BpmOALeaveController.java similarity index 74% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOALeaveController.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/oa/BpmOALeaveController.java index ff4075995..faf20ecec 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOALeaveController.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/oa/BpmOALeaveController.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.oa; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.oa; -import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeaveCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeavePageReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeaveRespVO; -import cn.iocoder.yudao.module.bpm.convert.oa.BpmOALeaveConvert; -import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOALeaveDO; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.bpm.service.oa.BpmOALeaveService; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.oa.vo.BpmOALeaveCreateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.oa.vo.BpmOALeavePageReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.oa.vo.BpmOALeaveRespVO; +import cn.fuxiaoaio.ygg.module.bpm.convert.oa.BpmOALeaveConvert; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.oa.BpmOALeaveDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.bpm.service.oa.BpmOALeaveService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -18,8 +18,8 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; /** * OA 请假申请 Controller，用于演示自己存储数据，接入工作流的例子 diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/package-info.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/oa/package-info.java similarity index 77% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/package-info.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/oa/package-info.java index 7028708b1..ac4ae39dc 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/package-info.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/oa/package-info.java @@ -2,4 +2,4 @@ * OA 示例，用于演示外部业务接入 BPM 工作流的示例 * 一般的接入方式，只需要调用 接口，后续 Admin 用户在管理后台的【待办事务】进行审批 */ -package cn.iocoder.yudao.module.bpm.controller.admin.oa; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.oa; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveBaseVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/oa/vo/BpmOALeaveBaseVO.java similarity index 90% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveBaseVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/oa/vo/BpmOALeaveBaseVO.java index e33884bba..67c695181 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveBaseVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/oa/vo/BpmOALeaveBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.oa.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; /** * 请假申请 Base VO，提供给添加、修改、详细的子 VO 使用 diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveCreateReqVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/oa/vo/BpmOALeaveCreateReqVO.java similarity index 90% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveCreateReqVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/oa/vo/BpmOALeaveCreateReqVO.java index 39ce08021..c1cec6dd0 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveCreateReqVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/oa/vo/BpmOALeaveCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.oa.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeavePageReqVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/oa/vo/BpmOALeavePageReqVO.java similarity index 82% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeavePageReqVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/oa/vo/BpmOALeavePageReqVO.java index 88eb1c62f..e6e1c1870 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeavePageReqVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/oa/vo/BpmOALeavePageReqVO.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.oa.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 请假申请分页 Request VO") @Data diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveRespVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/oa/vo/BpmOALeaveRespVO.java similarity index 88% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveRespVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/oa/vo/BpmOALeaveRespVO.java index cf18e25ad..49a452af3 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveRespVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/oa/vo/BpmOALeaveRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.oa.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 请假申请 Response VO") @Data diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmActivityController.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/BpmActivityController.java similarity index 82% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmActivityController.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/BpmActivityController.java index 966a920f3..110d68326 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmActivityController.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/BpmActivityController.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.task; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.task; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.activity.BpmActivityRespVO; -import cn.iocoder.yudao.module.bpm.service.task.BpmActivityService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.activity.BpmActivityRespVO; +import cn.fuxiaoaio.ygg.module.bpm.service.task.BpmActivityService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 流程活动实例") @RestController diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/BpmProcessInstanceController.java similarity index 85% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/BpmProcessInstanceController.java index c7d86d008..081210186 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/BpmProcessInstanceController.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.task; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.task; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.*; -import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.instance.*; +import cn.fuxiaoaio.ygg.module.bpm.service.task.BpmProcessInstanceService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; @Tag(name = "管理后台 - 流程实例") // 流程实例，通过流程定义创建的一次“申请” @RestController diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/BpmTaskController.java similarity index 87% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/BpmTaskController.java index e706267f1..2567b188b 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/BpmTaskController.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.task; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.task; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.*; -import cn.iocoder.yudao.module.bpm.service.task.BpmTaskService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.task.*; +import cn.fuxiaoaio.ygg.module.bpm.service.task.BpmTaskService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -16,8 +16,8 @@ import javax.validation.Valid; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.getLoginUserId; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.web.core.util.WebFrameworkUtils.getLoginUserId; @Tag(name = "管理后台 - 流程任务实例") @RestController diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/activity/BpmActivityRespVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/activity/BpmActivityRespVO.java similarity index 93% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/activity/BpmActivityRespVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/activity/BpmActivityRespVO.java index f96dae69b..5ca2b2e0b 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/activity/BpmActivityRespVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/activity/BpmActivityRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.activity; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.activity; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCancelReqVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCancelReqVO.java similarity index 91% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCancelReqVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCancelReqVO.java index 672838458..5be719b9e 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCancelReqVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCancelReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.instance; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCreateReqVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCreateReqVO.java similarity index 90% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCreateReqVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCreateReqVO.java index 3dc8803d7..5b9472d6f 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCreateReqVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.instance; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceMyPageReqVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceMyPageReqVO.java similarity index 87% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceMyPageReqVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceMyPageReqVO.java index 13bd28c6d..9a5eff08a 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceMyPageReqVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceMyPageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.instance; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 流程实例的分页 Item Response VO") @Data diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstancePageItemRespVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/instance/BpmProcessInstancePageItemRespVO.java similarity index 96% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstancePageItemRespVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/instance/BpmProcessInstancePageItemRespVO.java index 5ddf82151..511d9e80e 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstancePageItemRespVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/instance/BpmProcessInstancePageItemRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.instance; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java similarity index 98% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java index 526f90818..82a68b028 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.instance; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java similarity index 90% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java index 48de29020..40b6b2ad7 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.task; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskDonePageItemRespVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/task/BpmTaskDonePageItemRespVO.java similarity index 93% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskDonePageItemRespVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/task/BpmTaskDonePageItemRespVO.java index cb78d1988..1eb4f21e5 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskDonePageItemRespVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/task/BpmTaskDonePageItemRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.task; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskDonePageReqVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/task/BpmTaskDonePageReqVO.java similarity index 83% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskDonePageReqVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/task/BpmTaskDonePageReqVO.java index baf77350b..9c75c89bc 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskDonePageReqVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/task/BpmTaskDonePageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.task; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 流程任务的 Done 已办的分页 Request VO") @Data diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskRejectReqVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/task/BpmTaskRejectReqVO.java similarity index 90% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskRejectReqVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/task/BpmTaskRejectReqVO.java index 06af07275..bc77f2c5f 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskRejectReqVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/task/BpmTaskRejectReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.task; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java similarity index 94% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java index 972bafa8d..55216595f 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.task; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageItemRespVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageItemRespVO.java similarity index 96% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageItemRespVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageItemRespVO.java index 811db66e7..4676c0e33 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageItemRespVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageItemRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.task; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageReqVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageReqVO.java similarity index 75% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageReqVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageReqVO.java index 605007ef5..c2470b827 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageReqVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageReqVO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.task; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.util.date.DateUtils; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 流程任务的 TODO 待办的分页 Request VO") @Data diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskUpdateAssigneeReqVO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/task/BpmTaskUpdateAssigneeReqVO.java similarity index 92% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskUpdateAssigneeReqVO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/task/BpmTaskUpdateAssigneeReqVO.java index d8bef86e6..546e3a006 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskUpdateAssigneeReqVO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/admin/task/vo/task/BpmTaskUpdateAssigneeReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task; +package cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.task; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/app/package-info.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/app/package-info.java new file mode 100644 index 000000000..e60c76f36 --- /dev/null +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/app/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package cn.fuxiaoaio.ygg.module.bpm.controller.app; diff --git a/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/package-info.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/package-info.java new file mode 100644 index 000000000..dee7be224 --- /dev/null +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/controller/package-info.java @@ -0,0 +1,6 @@ +/** + * 提供 RESTful API 给前端： + * 1. admin 包：提供给管理后台 fuxiaoaio-ui-admin 前端项目 + * 2. app 包：提供给用户 APP fuxiaoaio-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分 + */ +package cn.fuxiaoaio.ygg.module.bpm.controller; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmFormConvert.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/definition/BpmFormConvert.java similarity index 60% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmFormConvert.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/definition/BpmFormConvert.java index 151b4c80b..7557c0f92 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmFormConvert.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/definition/BpmFormConvert.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.bpm.convert.definition; +package cn.fuxiaoaio.ygg.module.bpm.convert.definition; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormSimpleRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormUpdateReqVO; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.form.BpmFormCreateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.form.BpmFormRespVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.form.BpmFormSimpleRespVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.form.BpmFormUpdateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmFormDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmModelConvert.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/definition/BpmModelConvert.java similarity index 92% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmModelConvert.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/definition/BpmModelConvert.java index 9f79032f6..5ca136dc9 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmModelConvert.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/definition/BpmModelConvert.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.module.bpm.convert.definition; +package cn.fuxiaoaio.ygg.module.bpm.convert.definition; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.*; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO; -import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmModelMetaInfoRespDTO; -import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.model.*; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmFormDO; +import cn.fuxiaoaio.ygg.module.bpm.service.definition.dto.BpmModelMetaInfoRespDTO; +import cn.fuxiaoaio.ygg.module.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO; import org.flowable.common.engine.impl.db.SuspensionState; import org.flowable.engine.repository.Deployment; import org.flowable.engine.repository.Model; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmProcessDefinitionConvert.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/definition/BpmProcessDefinitionConvert.java similarity index 89% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmProcessDefinitionConvert.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/definition/BpmProcessDefinitionConvert.java index ad57a55b4..9b356e13d 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmProcessDefinitionConvert.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/definition/BpmProcessDefinitionConvert.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.bpm.convert.definition; +package cn.fuxiaoaio.ygg.module.bpm.convert.definition; import cn.hutool.core.date.LocalDateTimeUtil; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageItemRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO; -import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageItemRespVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmFormDO; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO; +import cn.fuxiaoaio.ygg.module.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO; import org.flowable.common.engine.impl.db.SuspensionState; import org.flowable.engine.repository.Deployment; import org.flowable.engine.repository.ProcessDefinition; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmTaskAssignRuleConvert.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/definition/BpmTaskAssignRuleConvert.java similarity index 79% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmTaskAssignRuleConvert.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/definition/BpmTaskAssignRuleConvert.java index c616e90b0..de3aec542 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmTaskAssignRuleConvert.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/definition/BpmTaskAssignRuleConvert.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.bpm.convert.definition; +package cn.fuxiaoaio.ygg.module.bpm.convert.definition; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleUpdateReqVO; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleCreateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleRespVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleUpdateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO; import org.flowable.bpmn.model.UserTask; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmUserGroupConvert.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/definition/BpmUserGroupConvert.java similarity index 69% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmUserGroupConvert.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/definition/BpmUserGroupConvert.java index b5cd631f7..122f950ad 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmUserGroupConvert.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/definition/BpmUserGroupConvert.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.bpm.convert.definition; +package cn.fuxiaoaio.ygg.module.bpm.convert.definition; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupUpdateReqVO; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.group.BpmUserGroupCreateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.group.BpmUserGroupRespVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.group.BpmUserGroupUpdateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmUserGroupDO; import org.mapstruct.Mapper; import org.mapstruct.Named; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/message/BpmMessageConvert.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/message/BpmMessageConvert.java similarity index 83% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/message/BpmMessageConvert.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/message/BpmMessageConvert.java index 99b7bebf2..8c1ca6fef 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/message/BpmMessageConvert.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/message/BpmMessageConvert.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.bpm.convert.message; +package cn.fuxiaoaio.ygg.module.bpm.convert.message; -import cn.iocoder.yudao.module.system.api.sms.dto.send.SmsSendSingleToUserReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.sms.dto.send.SmsSendSingleToUserReqDTO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/oa/BpmOALeaveConvert.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/oa/BpmOALeaveConvert.java similarity index 64% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/oa/BpmOALeaveConvert.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/oa/BpmOALeaveConvert.java index 8c56e1dda..b997b353d 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/oa/BpmOALeaveConvert.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/oa/BpmOALeaveConvert.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.bpm.convert.oa; +package cn.fuxiaoaio.ygg.module.bpm.convert.oa; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeaveCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeaveRespVO; -import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOALeaveDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.oa.vo.BpmOALeaveCreateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.oa.vo.BpmOALeaveRespVO; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.oa.BpmOALeaveDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/package-info.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/package-info.java similarity index 63% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/package-info.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/package-info.java index 6db6ebc46..582b8eeaf 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/package-info.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/package-info.java @@ -3,4 +3,4 @@ * * 目前使用 MapStruct 框架 */ -package cn.iocoder.yudao.module.bpm.convert; +package cn.fuxiaoaio.ygg.module.bpm.convert; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmActivityConvert.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/task/BpmActivityConvert.java similarity index 86% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmActivityConvert.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/task/BpmActivityConvert.java index 509408457..05aab1785 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmActivityConvert.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/task/BpmActivityConvert.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.bpm.convert.task; +package cn.fuxiaoaio.ygg.module.bpm.convert.task; -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.activity.BpmActivityRespVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.activity.BpmActivityRespVO; import org.flowable.engine.history.HistoricActivityInstance; import org.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/task/BpmProcessInstanceConvert.java similarity index 86% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/task/BpmProcessInstanceConvert.java index a1eea62e9..745230a7a 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/task/BpmProcessInstanceConvert.java @@ -1,16 +1,16 @@ -package cn.iocoder.yudao.module.bpm.convert.task; +package cn.fuxiaoaio.ygg.module.bpm.convert.task; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.number.NumberUtils; -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstancePageItemRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceRespVO; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO; -import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO; -import cn.iocoder.yudao.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEvent; -import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceApproveReqDTO; -import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceRejectReqDTO; -import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; -import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.number.NumberUtils; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.instance.BpmProcessInstancePageItemRespVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceRespVO; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO; +import cn.fuxiaoaio.ygg.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEvent; +import cn.fuxiaoaio.ygg.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceApproveReqDTO; +import cn.fuxiaoaio.ygg.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceRejectReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.dept.dto.DeptRespDTO; +import cn.fuxiaoaio.ygg.module.system.api.user.dto.AdminUserRespDTO; import org.flowable.engine.history.HistoricProcessInstance; import org.flowable.engine.repository.ProcessDefinition; import org.flowable.engine.runtime.ProcessInstance; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/task/BpmTaskConvert.java similarity index 93% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/task/BpmTaskConvert.java index 769fb3c5a..cc1655100 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/task/BpmTaskConvert.java @@ -1,15 +1,15 @@ -package cn.iocoder.yudao.module.bpm.convert.task; +package cn.fuxiaoaio.ygg.module.bpm.convert.task; import cn.hutool.core.date.LocalDateTimeUtil; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.framework.common.util.number.NumberUtils; -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskDonePageItemRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskTodoPageItemRespVO; -import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmTaskExtDO; -import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenTaskCreatedReqDTO; -import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; -import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.framework.common.util.number.NumberUtils; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.task.BpmTaskDonePageItemRespVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.task.BpmTaskTodoPageItemRespVO; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.task.BpmTaskExtDO; +import cn.fuxiaoaio.ygg.module.bpm.service.message.dto.BpmMessageSendWhenTaskCreatedReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.dept.dto.DeptRespDTO; +import cn.fuxiaoaio.ygg.module.system.api.user.dto.AdminUserRespDTO; import org.flowable.common.engine.impl.db.SuspensionState; import org.flowable.engine.history.HistoricProcessInstance; import org.flowable.engine.runtime.ProcessInstance; diff --git a/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/task/package-info.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/task/package-info.java new file mode 100644 index 000000000..cf700ba71 --- /dev/null +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/task/package-info.java @@ -0,0 +1 @@ +package cn.fuxiaoaio.ygg.module.bpm.convert.task; diff --git a/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md new file mode 100644 index 000000000..8c7cde516 --- /dev/null +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md @@ -0,0 +1 @@ + diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmFormDO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/definition/BpmFormDO.java similarity index 90% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmFormDO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/definition/BpmFormDO.java index 76bf777e5..08ab2c9c1 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmFormDO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/definition/BpmFormDO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.bpm.dal.dataobject.definition; +package cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmProcessDefinitionExtDO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/definition/BpmProcessDefinitionExtDO.java similarity index 91% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmProcessDefinitionExtDO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/definition/BpmProcessDefinitionExtDO.java index 57abc0b99..8321125ba 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmProcessDefinitionExtDO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/definition/BpmProcessDefinitionExtDO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.bpm.dal.dataobject.definition; +package cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.bpm.enums.definition.BpmModelFormTypeEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.module.bpm.enums.definition.BpmModelFormTypeEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmTaskAssignRuleDO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/definition/BpmTaskAssignRuleDO.java similarity index 89% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmTaskAssignRuleDO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/definition/BpmTaskAssignRuleDO.java index e65764f1a..5256f53e2 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmTaskAssignRuleDO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/definition/BpmTaskAssignRuleDO.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.bpm.dal.dataobject.definition; +package cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.framework.mybatis.core.type.JsonLongSetTypeHandler; -import cn.iocoder.yudao.module.bpm.enums.definition.BpmTaskAssignRuleTypeEnum; -import cn.iocoder.yudao.module.bpm.enums.definition.BpmTaskRuleScriptEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.type.JsonLongSetTypeHandler; +import cn.fuxiaoaio.ygg.module.bpm.enums.definition.BpmTaskAssignRuleTypeEnum; +import cn.fuxiaoaio.ygg.module.bpm.enums.definition.BpmTaskRuleScriptEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmTaskMessageRuleDO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/definition/BpmTaskMessageRuleDO.java similarity index 67% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmTaskMessageRuleDO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/definition/BpmTaskMessageRuleDO.java index db204c027..a879f06b0 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmTaskMessageRuleDO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/definition/BpmTaskMessageRuleDO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.dal.dataobject.definition; +package cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition; // TODO 芋艿：先埋个坑。任务消息的配置规则。说白了，就是不同的 public class BpmTaskMessageRuleDO { diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmUserGroupDO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/definition/BpmUserGroupDO.java similarity index 78% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmUserGroupDO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/definition/BpmUserGroupDO.java index ec1168180..7763aca28 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmUserGroupDO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/definition/BpmUserGroupDO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.bpm.dal.dataobject.definition; +package cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.framework.mybatis.core.type.JsonLongSetTypeHandler; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.type.JsonLongSetTypeHandler; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOALeaveDO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/oa/BpmOALeaveDO.java similarity index 88% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOALeaveDO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/oa/BpmOALeaveDO.java index 92c7c154c..beb570faf 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOALeaveDO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/oa/BpmOALeaveDO.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.bpm.dal.dataobject.oa; +package cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.oa; -import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; +import cn.fuxiaoaio.ygg.module.bpm.enums.task.BpmProcessInstanceResultEnum; import lombok.*; import java.time.LocalDateTime; import java.util.*; import com.baomidou.mybatisplus.annotation.*; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; /** * OA 请假申请 DO diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmActivityDO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/task/BpmActivityDO.java similarity index 90% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmActivityDO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/task/BpmActivityDO.java index 190fcf5ed..f50f62437 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmActivityDO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/task/BpmActivityDO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.dal.dataobject.task; +package cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.task; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.*; @@ -6,8 +6,8 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT; /** * 任务流程关联表 diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmProcessInstanceExtDO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/task/BpmProcessInstanceExtDO.java similarity index 89% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmProcessInstanceExtDO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/task/BpmProcessInstanceExtDO.java index 293cc2dd7..69bf61ab3 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmProcessInstanceExtDO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/task/BpmProcessInstanceExtDO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.bpm.dal.dataobject.task; +package cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.task; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; -import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.module.bpm.enums.task.BpmProcessInstanceResultEnum; +import cn.fuxiaoaio.ygg.module.bpm.enums.task.BpmProcessInstanceStatusEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmTaskExtDO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/task/BpmTaskExtDO.java similarity index 90% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmTaskExtDO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/task/BpmTaskExtDO.java index a79fce412..6acb8b201 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmTaskExtDO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/dataobject/task/BpmTaskExtDO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.bpm.dal.dataobject.task; +package cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.task; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.module.bpm.enums.task.BpmProcessInstanceResultEnum; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmFormMapper.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/mysql/definition/BpmFormMapper.java similarity index 55% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmFormMapper.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/mysql/definition/BpmFormMapper.java index 53c01d92e..a76fbae53 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmFormMapper.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/mysql/definition/BpmFormMapper.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.bpm.dal.mysql.definition; +package cn.fuxiaoaio.ygg.module.bpm.dal.mysql.definition; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormPageReqVO; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.form.BpmFormPageReqVO; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmFormDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.QueryWrapperX; import org.apache.ibatis.annotations.Mapper; /** diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmProcessDefinitionExtMapper.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/mysql/definition/BpmProcessDefinitionExtMapper.java similarity index 71% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmProcessDefinitionExtMapper.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/mysql/definition/BpmProcessDefinitionExtMapper.java index 3ff53f2d9..b0740ca24 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmProcessDefinitionExtMapper.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/mysql/definition/BpmProcessDefinitionExtMapper.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.bpm.dal.mysql.definition; +package cn.fuxiaoaio.ygg.module.bpm.dal.mysql.definition; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; import org.apache.ibatis.annotations.Mapper; import java.util.Collection; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmTaskAssignRuleMapper.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/mysql/definition/BpmTaskAssignRuleMapper.java similarity index 84% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmTaskAssignRuleMapper.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/mysql/definition/BpmTaskAssignRuleMapper.java index c4061c0f8..13f988f38 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmTaskAssignRuleMapper.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/mysql/definition/BpmTaskAssignRuleMapper.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.bpm.dal.mysql.definition; +package cn.fuxiaoaio.ygg.module.bpm.dal.mysql.definition; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.QueryWrapperX; import org.apache.ibatis.annotations.Mapper; import org.springframework.lang.Nullable; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmUserGroupMapper.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/mysql/definition/BpmUserGroupMapper.java similarity index 69% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmUserGroupMapper.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/mysql/definition/BpmUserGroupMapper.java index ed076276c..c67c321de 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmUserGroupMapper.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/mysql/definition/BpmUserGroupMapper.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.bpm.dal.mysql.definition; +package cn.fuxiaoaio.ygg.module.bpm.dal.mysql.definition; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupPageReqVO; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.group.BpmUserGroupPageReqVO; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmUserGroupDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/BpmOALeaveMapper.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/mysql/oa/BpmOALeaveMapper.java similarity index 69% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/BpmOALeaveMapper.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/mysql/oa/BpmOALeaveMapper.java index ad05b9804..67bb2fe20 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/BpmOALeaveMapper.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/mysql/oa/BpmOALeaveMapper.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.bpm.dal.mysql.oa; +package cn.fuxiaoaio.ygg.module.bpm.dal.mysql.oa; -import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeavePageReqVO; -import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOALeaveDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.oa.vo.BpmOALeavePageReqVO; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.oa.BpmOALeaveDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; import org.apache.ibatis.annotations.Mapper; /** diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmProcessInstanceExtMapper.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/mysql/task/BpmProcessInstanceExtMapper.java similarity index 80% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmProcessInstanceExtMapper.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/mysql/task/BpmProcessInstanceExtMapper.java index 52e66219c..649a5438d 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmProcessInstanceExtMapper.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/mysql/task/BpmProcessInstanceExtMapper.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.bpm.dal.mysql.task; +package cn.fuxiaoaio.ygg.module.bpm.dal.mysql.task; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceMyPageReqVO; -import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceMyPageReqVO; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmTaskExtMapper.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/mysql/task/BpmTaskExtMapper.java similarity index 79% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmTaskExtMapper.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/mysql/task/BpmTaskExtMapper.java index 6683b536d..2fb045f43 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmTaskExtMapper.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/dal/mysql/task/BpmTaskExtMapper.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.bpm.dal.mysql.task; +package cn.fuxiaoaio.ygg.module.bpm.dal.mysql.task; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmTaskExtDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.task.BpmTaskExtDO; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/config/BpmCommonConfiguration.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/bpm/config/BpmCommonConfiguration.java similarity index 82% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/config/BpmCommonConfiguration.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/bpm/config/BpmCommonConfiguration.java index 7a6ca7711..05eed63a0 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/config/BpmCommonConfiguration.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/bpm/config/BpmCommonConfiguration.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.bpm.framework.bpm.config; +package cn.fuxiaoaio.ygg.module.bpm.framework.bpm.config; -import cn.iocoder.yudao.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEventPublisher; +import cn.fuxiaoaio.ygg.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEventPublisher; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/core/event/BpmProcessInstanceResultEvent.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/bpm/core/event/BpmProcessInstanceResultEvent.java similarity index 89% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/core/event/BpmProcessInstanceResultEvent.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/bpm/core/event/BpmProcessInstanceResultEvent.java index 9fccbab8e..b8ac68a95 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/core/event/BpmProcessInstanceResultEvent.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/bpm/core/event/BpmProcessInstanceResultEvent.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.bpm.framework.bpm.core.event; +package cn.fuxiaoaio.ygg.module.bpm.framework.bpm.core.event; -import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO; import lombok.Data; import org.springframework.context.ApplicationEvent; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/core/event/BpmProcessInstanceResultEventListener.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/bpm/core/event/BpmProcessInstanceResultEventListener.java similarity index 93% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/core/event/BpmProcessInstanceResultEventListener.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/bpm/core/event/BpmProcessInstanceResultEventListener.java index c2b215394..e2415e28d 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/core/event/BpmProcessInstanceResultEventListener.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/bpm/core/event/BpmProcessInstanceResultEventListener.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.framework.bpm.core.event; +package cn.fuxiaoaio.ygg.module.bpm.framework.bpm.core.event; import cn.hutool.core.util.StrUtil; import org.springframework.context.ApplicationListener; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/core/event/BpmProcessInstanceResultEventPublisher.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/bpm/core/event/BpmProcessInstanceResultEventPublisher.java similarity index 90% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/core/event/BpmProcessInstanceResultEventPublisher.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/bpm/core/event/BpmProcessInstanceResultEventPublisher.java index dc5c21b75..37d6afb4e 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/core/event/BpmProcessInstanceResultEventPublisher.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/bpm/core/event/BpmProcessInstanceResultEventPublisher.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.framework.bpm.core.event; +package cn.fuxiaoaio.ygg.module.bpm.framework.bpm.core.event; import lombok.AllArgsConstructor; import org.springframework.context.ApplicationEventPublisher; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/core/event/package-info.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/bpm/core/event/package-info.java similarity index 62% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/core/event/package-info.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/bpm/core/event/package-info.java index c4a131128..d1211a9a9 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/core/event/package-info.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/bpm/core/event/package-info.java @@ -3,4 +3,4 @@ * * @author 芋道源码 */ -package cn.iocoder.yudao.module.bpm.framework.bpm.core.event; +package cn.fuxiaoaio.ygg.module.bpm.framework.bpm.core.event; diff --git a/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/bpm/core/package-info.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/bpm/core/package-info.java new file mode 100644 index 000000000..d14a78ad4 --- /dev/null +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/bpm/core/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package cn.fuxiaoaio.ygg.module.bpm.framework.bpm.core; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/package-info.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/bpm/package-info.java similarity index 62% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/package-info.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/bpm/package-info.java index 9a5e3ea96..94c954204 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/package-info.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/bpm/package-info.java @@ -3,4 +3,4 @@ * * @author 芋道源码 */ -package cn.iocoder.yudao.module.bpm.framework.bpm; +package cn.fuxiaoaio.ygg.module.bpm.framework.bpm; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/config/BpmFlowableConfiguration.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/config/BpmFlowableConfiguration.java similarity index 90% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/config/BpmFlowableConfiguration.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/config/BpmFlowableConfiguration.java index c048d9c73..e0e5e4f6c 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/config/BpmFlowableConfiguration.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/config/BpmFlowableConfiguration.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.bpm.framework.flowable.config; +package cn.fuxiaoaio.ygg.module.bpm.framework.flowable.config; import cn.hutool.core.collection.ListUtil; -import cn.iocoder.yudao.module.bpm.framework.flowable.core.behavior.BpmActivityBehaviorFactory; -import cn.iocoder.yudao.module.bpm.service.definition.BpmTaskAssignRuleService; +import cn.fuxiaoaio.ygg.module.bpm.framework.flowable.core.behavior.BpmActivityBehaviorFactory; +import cn.fuxiaoaio.ygg.module.bpm.service.definition.BpmTaskAssignRuleService; import org.flowable.common.engine.api.delegate.event.FlowableEventListener; import org.flowable.spring.SpringProcessEngineConfiguration; import org.flowable.spring.boot.EngineConfigurationConfigurer; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmActivityBehaviorFactory.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/BpmActivityBehaviorFactory.java similarity index 92% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmActivityBehaviorFactory.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/BpmActivityBehaviorFactory.java index dced1c5bd..2d2ad18c7 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmActivityBehaviorFactory.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/BpmActivityBehaviorFactory.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.bpm.framework.flowable.core.behavior; +package cn.fuxiaoaio.ygg.module.bpm.framework.flowable.core.behavior; -import cn.iocoder.yudao.module.bpm.service.definition.BpmTaskAssignRuleService; +import cn.fuxiaoaio.ygg.module.bpm.service.definition.BpmTaskAssignRuleService; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Setter; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmParallelMultiInstanceBehavior.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/BpmParallelMultiInstanceBehavior.java similarity index 93% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmParallelMultiInstanceBehavior.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/BpmParallelMultiInstanceBehavior.java index 0b60faa06..a0c89b425 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmParallelMultiInstanceBehavior.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/BpmParallelMultiInstanceBehavior.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.bpm.framework.flowable.core.behavior; +package cn.fuxiaoaio.ygg.module.bpm.framework.flowable.core.behavior; -import cn.iocoder.yudao.framework.flowable.core.util.FlowableUtils; -import cn.iocoder.yudao.module.bpm.service.definition.BpmTaskAssignRuleService; +import cn.fuxiaoaio.ygg.framework.flowable.core.util.FlowableUtils; +import cn.fuxiaoaio.ygg.module.bpm.service.definition.BpmTaskAssignRuleService; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.flowable.bpmn.model.Activity; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmUserTaskActivityBehavior.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/BpmUserTaskActivityBehavior.java similarity index 96% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmUserTaskActivityBehavior.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/BpmUserTaskActivityBehavior.java index aeda4d52c..11519cf7f 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmUserTaskActivityBehavior.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/BpmUserTaskActivityBehavior.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.bpm.framework.flowable.core.behavior; +package cn.fuxiaoaio.ygg.module.bpm.framework.flowable.core.behavior; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.RandomUtil; -import cn.iocoder.yudao.module.bpm.service.definition.BpmTaskAssignRuleService; +import cn.fuxiaoaio.ygg.module.bpm.service.definition.BpmTaskAssignRuleService; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.flowable.bpmn.model.UserTask; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/script/BpmTaskAssignScript.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/script/BpmTaskAssignScript.java similarity index 85% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/script/BpmTaskAssignScript.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/script/BpmTaskAssignScript.java index b5c91ebad..1ed6b0189 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/script/BpmTaskAssignScript.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/script/BpmTaskAssignScript.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.bpm.framework.flowable.core.behavior.script; +package cn.fuxiaoaio.ygg.module.bpm.framework.flowable.core.behavior.script; -import cn.iocoder.yudao.module.bpm.enums.definition.BpmTaskRuleScriptEnum; +import cn.fuxiaoaio.ygg.module.bpm.enums.definition.BpmTaskRuleScriptEnum; import org.flowable.engine.delegate.DelegateExecution; import java.util.Set; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderAbstractScript.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderAbstractScript.java similarity index 81% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderAbstractScript.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderAbstractScript.java index 7f77a1b3b..59c2ba181 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderAbstractScript.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderAbstractScript.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.bpm.framework.flowable.core.behavior.script.impl; +package cn.fuxiaoaio.ygg.module.bpm.framework.flowable.core.behavior.script.impl; -import cn.iocoder.yudao.framework.common.util.number.NumberUtils; -import cn.iocoder.yudao.module.bpm.framework.flowable.core.behavior.script.BpmTaskAssignScript; -import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService; -import cn.iocoder.yudao.module.system.api.dept.DeptApi; -import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; -import cn.iocoder.yudao.module.system.api.user.AdminUserApi; -import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; +import cn.fuxiaoaio.ygg.framework.common.util.number.NumberUtils; +import cn.fuxiaoaio.ygg.module.bpm.framework.flowable.core.behavior.script.BpmTaskAssignScript; +import cn.fuxiaoaio.ygg.module.bpm.service.task.BpmProcessInstanceService; +import cn.fuxiaoaio.ygg.module.system.api.dept.DeptApi; +import cn.fuxiaoaio.ygg.module.system.api.dept.dto.DeptRespDTO; +import cn.fuxiaoaio.ygg.module.system.api.user.AdminUserApi; +import cn.fuxiaoaio.ygg.module.system.api.user.dto.AdminUserRespDTO; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.runtime.ProcessInstance; import org.springframework.context.annotation.Lazy; @@ -15,7 +15,7 @@ import org.springframework.util.Assert; import javax.annotation.Resource; 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 java.util.Collections.emptySet; /** diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderX1Script.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderX1Script.java similarity index 83% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderX1Script.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderX1Script.java index af7d8b5a7..fbf674a53 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderX1Script.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderX1Script.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.bpm.framework.flowable.core.behavior.script.impl; +package cn.fuxiaoaio.ygg.module.bpm.framework.flowable.core.behavior.script.impl; -import cn.iocoder.yudao.module.bpm.enums.definition.BpmTaskRuleScriptEnum; +import cn.fuxiaoaio.ygg.module.bpm.enums.definition.BpmTaskRuleScriptEnum; import org.flowable.engine.delegate.DelegateExecution; import org.springframework.stereotype.Component; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderX2Script.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderX2Script.java similarity index 83% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderX2Script.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderX2Script.java index 068ab3d2f..0d857b574 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderX2Script.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderX2Script.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.bpm.framework.flowable.core.behavior.script.impl; +package cn.fuxiaoaio.ygg.module.bpm.framework.flowable.core.behavior.script.impl; -import cn.iocoder.yudao.module.bpm.enums.definition.BpmTaskRuleScriptEnum; +import cn.fuxiaoaio.ygg.module.bpm.enums.definition.BpmTaskRuleScriptEnum; import org.flowable.engine.delegate.DelegateExecution; import org.springframework.stereotype.Component; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignStartUserScript.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignStartUserScript.java similarity index 74% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignStartUserScript.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignStartUserScript.java index 1363f3979..7e3b4e3aa 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignStartUserScript.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignStartUserScript.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.bpm.framework.flowable.core.behavior.script.impl; +package cn.fuxiaoaio.ygg.module.bpm.framework.flowable.core.behavior.script.impl; -import cn.iocoder.yudao.framework.common.util.collection.SetUtils; -import cn.iocoder.yudao.framework.common.util.number.NumberUtils; -import cn.iocoder.yudao.module.bpm.enums.definition.BpmTaskRuleScriptEnum; -import cn.iocoder.yudao.module.bpm.framework.flowable.core.behavior.script.BpmTaskAssignScript; -import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService; +import cn.fuxiaoaio.ygg.framework.common.util.collection.SetUtils; +import cn.fuxiaoaio.ygg.framework.common.util.number.NumberUtils; +import cn.fuxiaoaio.ygg.module.bpm.enums.definition.BpmTaskRuleScriptEnum; +import cn.fuxiaoaio.ygg.module.bpm.framework.flowable.core.behavior.script.BpmTaskAssignScript; +import cn.fuxiaoaio.ygg.module.bpm.service.task.BpmProcessInstanceService; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.runtime.ProcessInstance; import org.springframework.context.annotation.Lazy; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/listener/BpmProcessInstanceEventListener.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/listener/BpmProcessInstanceEventListener.java similarity index 90% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/listener/BpmProcessInstanceEventListener.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/listener/BpmProcessInstanceEventListener.java index 98bc37f9f..879ce2105 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/listener/BpmProcessInstanceEventListener.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/listener/BpmProcessInstanceEventListener.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.bpm.framework.flowable.core.listener; +package cn.fuxiaoaio.ygg.module.bpm.framework.flowable.core.listener; -import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO; -import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO; +import cn.fuxiaoaio.ygg.module.bpm.service.task.BpmProcessInstanceService; import com.google.common.collect.ImmutableSet; import org.flowable.common.engine.api.delegate.event.FlowableEngineEntityEvent; import org.flowable.common.engine.api.delegate.event.FlowableEngineEventType; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/listener/BpmTaskEventListener.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/listener/BpmTaskEventListener.java similarity index 91% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/listener/BpmTaskEventListener.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/listener/BpmTaskEventListener.java index 745561993..c7a4d9c6d 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/listener/BpmTaskEventListener.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/listener/BpmTaskEventListener.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.bpm.framework.flowable.core.listener; +package cn.fuxiaoaio.ygg.module.bpm.framework.flowable.core.listener; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmTaskExtDO; -import cn.iocoder.yudao.module.bpm.service.task.BpmActivityService; -import cn.iocoder.yudao.module.bpm.service.task.BpmTaskService; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.task.BpmTaskExtDO; +import cn.fuxiaoaio.ygg.module.bpm.service.task.BpmActivityService; +import cn.fuxiaoaio.ygg.module.bpm.service.task.BpmTaskService; import com.google.common.collect.ImmutableSet; import lombok.extern.slf4j.Slf4j; import org.flowable.common.engine.api.delegate.event.FlowableEngineEntityEvent; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/package-info.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/package-info.java similarity index 61% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/package-info.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/package-info.java index 52fdb7f93..bf28ed7ce 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/package-info.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/package-info.java @@ -3,4 +3,4 @@ * * @author 芋道源码 */ -package cn.iocoder.yudao.module.bpm.framework; +package cn.fuxiaoaio.ygg.module.bpm.framework; diff --git a/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/rpc/config/RpcConfiguration.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/rpc/config/RpcConfiguration.java new file mode 100644 index 000000000..267c06323 --- /dev/null +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/rpc/config/RpcConfiguration.java @@ -0,0 +1,15 @@ +package cn.fuxiaoaio.ygg.module.bpm.framework.rpc.config; + +import cn.fuxiaoaio.ygg.module.system.api.dept.DeptApi; +import cn.fuxiaoaio.ygg.module.system.api.dept.PostApi; +import cn.fuxiaoaio.ygg.module.system.api.dict.DictDataApi; +import cn.fuxiaoaio.ygg.module.system.api.permission.RoleApi; +import cn.fuxiaoaio.ygg.module.system.api.sms.SmsSendApi; +import cn.fuxiaoaio.ygg.module.system.api.user.AdminUserApi; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.Configuration; + +@Configuration(proxyBeanMethods = false) +@EnableFeignClients(clients = {RoleApi.class, DeptApi.class, PostApi.class, AdminUserApi.class, SmsSendApi.class, DictDataApi.class}) +public class RpcConfiguration { +} diff --git a/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/rpc/package-info.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/rpc/package-info.java new file mode 100644 index 000000000..2ff1be3e4 --- /dev/null +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/rpc/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package cn.fuxiaoaio.ygg.module.bpm.framework.rpc; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/security/config/SecurityConfiguration.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/security/config/SecurityConfiguration.java similarity index 91% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/security/config/SecurityConfiguration.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/security/config/SecurityConfiguration.java index 163886c65..e88a2a453 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/security/config/SecurityConfiguration.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/security/config/SecurityConfiguration.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.bpm.framework.security.config; +package cn.fuxiaoaio.ygg.module.bpm.framework.security.config; -import cn.iocoder.yudao.framework.security.config.AuthorizeRequestsCustomizer; +import cn.fuxiaoaio.ygg.framework.security.config.AuthorizeRequestsCustomizer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; diff --git a/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/security/core/package-info.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/security/core/package-info.java new file mode 100644 index 000000000..7df2b3a03 --- /dev/null +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/framework/security/core/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package cn.fuxiaoaio.ygg.module.bpm.framework.security.core; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/package-info.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/package-info.java similarity index 93% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/package-info.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/package-info.java index 9d02824f6..8775b9723 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/package-info.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/package-info.java @@ -9,4 +9,4 @@ * * 注意，由于 Bpm 模块下，容易和其它模块重名，所以类名都加载 Bpm 的前缀~ */ -package cn.iocoder.yudao.module.bpm; +package cn.fuxiaoaio.ygg.module.bpm; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormService.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmFormService.java similarity index 81% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormService.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmFormService.java index 80355ef5e..14ce66ff1 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormService.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmFormService.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.bpm.service.definition; +package cn.fuxiaoaio.ygg.module.bpm.service.definition; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormPageReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormUpdateReqVO; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.form.BpmFormCreateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.form.BpmFormPageReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.form.BpmFormUpdateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmFormDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; import javax.validation.Valid; import java.util.Collection; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormServiceImpl.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmFormServiceImpl.java similarity index 78% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormServiceImpl.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmFormServiceImpl.java index 8727c0e6a..0ba245fb6 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormServiceImpl.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmFormServiceImpl.java @@ -1,27 +1,27 @@ -package cn.iocoder.yudao.module.bpm.service.definition; +package cn.fuxiaoaio.ygg.module.bpm.service.definition; import cn.hutool.core.lang.Assert; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormPageReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormUpdateReqVO; -import cn.iocoder.yudao.module.bpm.convert.definition.BpmFormConvert; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO; -import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmFormMapper; -import cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants; -import cn.iocoder.yudao.module.bpm.enums.definition.BpmModelFormTypeEnum; -import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmFormFieldRespDTO; -import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmModelMetaInfoRespDTO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.form.BpmFormCreateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.form.BpmFormPageReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.form.BpmFormUpdateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.convert.definition.BpmFormConvert; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmFormDO; +import cn.fuxiaoaio.ygg.module.bpm.dal.mysql.definition.BpmFormMapper; +import cn.fuxiaoaio.ygg.module.bpm.enums.ErrorCodeConstants; +import cn.fuxiaoaio.ygg.module.bpm.enums.definition.BpmModelFormTypeEnum; +import cn.fuxiaoaio.ygg.module.bpm.service.definition.dto.BpmFormFieldRespDTO; +import cn.fuxiaoaio.ygg.module.bpm.service.definition.dto.BpmModelMetaInfoRespDTO; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import java.util.*; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.FORM_NOT_EXISTS; -import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.MODEL_DEPLOY_FAIL_FORM_NOT_CONFIG; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.module.bpm.enums.ErrorCodeConstants.FORM_NOT_EXISTS; +import static cn.fuxiaoaio.ygg.module.bpm.enums.ErrorCodeConstants.MODEL_DEPLOY_FAIL_FORM_NOT_CONFIG; /** * 动态表单 Service 实现类 diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelService.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmModelService.java similarity index 89% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelService.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmModelService.java index a4e4f83d1..617f086f9 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelService.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmModelService.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.bpm.service.definition; +package cn.fuxiaoaio.ygg.module.bpm.service.definition; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.*; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.model.*; import org.flowable.bpmn.model.BpmnModel; import javax.validation.Valid; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmModelServiceImpl.java similarity index 92% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmModelServiceImpl.java index a4a2d9182..7b90b1f2e 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmModelServiceImpl.java @@ -1,18 +1,18 @@ -package cn.iocoder.yudao.module.bpm.service.definition; +package cn.fuxiaoaio.ygg.module.bpm.service.definition; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; -import cn.iocoder.yudao.framework.common.util.object.PageUtils; -import cn.iocoder.yudao.framework.common.util.validation.ValidationUtils; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.*; -import cn.iocoder.yudao.module.bpm.convert.definition.BpmModelConvert; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO; -import cn.iocoder.yudao.module.bpm.enums.definition.BpmModelFormTypeEnum; -import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmModelMetaInfoRespDTO; -import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.framework.common.util.object.PageUtils; +import cn.fuxiaoaio.ygg.framework.common.util.validation.ValidationUtils; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.model.*; +import cn.fuxiaoaio.ygg.module.bpm.convert.definition.BpmModelConvert; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmFormDO; +import cn.fuxiaoaio.ygg.module.bpm.enums.definition.BpmModelFormTypeEnum; +import cn.fuxiaoaio.ygg.module.bpm.service.definition.dto.BpmModelMetaInfoRespDTO; +import cn.fuxiaoaio.ygg.module.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO; import lombok.extern.slf4j.Slf4j; import org.flowable.bpmn.converter.BpmnXMLConverter; import org.flowable.bpmn.model.BpmnModel; @@ -32,9 +32,9 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.util.*; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; -import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.convertMap; +import static cn.fuxiaoaio.ygg.module.bpm.enums.ErrorCodeConstants.*; /** * Flowable流程模型实现 diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionService.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmProcessDefinitionService.java similarity index 88% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionService.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmProcessDefinitionService.java index 7c26b644e..c636c1973 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionService.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmProcessDefinitionService.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.module.bpm.service.definition; +package cn.fuxiaoaio.ygg.module.bpm.service.definition; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionListReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageItemRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO; -import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionListReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageItemRespVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO; +import cn.fuxiaoaio.ygg.module.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO; import org.flowable.bpmn.model.BpmnModel; import org.flowable.engine.repository.Deployment; import org.flowable.engine.repository.ProcessDefinition; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java similarity index 91% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java index 35464ab6a..44dcedb04 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java @@ -1,20 +1,20 @@ -package cn.iocoder.yudao.module.bpm.service.definition; +package cn.fuxiaoaio.ygg.module.bpm.service.definition; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.object.PageUtils; -import cn.iocoder.yudao.framework.flowable.core.util.FlowableUtils; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionListReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageItemRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO; -import cn.iocoder.yudao.module.bpm.convert.definition.BpmProcessDefinitionConvert; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO; -import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmProcessDefinitionExtMapper; -import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.object.PageUtils; +import cn.fuxiaoaio.ygg.framework.flowable.core.util.FlowableUtils; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionListReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageItemRespVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO; +import cn.fuxiaoaio.ygg.module.bpm.convert.definition.BpmProcessDefinitionConvert; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmFormDO; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO; +import cn.fuxiaoaio.ygg.module.bpm.dal.mysql.definition.BpmProcessDefinitionExtMapper; +import cn.fuxiaoaio.ygg.module.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO; import lombok.extern.slf4j.Slf4j; import org.flowable.bpmn.converter.BpmnXMLConverter; import org.flowable.bpmn.model.BpmnModel; @@ -31,11 +31,11 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.util.*; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; -import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.PROCESS_DEFINITION_KEY_NOT_MATCH; -import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.PROCESS_DEFINITION_NAME_NOT_MATCH; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.*; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.convertMap; +import static cn.fuxiaoaio.ygg.module.bpm.enums.ErrorCodeConstants.PROCESS_DEFINITION_KEY_NOT_MATCH; +import static cn.fuxiaoaio.ygg.module.bpm.enums.ErrorCodeConstants.PROCESS_DEFINITION_NAME_NOT_MATCH; import static java.util.Collections.emptyList; /** diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmTaskAssignRuleService.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmTaskAssignRuleService.java similarity index 90% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmTaskAssignRuleService.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmTaskAssignRuleService.java index 051dd63d3..5e33992ae 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmTaskAssignRuleService.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmTaskAssignRuleService.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.bpm.service.definition; +package cn.fuxiaoaio.ygg.module.bpm.service.definition; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleUpdateReqVO; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleCreateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleRespVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleUpdateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO; import org.flowable.engine.delegate.DelegateExecution; import org.springframework.lang.Nullable; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmTaskAssignRuleServiceImpl.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmTaskAssignRuleServiceImpl.java similarity index 88% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmTaskAssignRuleServiceImpl.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmTaskAssignRuleServiceImpl.java index 1b3497303..17284e500 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmTaskAssignRuleServiceImpl.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmTaskAssignRuleServiceImpl.java @@ -1,31 +1,31 @@ -package cn.iocoder.yudao.module.bpm.service.definition; +package cn.fuxiaoaio.ygg.module.bpm.service.definition; 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.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; -import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission; -import cn.iocoder.yudao.framework.flowable.core.util.FlowableUtils; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleRespVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleUpdateReqVO; -import cn.iocoder.yudao.module.bpm.convert.definition.BpmTaskAssignRuleConvert; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO; -import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmTaskAssignRuleMapper; -import cn.iocoder.yudao.module.bpm.enums.definition.BpmTaskAssignRuleTypeEnum; -import cn.iocoder.yudao.module.bpm.enums.DictTypeConstants; -import cn.iocoder.yudao.module.bpm.framework.flowable.core.behavior.script.BpmTaskAssignScript; -import cn.iocoder.yudao.module.system.api.dept.DeptApi; -import cn.iocoder.yudao.module.system.api.dept.PostApi; -import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; -import cn.iocoder.yudao.module.system.api.dict.DictDataApi; -import cn.iocoder.yudao.module.system.api.permission.PermissionApi; -import cn.iocoder.yudao.module.system.api.permission.RoleApi; -import cn.iocoder.yudao.module.system.api.user.AdminUserApi; -import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils; +import cn.fuxiaoaio.ygg.framework.datapermission.core.annotation.DataPermission; +import cn.fuxiaoaio.ygg.framework.flowable.core.util.FlowableUtils; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleCreateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleRespVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleUpdateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.convert.definition.BpmTaskAssignRuleConvert; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmUserGroupDO; +import cn.fuxiaoaio.ygg.module.bpm.dal.mysql.definition.BpmTaskAssignRuleMapper; +import cn.fuxiaoaio.ygg.module.bpm.enums.definition.BpmTaskAssignRuleTypeEnum; +import cn.fuxiaoaio.ygg.module.bpm.enums.DictTypeConstants; +import cn.fuxiaoaio.ygg.module.bpm.framework.flowable.core.behavior.script.BpmTaskAssignScript; +import cn.fuxiaoaio.ygg.module.system.api.dept.DeptApi; +import cn.fuxiaoaio.ygg.module.system.api.dept.PostApi; +import cn.fuxiaoaio.ygg.module.system.api.dept.dto.DeptRespDTO; +import cn.fuxiaoaio.ygg.module.system.api.dict.DictDataApi; +import cn.fuxiaoaio.ygg.module.system.api.permission.PermissionApi; +import cn.fuxiaoaio.ygg.module.system.api.permission.RoleApi; +import cn.fuxiaoaio.ygg.module.system.api.user.AdminUserApi; +import cn.fuxiaoaio.ygg.module.system.api.user.dto.AdminUserRespDTO; import com.google.common.annotations.VisibleForTesting; import lombok.extern.slf4j.Slf4j; import org.flowable.bpmn.model.BpmnModel; @@ -41,11 +41,11 @@ import javax.validation.Valid; import java.util.*; import static cn.hutool.core.text.CharSequenceUtil.format; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; -import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString; -import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.convertMap; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.convertSet; +import static cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils.toJsonString; +import static cn.fuxiaoaio.ygg.module.bpm.enums.ErrorCodeConstants.*; /** * BPM 任务分配规则 Service 实现类 diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupService.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmUserGroupService.java similarity index 81% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupService.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmUserGroupService.java index da185105e..651899831 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupService.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmUserGroupService.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.module.bpm.service.definition; +package cn.fuxiaoaio.ygg.module.bpm.service.definition; import java.util.*; import javax.validation.*; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupPageReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupUpdateReqVO; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.group.BpmUserGroupCreateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.group.BpmUserGroupPageReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.group.BpmUserGroupUpdateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmUserGroupDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; /** * 用户组 Service 接口 diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupServiceImpl.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmUserGroupServiceImpl.java similarity index 78% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupServiceImpl.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmUserGroupServiceImpl.java index e6a93b45d..41d26372c 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupServiceImpl.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmUserGroupServiceImpl.java @@ -1,16 +1,16 @@ -package cn.iocoder.yudao.module.bpm.service.definition; +package cn.fuxiaoaio.ygg.module.bpm.service.definition; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupPageReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupUpdateReqVO; -import cn.iocoder.yudao.module.bpm.convert.definition.BpmUserGroupConvert; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO; -import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmUserGroupMapper; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.group.BpmUserGroupCreateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.group.BpmUserGroupPageReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.group.BpmUserGroupUpdateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.convert.definition.BpmUserGroupConvert; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmUserGroupDO; +import cn.fuxiaoaio.ygg.module.bpm.dal.mysql.definition.BpmUserGroupMapper; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -20,8 +20,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.module.bpm.enums.ErrorCodeConstants.*; /** * 用户组 Service 实现类 diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/dto/BpmFormFieldRespDTO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/dto/BpmFormFieldRespDTO.java similarity index 88% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/dto/BpmFormFieldRespDTO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/dto/BpmFormFieldRespDTO.java index 1606192ce..8761a2ebe 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/dto/BpmFormFieldRespDTO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/dto/BpmFormFieldRespDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.service.definition.dto; +package cn.fuxiaoaio.ygg.module.bpm.service.definition.dto; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/dto/BpmModelMetaInfoRespDTO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/dto/BpmModelMetaInfoRespDTO.java similarity index 87% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/dto/BpmModelMetaInfoRespDTO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/dto/BpmModelMetaInfoRespDTO.java index 3a36b0eeb..4e2a6781c 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/dto/BpmModelMetaInfoRespDTO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/dto/BpmModelMetaInfoRespDTO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.bpm.service.definition.dto; +package cn.fuxiaoaio.ygg.module.bpm.service.definition.dto; -import cn.iocoder.yudao.module.bpm.enums.definition.BpmModelFormTypeEnum; +import cn.fuxiaoaio.ygg.module.bpm.enums.definition.BpmModelFormTypeEnum; import lombok.Data; /** diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/dto/BpmProcessDefinitionCreateReqDTO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/dto/BpmProcessDefinitionCreateReqDTO.java similarity index 95% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/dto/BpmProcessDefinitionCreateReqDTO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/dto/BpmProcessDefinitionCreateReqDTO.java index 8b2d22ad5..8c06b1ddc 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/dto/BpmProcessDefinitionCreateReqDTO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/dto/BpmProcessDefinitionCreateReqDTO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.bpm.service.definition.dto; +package cn.fuxiaoaio.ygg.module.bpm.service.definition.dto; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.module.bpm.enums.definition.BpmModelFormTypeEnum; +import cn.fuxiaoaio.ygg.module.bpm.enums.definition.BpmModelFormTypeEnum; import lombok.Data; import javax.validation.constraints.AssertTrue; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageService.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/message/BpmMessageService.java similarity index 80% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageService.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/message/BpmMessageService.java index ff51ae306..25816d370 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageService.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/message/BpmMessageService.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.bpm.service.message; +package cn.fuxiaoaio.ygg.module.bpm.service.message; -import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceApproveReqDTO; -import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceRejectReqDTO; -import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenTaskCreatedReqDTO; +import cn.fuxiaoaio.ygg.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceApproveReqDTO; +import cn.fuxiaoaio.ygg.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceRejectReqDTO; +import cn.fuxiaoaio.ygg.module.bpm.service.message.dto.BpmMessageSendWhenTaskCreatedReqDTO; import javax.validation.Valid; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageServiceImpl.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/message/BpmMessageServiceImpl.java similarity index 84% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageServiceImpl.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/message/BpmMessageServiceImpl.java index 032370158..aa606b0a0 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageServiceImpl.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/message/BpmMessageServiceImpl.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.bpm.service.message; +package cn.fuxiaoaio.ygg.module.bpm.service.message; -import cn.iocoder.yudao.framework.web.config.WebProperties; -import cn.iocoder.yudao.module.bpm.convert.message.BpmMessageConvert; -import cn.iocoder.yudao.module.bpm.enums.message.BpmMessageEnum; -import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceApproveReqDTO; -import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceRejectReqDTO; -import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenTaskCreatedReqDTO; -import cn.iocoder.yudao.module.system.api.sms.SmsSendApi; +import cn.fuxiaoaio.ygg.framework.web.config.WebProperties; +import cn.fuxiaoaio.ygg.module.bpm.convert.message.BpmMessageConvert; +import cn.fuxiaoaio.ygg.module.bpm.enums.message.BpmMessageEnum; +import cn.fuxiaoaio.ygg.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceApproveReqDTO; +import cn.fuxiaoaio.ygg.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceRejectReqDTO; +import cn.fuxiaoaio.ygg.module.bpm.service.message.dto.BpmMessageSendWhenTaskCreatedReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.sms.SmsSendApi; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/dto/BpmMessageSendWhenProcessInstanceApproveReqDTO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/message/dto/BpmMessageSendWhenProcessInstanceApproveReqDTO.java similarity index 91% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/dto/BpmMessageSendWhenProcessInstanceApproveReqDTO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/message/dto/BpmMessageSendWhenProcessInstanceApproveReqDTO.java index 7c37734f9..cf07abf1a 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/dto/BpmMessageSendWhenProcessInstanceApproveReqDTO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/message/dto/BpmMessageSendWhenProcessInstanceApproveReqDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.service.message.dto; +package cn.fuxiaoaio.ygg.module.bpm.service.message.dto; import lombok.Data; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/dto/BpmMessageSendWhenProcessInstanceRejectReqDTO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/message/dto/BpmMessageSendWhenProcessInstanceRejectReqDTO.java similarity index 92% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/dto/BpmMessageSendWhenProcessInstanceRejectReqDTO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/message/dto/BpmMessageSendWhenProcessInstanceRejectReqDTO.java index 69a266b68..d9353fb06 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/dto/BpmMessageSendWhenProcessInstanceRejectReqDTO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/message/dto/BpmMessageSendWhenProcessInstanceRejectReqDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.service.message.dto; +package cn.fuxiaoaio.ygg.module.bpm.service.message.dto; import lombok.Data; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/dto/BpmMessageSendWhenTaskCreatedReqDTO.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/message/dto/BpmMessageSendWhenTaskCreatedReqDTO.java similarity index 95% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/dto/BpmMessageSendWhenTaskCreatedReqDTO.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/message/dto/BpmMessageSendWhenTaskCreatedReqDTO.java index 7cb0e3d70..d67b51c73 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/dto/BpmMessageSendWhenTaskCreatedReqDTO.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/message/dto/BpmMessageSendWhenTaskCreatedReqDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.bpm.service.message.dto; +package cn.fuxiaoaio.ygg.module.bpm.service.message.dto; import lombok.Data; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOALeaveService.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/oa/BpmOALeaveService.java similarity index 76% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOALeaveService.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/oa/BpmOALeaveService.java index a851f403c..dac643828 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOALeaveService.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/oa/BpmOALeaveService.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.bpm.service.oa; +package cn.fuxiaoaio.ygg.module.bpm.service.oa; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeaveCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeavePageReqVO; -import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOALeaveDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.oa.vo.BpmOALeaveCreateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.oa.vo.BpmOALeavePageReqVO; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.oa.BpmOALeaveDO; import javax.validation.Valid; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOALeaveServiceImpl.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/oa/BpmOALeaveServiceImpl.java similarity index 78% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOALeaveServiceImpl.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/oa/BpmOALeaveServiceImpl.java index 33d178901..5af248c3d 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOALeaveServiceImpl.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/oa/BpmOALeaveServiceImpl.java @@ -1,16 +1,16 @@ -package cn.iocoder.yudao.module.bpm.service.oa; +package cn.fuxiaoaio.ygg.module.bpm.service.oa; import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.LocalDateTimeUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi; -import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; -import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeaveCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeavePageReqVO; -import cn.iocoder.yudao.module.bpm.convert.oa.BpmOALeaveConvert; -import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOALeaveDO; -import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOALeaveMapper; -import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.bpm.api.task.BpmProcessInstanceApi; +import cn.fuxiaoaio.ygg.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.oa.vo.BpmOALeaveCreateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.oa.vo.BpmOALeavePageReqVO; +import cn.fuxiaoaio.ygg.module.bpm.convert.oa.BpmOALeaveConvert; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.oa.BpmOALeaveDO; +import cn.fuxiaoaio.ygg.module.bpm.dal.mysql.oa.BpmOALeaveMapper; +import cn.fuxiaoaio.ygg.module.bpm.enums.task.BpmProcessInstanceResultEnum; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; @@ -19,8 +19,8 @@ import javax.annotation.Resource; import java.util.HashMap; import java.util.Map; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.OA_LEAVE_NOT_EXISTS; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.module.bpm.enums.ErrorCodeConstants.OA_LEAVE_NOT_EXISTS; /** * OA 请假申请 Service 实现类 diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/listener/BpmOALeaveResultListener.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/oa/listener/BpmOALeaveResultListener.java similarity index 69% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/listener/BpmOALeaveResultListener.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/oa/listener/BpmOALeaveResultListener.java index 2354070f0..403369af0 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/listener/BpmOALeaveResultListener.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/oa/listener/BpmOALeaveResultListener.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.bpm.service.oa.listener; +package cn.fuxiaoaio.ygg.module.bpm.service.oa.listener; -import cn.iocoder.yudao.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEvent; -import cn.iocoder.yudao.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEventListener; -import cn.iocoder.yudao.module.bpm.service.oa.BpmOALeaveService; -import cn.iocoder.yudao.module.bpm.service.oa.BpmOALeaveServiceImpl; +import cn.fuxiaoaio.ygg.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEvent; +import cn.fuxiaoaio.ygg.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEventListener; +import cn.fuxiaoaio.ygg.module.bpm.service.oa.BpmOALeaveService; +import cn.fuxiaoaio.ygg.module.bpm.service.oa.BpmOALeaveServiceImpl; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityService.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/task/BpmActivityService.java similarity index 86% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityService.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/task/BpmActivityService.java index 4bed16413..92283bf54 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityService.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/task/BpmActivityService.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.bpm.service.task; +package cn.fuxiaoaio.ygg.module.bpm.service.task; -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.activity.BpmActivityRespVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.activity.BpmActivityRespVO; import org.flowable.engine.history.HistoricActivityInstance; import java.util.List; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityServiceImpl.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/task/BpmActivityServiceImpl.java similarity index 86% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityServiceImpl.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/task/BpmActivityServiceImpl.java index c06445efa..6d2e3a225 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityServiceImpl.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/task/BpmActivityServiceImpl.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.bpm.service.task; +package cn.fuxiaoaio.ygg.module.bpm.service.task; -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.activity.BpmActivityRespVO; -import cn.iocoder.yudao.module.bpm.convert.task.BpmActivityConvert; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.activity.BpmActivityRespVO; +import cn.fuxiaoaio.ygg.module.bpm.convert.task.BpmActivityConvert; import lombok.extern.slf4j.Slf4j; import org.flowable.engine.HistoryService; import org.flowable.engine.history.HistoricActivityInstance; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceService.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/task/BpmProcessInstanceService.java similarity index 93% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceService.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/task/BpmProcessInstanceService.java index 23340ad19..1fd827e3d 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceService.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/task/BpmProcessInstanceService.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.bpm.service.task; +package cn.fuxiaoaio.ygg.module.bpm.service.task; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.*; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.instance.*; import org.flowable.engine.delegate.event.FlowableCancelledEvent; import org.flowable.engine.history.HistoricProcessInstance; import org.flowable.engine.runtime.ProcessInstance; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/task/BpmProcessInstanceServiceImpl.java similarity index 91% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/task/BpmProcessInstanceServiceImpl.java index 3b569d625..ba53ad5e7 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/task/BpmProcessInstanceServiceImpl.java @@ -1,26 +1,26 @@ -package cn.iocoder.yudao.module.bpm.service.task; +package cn.fuxiaoaio.ygg.module.bpm.service.task; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.number.NumberUtils; -import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.*; -import cn.iocoder.yudao.module.bpm.convert.task.BpmProcessInstanceConvert; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO; -import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO; -import cn.iocoder.yudao.module.bpm.dal.mysql.task.BpmProcessInstanceExtMapper; -import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceDeleteReasonEnum; -import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; -import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum; -import cn.iocoder.yudao.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEventPublisher; -import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService; -import cn.iocoder.yudao.module.bpm.service.message.BpmMessageService; -import cn.iocoder.yudao.module.system.api.dept.DeptApi; -import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; -import cn.iocoder.yudao.module.system.api.user.AdminUserApi; -import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.number.NumberUtils; +import cn.fuxiaoaio.ygg.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.instance.*; +import cn.fuxiaoaio.ygg.module.bpm.convert.task.BpmProcessInstanceConvert; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO; +import cn.fuxiaoaio.ygg.module.bpm.dal.mysql.task.BpmProcessInstanceExtMapper; +import cn.fuxiaoaio.ygg.module.bpm.enums.task.BpmProcessInstanceDeleteReasonEnum; +import cn.fuxiaoaio.ygg.module.bpm.enums.task.BpmProcessInstanceResultEnum; +import cn.fuxiaoaio.ygg.module.bpm.enums.task.BpmProcessInstanceStatusEnum; +import cn.fuxiaoaio.ygg.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEventPublisher; +import cn.fuxiaoaio.ygg.module.bpm.service.definition.BpmProcessDefinitionService; +import cn.fuxiaoaio.ygg.module.bpm.service.message.BpmMessageService; +import cn.fuxiaoaio.ygg.module.system.api.dept.DeptApi; +import cn.fuxiaoaio.ygg.module.system.api.dept.dto.DeptRespDTO; +import cn.fuxiaoaio.ygg.module.system.api.user.AdminUserApi; +import cn.fuxiaoaio.ygg.module.system.api.user.dto.AdminUserRespDTO; import lombok.extern.slf4j.Slf4j; import org.flowable.engine.HistoryService; import org.flowable.engine.RuntimeService; @@ -39,9 +39,9 @@ import javax.validation.Valid; import java.time.LocalDateTime; import java.util.*; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; -import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.convertList; +import static cn.fuxiaoaio.ygg.module.bpm.enums.ErrorCodeConstants.*; /** * 流程实例 Service 实现类 diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskService.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/task/BpmTaskService.java similarity index 91% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskService.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/task/BpmTaskService.java index fc45887b7..1a4096f42 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskService.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/task/BpmTaskService.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.bpm.service.task; +package cn.fuxiaoaio.ygg.module.bpm.service.task; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.*; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.task.*; import org.flowable.task.api.Task; import javax.validation.Valid; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/task/BpmTaskServiceImpl.java similarity index 91% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/task/BpmTaskServiceImpl.java index b52125d14..cbb45c520 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/task/BpmTaskServiceImpl.java @@ -1,23 +1,23 @@ -package cn.iocoder.yudao.module.bpm.service.task; +package cn.fuxiaoaio.ygg.module.bpm.service.task; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import cn.iocoder.yudao.framework.common.util.number.NumberUtils; -import cn.iocoder.yudao.framework.common.util.object.PageUtils; -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.*; -import cn.iocoder.yudao.module.bpm.convert.task.BpmTaskConvert; -import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmTaskExtDO; -import cn.iocoder.yudao.module.bpm.dal.mysql.task.BpmTaskExtMapper; -import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceDeleteReasonEnum; -import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; -import cn.iocoder.yudao.module.bpm.service.message.BpmMessageService; -import cn.iocoder.yudao.module.system.api.dept.DeptApi; -import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; -import cn.iocoder.yudao.module.system.api.user.AdminUserApi; -import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils; +import cn.fuxiaoaio.ygg.framework.common.util.number.NumberUtils; +import cn.fuxiaoaio.ygg.framework.common.util.object.PageUtils; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.task.vo.task.*; +import cn.fuxiaoaio.ygg.module.bpm.convert.task.BpmTaskConvert; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.task.BpmTaskExtDO; +import cn.fuxiaoaio.ygg.module.bpm.dal.mysql.task.BpmTaskExtMapper; +import cn.fuxiaoaio.ygg.module.bpm.enums.task.BpmProcessInstanceDeleteReasonEnum; +import cn.fuxiaoaio.ygg.module.bpm.enums.task.BpmProcessInstanceResultEnum; +import cn.fuxiaoaio.ygg.module.bpm.service.message.BpmMessageService; +import cn.fuxiaoaio.ygg.module.system.api.dept.DeptApi; +import cn.fuxiaoaio.ygg.module.system.api.dept.dto.DeptRespDTO; +import cn.fuxiaoaio.ygg.module.system.api.user.AdminUserApi; +import cn.fuxiaoaio.ygg.module.system.api.user.dto.AdminUserRespDTO; import lombok.extern.slf4j.Slf4j; import org.flowable.engine.HistoryService; import org.flowable.engine.TaskService; @@ -37,10 +37,10 @@ import javax.validation.Valid; import java.time.LocalDateTime; import java.util.*; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; -import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.convertMap; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.convertSet; +import static cn.fuxiaoaio.ygg.module.bpm.enums.ErrorCodeConstants.*; /** * 流程任务实例 Service 实现类 diff --git a/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/task/package-info.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/task/package-info.java new file mode 100644 index 000000000..efd932803 --- /dev/null +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/java/cn/fuxiaoaio/ygg/module/bpm/service/task/package-info.java @@ -0,0 +1 @@ +package cn.fuxiaoaio.ygg.module.bpm.service.task; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/application-dev.yaml b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/resources/application-dev.yaml similarity index 83% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/application-dev.yaml rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/resources/application-dev.yaml index e889708d4..0afd4b552 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/application-dev.yaml +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/resources/application-dev.yaml @@ -39,21 +39,21 @@ spring: primary: master datasource: master: - name: ruoyi-vue-pro - url: jdbc:mysql://400-infra.server.iocoder.cn:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true - driver-class-name: com.mysql.jdbc.Driver + name: FUXIAOAIO-CLOUD + url: jdbc:mysql://101.43.138.73:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true + driver-class-name: com.mariadb.jdbc.Driver username: root - password: 3WLiVUBEwTbvAfsh + password: 1233Newobject slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改 - name: ruoyi-vue-pro - url: jdbc:mysql://400-infra.server.iocoder.cn:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true - driver-class-name: com.mysql.jdbc.Driver + name: FUXIAOAIO-CLOUD + url: jdbc:mysql://101.43.138.73:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true + driver-class-name: com.mariadb.jdbc.Driver username: root - password: 3WLiVUBEwTbvAfsh + password: 1233Newobject # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 redis: - host: 400-infra.server.iocoder.cn # 地址 + host: 101.43.138.73 # 地址 port: 6379 # 端口 database: 1 # 数据库索引 # password: 123456 # 密码，建议生产环境开启 @@ -102,7 +102,7 @@ spring: --- #################### 芋道相关配置 #################### # 芋道配置项，设置当前项目所有自定义的配置 -yudao: +fuxiaoaio: xss: enable: false exclude-urls: # 如下两个 url，仅仅是为了演示，去掉配置也没关系 diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/application-local.yaml b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/resources/application-local.yaml similarity index 98% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/application-local.yaml rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/resources/application-local.yaml index fa3caf213..a0d63f7df 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/application-local.yaml +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/resources/application-local.yaml @@ -39,7 +39,7 @@ spring: primary: master datasource: master: - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 @@ -50,7 +50,7 @@ spring: # username: sa # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W slave: # 模拟从库，可根据自己需要修改 - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 @@ -116,12 +116,12 @@ spring: logging: level: # 配置自己写的 MyBatis Mapper 打印日志 - cn.iocoder.yudao.module.bpm.dal.mysql: debug + cn.fuxiaoaio.ygg.module.bpm.dal.mysql: debug --- #################### 芋道相关配置 #################### # 芋道配置项，设置当前项目所有自定义的配置 -yudao: +fuxiaoaio: env: # 多环境的配置项 tag: ${HOSTNAME} captcha: diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/application.yaml b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/resources/application.yaml similarity index 90% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/application.yaml rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/resources/application.yaml index b876259f5..a944965df 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/application.yaml +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/resources/application.yaml @@ -59,19 +59,19 @@ mybatis-plus: map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。 global-config: db-config: - # 重要说明：如果将配置放到 Nacos 时，请注意将 id-type 设置为对应 DB 的类型，否则会报错；详细见 https://gitee.com/zhijiantianya/yudao-cloud/issues/I5W2N0 讨论 + # 重要说明：如果将配置放到 Nacos 时，请注意将 id-type 设置为对应 DB 的类型，否则会报错；详细见 https://gitee.com/zhijiantianya/fuxiaoaio-cloud/issues/I5W2N0 讨论 id-type: NONE # “智能”模式，基于 IdTypeEnvironmentPostProcessor + 数据源的类型，自动适配成 AUTO、INPUT 模式。 # id-type: AUTO # 自增 ID，适合 MySQL 等直接自增的数据库 # id-type: INPUT # 用户输入 ID，适合 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库 # id-type: ASSIGN_ID # 分配 ID，默认使用雪花算法。注意，Oracle、PostgreSQL、Kingbase、DB2、H2 数据库时，需要去除实体类上的 @KeySequence 注解 logic-delete-value: 1 # 逻辑已删除值(默认为 1) logic-not-delete-value: 0 # 逻辑未删除值(默认为 0) - type-aliases-package: ${yudao.info.base-package}.dal.dataobject + type-aliases-package: ${fuxiaoaio.info.base-package}.dal.dataobject --- #################### RPC 远程调用相关配置 #################### dubbo: scan: - base-packages: ${yudao.info.base-package}.api # 指定 Dubbo 服务实现类的扫描基准包 + base-packages: ${fuxiaoaio.info.base-package}.api # 指定 Dubbo 服务实现类的扫描基准包 protocol: name: dubbo # 协议名称 port: -1 # 协议端口，-1 表示自增端口，从 20880 开始 @@ -111,25 +111,25 @@ xxl: --- #################### 芋道相关配置 #################### -yudao: +fuxiaoaio: info: version: 1.0.0 - base-package: cn.iocoder.yudao.module.bpm + base-package: cn.fuxiaoaio.ygg.module.bpm web: admin-ui: - url: http://dashboard.yudao.iocoder.cn # Admin 管理后台 UI 的地址 + url: http://dashboard.fuxiaoaio.iocoder.cn # Admin 管理后台 UI 的地址 swagger: title: 管理后台 description: 提供管理员管理的所有功能 - version: ${yudao.info.version} - base-package: ${yudao.info.base-package} + version: ${fuxiaoaio.info.version} + base-package: ${fuxiaoaio.info.base-package} captcha: timeout: 5m width: 160 height: 60 error-code: # 错误码相关配置项 constants-class-list: - - cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants + - cn.fuxiaoaio.ygg.module.bpm.enums.ErrorCodeConstants tenant: # 多租户相关配置项 enable: true diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/bootstrap-local.yaml b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/resources/bootstrap-local.yaml similarity index 100% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/bootstrap-local.yaml rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/resources/bootstrap-local.yaml diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/bootstrap.yaml b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/resources/bootstrap.yaml similarity index 100% rename from yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/bootstrap.yaml rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/resources/bootstrap.yaml diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/logback-spring.xml b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/resources/logback-spring.xml similarity index 95% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/logback-spring.xml rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/resources/logback-spring.xml index 5f4b30d04..509b469f8 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/logback-spring.xml +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/main/resources/logback-spring.xml @@ -1,8 +1,8 @@ - - + + diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderX2ScriptTest.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/test/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderX2ScriptTest.java similarity index 84% rename from yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderX2ScriptTest.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/test/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderX2ScriptTest.java index 9e266ebdd..296a7200b 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderX2ScriptTest.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/test/java/cn/fuxiaoaio/ygg/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderX2ScriptTest.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.bpm.framework.flowable.core.behavior.script.impl; +package cn.fuxiaoaio.ygg.module.bpm.framework.flowable.core.behavior.script.impl; -import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; -import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService; -import cn.iocoder.yudao.module.system.api.dept.DeptApi; -import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; -import cn.iocoder.yudao.module.system.api.user.AdminUserApi; -import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseMockitoUnitTest; +import cn.fuxiaoaio.ygg.module.bpm.service.task.BpmProcessInstanceService; +import cn.fuxiaoaio.ygg.module.system.api.dept.DeptApi; +import cn.fuxiaoaio.ygg.module.system.api.dept.dto.DeptRespDTO; +import cn.fuxiaoaio.ygg.module.system.api.user.AdminUserApi; +import cn.fuxiaoaio.ygg.module.system.api.user.dto.AdminUserRespDTO; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.impl.persistence.entity.ExecutionEntityImpl; import org.junit.jupiter.api.Test; @@ -14,10 +14,10 @@ import org.mockito.Mock; import java.util.Set; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet; -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.common.util.collection.SetUtils.asSet; +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.assertEquals; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormServiceTest.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/test/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmFormServiceTest.java similarity index 78% rename from yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormServiceTest.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/test/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmFormServiceTest.java index bdd88afea..46e80ec66 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormServiceTest.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/test/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmFormServiceTest.java @@ -1,15 +1,15 @@ -package cn.iocoder.yudao.module.bpm.service.definition; +package cn.fuxiaoaio.ygg.module.bpm.service.definition; import cn.hutool.core.util.RandomUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormPageReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormUpdateReqVO; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO; -import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmFormMapper; -import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmFormFieldRespDTO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.form.BpmFormCreateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.form.BpmFormPageReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.form.BpmFormUpdateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmFormDO; +import cn.fuxiaoaio.ygg.module.bpm.dal.mysql.definition.BpmFormMapper; +import cn.fuxiaoaio.ygg.module.bpm.service.definition.dto.BpmFormFieldRespDTO; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; @@ -18,12 +18,12 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; -import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.FORM_NOT_EXISTS; +import static cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils.cloneIgnoreId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.randomLongId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.randomPojo; +import static cn.fuxiaoaio.ygg.module.bpm.enums.ErrorCodeConstants.FORM_NOT_EXISTS; import static org.junit.jupiter.api.Assertions.*; /** @@ -68,7 +68,7 @@ public class BpmFormServiceTest extends BaseDbUnitTest { // 准备参数 BpmFormUpdateReqVO reqVO = randomPojo(BpmFormUpdateReqVO.class, o -> { o.setId(dbForm.getId()); // 设置更新的 ID - o.setConf("{'yudao': 'yuanma'}"); + o.setConf("{'fuxiaoaio': 'yuanma'}"); o.setFields(randomFields()); }); @@ -83,7 +83,7 @@ public class BpmFormServiceTest extends BaseDbUnitTest { public void testUpdateForm_notExists() { // 准备参数 BpmFormUpdateReqVO reqVO = randomPojo(BpmFormUpdateReqVO.class, o -> { - o.setConf("{'yudao': 'yuanma'}"); + o.setConf("{'fuxiaoaio': 'yuanma'}"); o.setFields(randomFields()); }); diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/definition/BpmTaskAssignRuleServiceImplTest.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/test/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmTaskAssignRuleServiceImplTest.java similarity index 86% rename from yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/definition/BpmTaskAssignRuleServiceImplTest.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/test/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmTaskAssignRuleServiceImplTest.java index f0210d38c..cae48432a 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/definition/BpmTaskAssignRuleServiceImplTest.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/test/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmTaskAssignRuleServiceImplTest.java @@ -1,23 +1,23 @@ -package cn.iocoder.yudao.module.bpm.service.definition; +package cn.fuxiaoaio.ygg.module.bpm.service.definition; import cn.hutool.core.map.MapUtil; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO; -import cn.iocoder.yudao.module.bpm.enums.definition.BpmTaskAssignRuleTypeEnum; -import cn.iocoder.yudao.module.bpm.enums.definition.BpmTaskRuleScriptEnum; -import cn.iocoder.yudao.module.bpm.framework.flowable.core.behavior.script.BpmTaskAssignScript; -import cn.iocoder.yudao.module.bpm.framework.flowable.core.behavior.script.impl.BpmTaskAssignStartUserScript; -import cn.iocoder.yudao.module.system.api.dept.DeptApi; -import cn.iocoder.yudao.module.system.api.dept.PostApi; -import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; -import cn.iocoder.yudao.module.system.api.dict.DictDataApi; -import cn.iocoder.yudao.module.system.api.permission.PermissionApi; -import cn.iocoder.yudao.module.system.api.permission.RoleApi; -import cn.iocoder.yudao.module.system.api.user.AdminUserApi; -import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmUserGroupDO; +import cn.fuxiaoaio.ygg.module.bpm.enums.definition.BpmTaskAssignRuleTypeEnum; +import cn.fuxiaoaio.ygg.module.bpm.enums.definition.BpmTaskRuleScriptEnum; +import cn.fuxiaoaio.ygg.module.bpm.framework.flowable.core.behavior.script.BpmTaskAssignScript; +import cn.fuxiaoaio.ygg.module.bpm.framework.flowable.core.behavior.script.impl.BpmTaskAssignStartUserScript; +import cn.fuxiaoaio.ygg.module.system.api.dept.DeptApi; +import cn.fuxiaoaio.ygg.module.system.api.dept.PostApi; +import cn.fuxiaoaio.ygg.module.system.api.dept.dto.DeptRespDTO; +import cn.fuxiaoaio.ygg.module.system.api.dict.DictDataApi; +import cn.fuxiaoaio.ygg.module.system.api.permission.PermissionApi; +import cn.fuxiaoaio.ygg.module.system.api.permission.RoleApi; +import cn.fuxiaoaio.ygg.module.system.api.user.AdminUserApi; +import cn.fuxiaoaio.ygg.module.system.api.user.dto.AdminUserRespDTO; import org.flowable.engine.delegate.DelegateExecution; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; @@ -29,9 +29,9 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.SetUtils.asSet; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.randomPojo; import static java.util.Collections.singleton; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.eq; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupServiceTest.java b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/test/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmUserGroupServiceTest.java similarity index 81% rename from yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupServiceTest.java rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/test/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmUserGroupServiceTest.java index 6fb9d91a1..ceeb66f9a 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupServiceTest.java +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/test/java/cn/fuxiaoaio/ygg/module/bpm/service/definition/BpmUserGroupServiceTest.java @@ -1,16 +1,16 @@ -package cn.iocoder.yudao.module.bpm.service.definition; +package cn.fuxiaoaio.ygg.module.bpm.service.definition; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.framework.test.core.util.AssertUtils; -import cn.iocoder.yudao.framework.test.core.util.RandomUtils; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupCreateReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupPageReqVO; -import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupUpdateReqVO; -import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO; -import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmUserGroupMapper; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils; +import cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.group.BpmUserGroupCreateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.group.BpmUserGroupPageReqVO; +import cn.fuxiaoaio.ygg.module.bpm.controller.admin.definition.vo.group.BpmUserGroupUpdateReqVO; +import cn.fuxiaoaio.ygg.module.bpm.dal.dataobject.definition.BpmUserGroupDO; +import cn.fuxiaoaio.ygg.module.bpm.dal.mysql.definition.BpmUserGroupMapper; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; @@ -19,10 +19,10 @@ import javax.annotation.Resource; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.USER_GROUP_NOT_EXISTS; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.buildLocalDateTime; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.buildTime; +import static cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils.cloneIgnoreId; +import static cn.fuxiaoaio.ygg.module.bpm.enums.ErrorCodeConstants.USER_GROUP_NOT_EXISTS; /** * {@link BpmUserGroupServiceImpl} 的单元测试类 diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/test/resources/application-unit-test.yaml b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/test/resources/application-unit-test.yaml similarity index 89% rename from yudao-module-bpm/yudao-module-bpm-biz/src/test/resources/application-unit-test.yaml rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/test/resources/application-unit-test.yaml index 256fd1f9e..066e2f3b6 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/test/resources/application-unit-test.yaml +++ b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/test/resources/application-unit-test.yaml @@ -8,7 +8,7 @@ spring: spring: # 数据源配置项 datasource: - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:h2:mem:testdb;MODE=MYSQL;DATABASE_TO_UPPER=false;NON_KEYWORDS=value; # MODE 使用 MySQL 模式；DATABASE_TO_UPPER 配置表和字段使用小写 driver-class-name: org.h2.Driver username: sa @@ -22,7 +22,7 @@ spring: mybatis-plus: lazy-initialization: true # 单元测试，设置 MyBatis Mapper 延迟加载，加速每个单元测试 - type-aliases-package: ${yudao.info.base-package}.module.*.dal.dataobject + type-aliases-package: ${fuxiaoaio.info.base-package}.module.*.dal.dataobject global-config: db-config: id-type: AUTO # H2 主键递增 @@ -42,6 +42,6 @@ mybatis-plus: --- #################### 芋道相关配置 #################### # 芋道配置项，设置当前项目所有自定义的配置 -yudao: +fuxiaoaio: info: - base-package: cn.iocoder.yudao.module + base-package: cn.fuxiaoaio.ygg.module diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/test/resources/logback.xml b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/test/resources/logback.xml similarity index 100% rename from yudao-module-bpm/yudao-module-bpm-biz/src/test/resources/logback.xml rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/test/resources/logback.xml diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/test/resources/sql/clean.sql b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/test/resources/sql/clean.sql similarity index 100% rename from yudao-module-bpm/yudao-module-bpm-biz/src/test/resources/sql/clean.sql rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/test/resources/sql/clean.sql diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/test/resources/sql/create_tables.sql b/fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/test/resources/sql/create_tables.sql similarity index 100% rename from yudao-module-bpm/yudao-module-bpm-biz/src/test/resources/sql/create_tables.sql rename to fuxiaoaio-module-bpm/fuxiaoaio-module-bpm-biz/src/test/resources/sql/create_tables.sql diff --git a/yudao-module-bpm/pom.xml b/fuxiaoaio-module-bpm/pom.xml similarity index 79% rename from yudao-module-bpm/pom.xml rename to fuxiaoaio-module-bpm/pom.xml index 432b97ae4..a4f2a0f87 100644 --- a/yudao-module-bpm/pom.xml +++ b/fuxiaoaio-module-bpm/pom.xml @@ -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"> - cn.iocoder.cloud - yudao + cn.fuxiaoaio.ygg + fuxiaoaio ${revision} 4.0.0 - yudao-module-bpm-api - yudao-module-bpm-biz + fuxiaoaio-module-bpm-api + fuxiaoaio-module-bpm-biz - yudao-module-bpm + fuxiaoaio-module-bpm pom ${project.artifactId} diff --git a/yudao-module-infra/yudao-module-infra-api/pom.xml b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/pom.xml similarity index 84% rename from yudao-module-infra/yudao-module-infra-api/pom.xml rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/pom.xml index fcaf87a02..721f05c5b 100644 --- a/yudao-module-infra/yudao-module-infra-api/pom.xml +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/pom.xml @@ -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"> - cn.iocoder.cloud - yudao-module-infra + cn.fuxiaoaio.ygg + fuxiaoaio-module-infra ${revision} 4.0.0 - yudao-module-infra-api + fuxiaoaio-module-infra-api jar ${project.artifactId} @@ -18,8 +18,8 @@ - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common diff --git a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/file/FileApi.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/file/FileApi.java similarity index 88% rename from yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/file/FileApi.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/file/FileApi.java index 3add096d4..9fb4b040d 100644 --- a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/file/FileApi.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/file/FileApi.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.infra.api.file; +package cn.fuxiaoaio.ygg.module.infra.api.file; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.infra.api.file.dto.FileCreateReqDTO; -import cn.iocoder.yudao.module.infra.enums.ApiConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.infra.api.file.dto.FileCreateReqDTO; +import cn.fuxiaoaio.ygg.module.infra.enums.ApiConstants; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import org.springframework.cloud.openfeign.FeignClient; diff --git a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/file/dto/FileCreateReqDTO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/file/dto/FileCreateReqDTO.java similarity index 91% rename from yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/file/dto/FileCreateReqDTO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/file/dto/FileCreateReqDTO.java index d4ef455d7..425150639 100644 --- a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/file/dto/FileCreateReqDTO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/file/dto/FileCreateReqDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.api.file.dto; +package cn.fuxiaoaio.ygg.module.infra.api.file.dto; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiAccessLogApi.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/logger/ApiAccessLogApi.java similarity index 75% rename from yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiAccessLogApi.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/logger/ApiAccessLogApi.java index e9dcf9531..56027e265 100644 --- a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiAccessLogApi.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/logger/ApiAccessLogApi.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.infra.api.logger; +package cn.fuxiaoaio.ygg.module.infra.api.logger; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; -import cn.iocoder.yudao.module.infra.enums.ApiConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; +import cn.fuxiaoaio.ygg.module.infra.enums.ApiConstants; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import org.springframework.cloud.openfeign.FeignClient; diff --git a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiErrorLogApi.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/logger/ApiErrorLogApi.java similarity index 75% rename from yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiErrorLogApi.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/logger/ApiErrorLogApi.java index 8740ba4b6..dee30ae49 100644 --- a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiErrorLogApi.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/logger/ApiErrorLogApi.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.infra.api.logger; +package cn.fuxiaoaio.ygg.module.infra.api.logger; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; -import cn.iocoder.yudao.module.infra.enums.ApiConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; +import cn.fuxiaoaio.ygg.module.infra.enums.ApiConstants; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import org.springframework.cloud.openfeign.FeignClient; diff --git a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/dto/ApiAccessLogCreateReqDTO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/logger/dto/ApiAccessLogCreateReqDTO.java similarity index 97% rename from yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/dto/ApiAccessLogCreateReqDTO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/logger/dto/ApiAccessLogCreateReqDTO.java index e29e7b787..b18d2ff12 100644 --- a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/dto/ApiAccessLogCreateReqDTO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/logger/dto/ApiAccessLogCreateReqDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.api.logger.dto; +package cn.fuxiaoaio.ygg.module.infra.api.logger.dto; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/dto/ApiErrorLogCreateReqDTO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/logger/dto/ApiErrorLogCreateReqDTO.java similarity index 98% rename from yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/dto/ApiErrorLogCreateReqDTO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/logger/dto/ApiErrorLogCreateReqDTO.java index 6973b8dd4..2a1ade41f 100644 --- a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/dto/ApiErrorLogCreateReqDTO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/logger/dto/ApiErrorLogCreateReqDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.api.logger.dto; +package cn.fuxiaoaio.ygg.module.infra.api.logger.dto; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/package-info.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/package-info.java similarity index 59% rename from yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/package-info.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/package-info.java index 9ed9a778e..57f67df8b 100644 --- a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/package-info.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/package-info.java @@ -1,4 +1,4 @@ /** * infra API 包，定义暴露给其它模块的 API */ -package cn.iocoder.yudao.module.infra.api; +package cn.fuxiaoaio.ygg.module.infra.api; diff --git a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/enums/ApiConstants.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/ApiConstants.java similarity index 78% rename from yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/enums/ApiConstants.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/ApiConstants.java index d0f6f5f86..eb955f264 100644 --- a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/enums/ApiConstants.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/ApiConstants.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.infra.enums; +package cn.fuxiaoaio.ygg.module.infra.enums; -import cn.iocoder.yudao.framework.common.enums.RpcConstants; +import cn.fuxiaoaio.ygg.framework.common.enums.RpcConstants; /** * API 相关的枚举 diff --git a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/enums/DictTypeConstants.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/DictTypeConstants.java similarity index 93% rename from yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/enums/DictTypeConstants.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/DictTypeConstants.java index 53ab807cb..58abd768e 100644 --- a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/enums/DictTypeConstants.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/DictTypeConstants.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.enums; +package cn.fuxiaoaio.ygg.module.infra.enums; /** * Infra 字典类型的枚举类 diff --git a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/enums/ErrorCodeConstants.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/ErrorCodeConstants.java similarity index 97% rename from yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/enums/ErrorCodeConstants.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/ErrorCodeConstants.java index ba571c689..26b023c14 100644 --- a/yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/enums/ErrorCodeConstants.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-api/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/ErrorCodeConstants.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.infra.enums; +package cn.fuxiaoaio.ygg.module.infra.enums; -import cn.iocoder.yudao.framework.common.exception.ErrorCode; +import cn.fuxiaoaio.ygg.framework.common.exception.ErrorCode; /** * Infra 错误码枚举类 diff --git a/yudao-module-infra/yudao-module-infra-biz/pom.xml b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/pom.xml similarity index 67% rename from yudao-module-infra/yudao-module-infra-biz/pom.xml rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/pom.xml index 8a84fa245..629648b8c 100644 --- a/yudao-module-infra/yudao-module-infra-biz/pom.xml +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/pom.xml @@ -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"> - cn.iocoder.cloud - yudao-module-infra + cn.fuxiaoaio.ygg + fuxiaoaio-module-infra ${revision} 4.0.0 - yudao-module-infra-biz + fuxiaoaio-module-infra-biz jar ${project.artifactId} @@ -27,44 +27,44 @@ - cn.iocoder.cloud - yudao-module-system-api + cn.fuxiaoaio.ygg + fuxiaoaio-module-system-api ${revision} - cn.iocoder.cloud - yudao-module-infra-api + cn.fuxiaoaio.ygg + fuxiaoaio-module-infra-api ${revision} - cn.iocoder.cloud - yudao-spring-boot-starter-banner + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-banner - cn.iocoder.cloud - yudao-spring-boot-starter-biz-operatelog + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-operatelog - cn.iocoder.cloud - yudao-spring-boot-starter-biz-tenant + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-tenant - cn.iocoder.cloud - yudao-spring-boot-starter-biz-error-code + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-error-code - cn.iocoder.cloud - yudao-spring-boot-starter-security + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-security - cn.iocoder.cloud - yudao-spring-boot-starter-mybatis + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-mybatis com.baomidou @@ -72,14 +72,14 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-redis + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-redis - cn.iocoder.cloud - yudao-spring-boot-starter-rpc + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-rpc @@ -96,27 +96,27 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-job + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-job - cn.iocoder.cloud - yudao-spring-boot-starter-mq + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-mq - cn.iocoder.cloud - yudao-spring-boot-starter-test + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-test test - cn.iocoder.cloud - yudao-spring-boot-starter-excel + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-excel @@ -131,8 +131,8 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-monitor + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-monitor @@ -142,8 +142,8 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-file + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-file diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/InfraServerApplication.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/InfraServerApplication.java similarity index 97% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/InfraServerApplication.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/InfraServerApplication.java index fe3eee495..3d7a90eb1 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/InfraServerApplication.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/InfraServerApplication.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra; +package cn.fuxiaoaio.ygg.module.infra; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/file/FileApiImpl.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/file/FileApiImpl.java similarity index 71% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/file/FileApiImpl.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/file/FileApiImpl.java index bf403853e..b046525dd 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/file/FileApiImpl.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/file/FileApiImpl.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.infra.api.file; +package cn.fuxiaoaio.ygg.module.infra.api.file; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.infra.api.file.dto.FileCreateReqDTO; -import cn.iocoder.yudao.module.infra.service.file.FileService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.infra.api.file.dto.FileCreateReqDTO; +import cn.fuxiaoaio.ygg.module.infra.service.file.FileService; import org.apache.commons.fileupload.FileItem; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.stereotype.Service; @@ -12,8 +12,8 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile; import javax.annotation.Resource; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.module.system.enums.ApiConstants.VERSION; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.module.system.enums.ApiConstants.VERSION; @RestController // 提供 RESTful API 接口，给 Feign 调用 @DubboService(version = VERSION) // 提供 Dubbo RPC 接口，给 Dubbo Consumer 调用 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiAccessLogApiImpl.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/logger/ApiAccessLogApiImpl.java similarity index 67% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiAccessLogApiImpl.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/logger/ApiAccessLogApiImpl.java index a54bc27a9..940182f91 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiAccessLogApiImpl.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/logger/ApiAccessLogApiImpl.java @@ -1,16 +1,16 @@ -package cn.iocoder.yudao.module.infra.api.logger; +package cn.fuxiaoaio.ygg.module.infra.api.logger; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; -import cn.iocoder.yudao.module.infra.service.logger.ApiAccessLogService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; +import cn.fuxiaoaio.ygg.module.infra.service.logger.ApiAccessLogService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.module.system.enums.ApiConstants.VERSION; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.module.system.enums.ApiConstants.VERSION; @RestController // 提供 RESTful API 接口，给 Feign 调用 @DubboService(version = VERSION) // 提供 Dubbo RPC 接口，给 Dubbo Consumer 调用 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiErrorLogApiImpl.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/logger/ApiErrorLogApiImpl.java similarity index 60% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiErrorLogApiImpl.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/logger/ApiErrorLogApiImpl.java index 5e8d8dbed..4e3e7b070 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiErrorLogApiImpl.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/logger/ApiErrorLogApiImpl.java @@ -1,18 +1,18 @@ -package cn.iocoder.yudao.module.infra.api.logger; +package cn.fuxiaoaio.ygg.module.infra.api.logger; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; -import cn.iocoder.yudao.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; -import cn.iocoder.yudao.module.infra.service.logger.ApiAccessLogService; -import cn.iocoder.yudao.module.infra.service.logger.ApiErrorLogService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; +import cn.fuxiaoaio.ygg.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; +import cn.fuxiaoaio.ygg.module.infra.service.logger.ApiAccessLogService; +import cn.fuxiaoaio.ygg.module.infra.service.logger.ApiErrorLogService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.module.system.enums.ApiConstants.VERSION; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.module.system.enums.ApiConstants.VERSION; @RestController // 提供 RESTful API 接口，给 Feign 调用 @DubboService(version = VERSION) // 提供 Dubbo RPC 接口，给 Dubbo Consumer 调用 diff --git a/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/package-info.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/package-info.java new file mode 100644 index 000000000..7b8814185 --- /dev/null +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/api/package-info.java @@ -0,0 +1 @@ +package cn.fuxiaoaio.ygg.module.infra.api; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/CodegenController.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/CodegenController.java similarity index 84% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/CodegenController.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/CodegenController.java index e7367fdad..f598670e6 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/CodegenController.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/CodegenController.java @@ -1,21 +1,21 @@ -package cn.iocoder.yudao.module.infra.controller.admin.codegen; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.ZipUtil; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.CodegenCreateListReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.CodegenDetailRespVO; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.CodegenPreviewRespVO; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.CodegenUpdateReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.table.CodegenTablePageReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.table.CodegenTableRespVO; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.table.DatabaseTableRespVO; -import cn.iocoder.yudao.module.infra.convert.codegen.CodegenConvert; -import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenColumnDO; -import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenTableDO; -import cn.iocoder.yudao.module.infra.service.codegen.CodegenService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.servlet.ServletUtils; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.CodegenCreateListReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.CodegenDetailRespVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.CodegenPreviewRespVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.CodegenUpdateReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.table.CodegenTablePageReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.table.CodegenTableRespVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.table.DatabaseTableRespVO; +import cn.fuxiaoaio.ygg.module.infra.convert.codegen.CodegenConvert; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.codegen.CodegenColumnDO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.codegen.CodegenTableDO; +import cn.fuxiaoaio.ygg.module.infra.service.codegen.CodegenService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -33,8 +33,8 @@ import java.io.IOException; import java.util.List; import java.util.Map; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; @Tag(name = "管理后台 - 代码生成器") @RestController @@ -49,7 +49,7 @@ public class CodegenController { @Operation(summary = "获得数据库自带的表定义列表", description = "会过滤掉已经导入 Codegen 的表") @Parameters({ @Parameter(name = "dataSourceConfigId", description = "数据源配置的编号", required = true, example = "1"), - @Parameter(name = "name", description = "表名，模糊匹配", example = "yudao"), + @Parameter(name = "name", description = "表名，模糊匹配", example = "fuxiaoaio"), @Parameter(name = "comment", description = "描述，模糊匹配", example = "芋道") }) @PreAuthorize("@ss.hasPermission('infra:codegen:query')") diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/CodegenCreateListReqVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/CodegenCreateListReqVO.java similarity index 91% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/CodegenCreateListReqVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/CodegenCreateListReqVO.java index 46dd711ad..bbfc00ffa 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/CodegenCreateListReqVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/CodegenCreateListReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.codegen.vo; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/CodegenDetailRespVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/CodegenDetailRespVO.java similarity index 72% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/CodegenDetailRespVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/CodegenDetailRespVO.java index 35922c14b..7c5e87518 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/CodegenDetailRespVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/CodegenDetailRespVO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.infra.controller.admin.codegen.vo; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.column.CodegenColumnRespVO; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.table.CodegenTableRespVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.column.CodegenColumnRespVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.table.CodegenTableRespVO; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/CodegenPreviewRespVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/CodegenPreviewRespVO.java similarity index 80% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/CodegenPreviewRespVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/CodegenPreviewRespVO.java index 2997bcd11..72330935c 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/CodegenPreviewRespVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/CodegenPreviewRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.codegen.vo; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -8,7 +8,7 @@ import lombok.Data; @Data public class CodegenPreviewRespVO { - @Schema(description = "文件路径", required = true, example = "java/cn/iocoder/yudao/adminserver/modules/system/controller/test/SysTestDemoController.java") + @Schema(description = "文件路径", required = true, example = "java/cn.fuxiaoaio.ygg/adminserver/modules/system/controller/test/SysTestDemoController.java") private String filePath; @Schema(description = "代码", required = true, example = "Hello World") diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/CodegenUpdateReqVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/CodegenUpdateReqVO.java similarity index 87% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/CodegenUpdateReqVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/CodegenUpdateReqVO.java index 9276363ec..acd2a5026 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/CodegenUpdateReqVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/CodegenUpdateReqVO.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.infra.controller.admin.codegen.vo; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo; import cn.hutool.core.util.ObjectUtil; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.column.CodegenColumnBaseVO; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.table.CodegenTableBaseVO; -import cn.iocoder.yudao.module.infra.enums.codegen.CodegenSceneEnum; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.column.CodegenColumnBaseVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.table.CodegenTableBaseVO; +import cn.fuxiaoaio.ygg.module.infra.enums.codegen.CodegenSceneEnum; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnBaseVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/column/CodegenColumnBaseVO.java similarity index 98% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnBaseVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/column/CodegenColumnBaseVO.java index 0fdbc1a7a..5b75f2f8c 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnBaseVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/column/CodegenColumnBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.column; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.column; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnRespVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/column/CodegenColumnRespVO.java similarity index 90% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnRespVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/column/CodegenColumnRespVO.java index b0f989de7..2c04032c0 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnRespVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/column/CodegenColumnRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.column; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.column; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTableBaseVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/table/CodegenTableBaseVO.java similarity index 96% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTableBaseVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/table/CodegenTableBaseVO.java index 0ea3ccdfd..a1c6391e5 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTableBaseVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/table/CodegenTableBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.table; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.table; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -16,7 +16,7 @@ public class CodegenTableBaseVO { @NotNull(message = "导入类型不能为空") private Integer scene; - @Schema(description = "表名称", required = true, example = "yudao") + @Schema(description = "表名称", required = true, example = "fuxiaoaio") @NotNull(message = "表名称不能为空") private String tableName; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java similarity index 73% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java index 1049a35f3..519d71197 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.table; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.table; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 表定义分页 Request VO") @Data @@ -18,13 +18,13 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_ @ToString(callSuper = true) public class CodegenTablePageReqVO extends PageParam { - @Schema(description = "表名称,模糊匹配", example = "yudao") + @Schema(description = "表名称,模糊匹配", example = "fuxiaoaio") private String tableName; @Schema(description = "表描述,模糊匹配", example = "芋道") private String tableComment; - @Schema(description = "实体,模糊匹配", example = "Yudao") + @Schema(description = "实体,模糊匹配", example = "Fuxiaoaio") private String className; @Schema(description = "创建时间", example = "[2022-07-01 00:00:00, 2022-07-01 23:59:59]") diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java similarity index 92% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java index d89d903cb..150b27d4b 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.table; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.table; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/DatabaseTableRespVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/table/DatabaseTableRespVO.java similarity index 87% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/DatabaseTableRespVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/table/DatabaseTableRespVO.java index 2669aba74..e68a5a9cb 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/DatabaseTableRespVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/codegen/vo/table/DatabaseTableRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.table; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.table; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/config/ConfigController.java similarity index 82% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/config/ConfigController.java index ac49f5740..e03e57abd 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/config/ConfigController.java @@ -1,14 +1,14 @@ -package cn.iocoder.yudao.module.infra.controller.admin.config; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.config; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import cn.iocoder.yudao.module.infra.controller.admin.config.vo.*; -import cn.iocoder.yudao.module.infra.convert.config.ConfigConvert; -import cn.iocoder.yudao.module.infra.dal.dataobject.config.ConfigDO; -import cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants; -import cn.iocoder.yudao.module.infra.service.config.ConfigService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.excel.core.util.ExcelUtils; +import cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.config.vo.*; +import cn.fuxiaoaio.ygg.module.infra.convert.config.ConfigConvert; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.config.ConfigDO; +import cn.fuxiaoaio.ygg.module.infra.enums.ErrorCodeConstants; +import cn.fuxiaoaio.ygg.module.infra.service.config.ConfigService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -22,9 +22,9 @@ import javax.validation.Valid; import java.io.IOException; import java.util.List; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 参数配置") @RestController diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigBaseVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/config/vo/ConfigBaseVO.java similarity index 95% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigBaseVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/config/vo/ConfigBaseVO.java index d6a4c6084..e4610186c 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigBaseVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/config/vo/ConfigBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.config.vo; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.config.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigCreateReqVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/config/vo/ConfigCreateReqVO.java similarity index 91% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigCreateReqVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/config/vo/ConfigCreateReqVO.java index 97779c286..846074517 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigCreateReqVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/config/vo/ConfigCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.config.vo; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.config.vo; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigExcelVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/config/vo/ConfigExcelVO.java similarity index 78% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigExcelVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/config/vo/ConfigExcelVO.java index 12611032a..50d9391e7 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigExcelVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/config/vo/ConfigExcelVO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.infra.controller.admin.config.vo; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.config.vo; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; -import cn.iocoder.yudao.module.infra.enums.DictTypeConstants; +import cn.fuxiaoaio.ygg.framework.excel.core.annotations.DictFormat; +import cn.fuxiaoaio.ygg.framework.excel.core.convert.DictConvert; +import cn.fuxiaoaio.ygg.module.infra.enums.DictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigExportReqVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/config/vo/ConfigExportReqVO.java similarity index 87% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigExportReqVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/config/vo/ConfigExportReqVO.java index e959346c7..16a795259 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigExportReqVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/config/vo/ConfigExportReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.config.vo; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.config.vo; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 参数配置导出 Request VO") @Data diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigPageReqVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/config/vo/ConfigPageReqVO.java similarity index 84% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigPageReqVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/config/vo/ConfigPageReqVO.java index 3219fc633..3cfba6492 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigPageReqVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/config/vo/ConfigPageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.infra.controller.admin.config.vo; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.config.vo; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 参数配置分页 Request VO") @Data diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigRespVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/config/vo/ConfigRespVO.java similarity index 94% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigRespVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/config/vo/ConfigRespVO.java index cbb289e5b..d11574cdd 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigRespVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/config/vo/ConfigRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.config.vo; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.config.vo; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigUpdateReqVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/config/vo/ConfigUpdateReqVO.java similarity index 90% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigUpdateReqVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/config/vo/ConfigUpdateReqVO.java index e799c7348..d3b730b84 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigUpdateReqVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/config/vo/ConfigUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.config.vo; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.config.vo; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/DataSourceConfigController.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/db/DataSourceConfigController.java old mode 100755 new mode 100644 similarity index 83% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/DataSourceConfigController.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/db/DataSourceConfigController.java index 2aba1539b..c75e69e45 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/DataSourceConfigController.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/db/DataSourceConfigController.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.infra.controller.admin.db; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.db; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.infra.controller.admin.db.vo.DataSourceConfigCreateReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.db.vo.DataSourceConfigRespVO; -import cn.iocoder.yudao.module.infra.controller.admin.db.vo.DataSourceConfigUpdateReqVO; -import cn.iocoder.yudao.module.infra.convert.db.DataSourceConfigConvert; -import cn.iocoder.yudao.module.infra.dal.dataobject.db.DataSourceConfigDO; -import cn.iocoder.yudao.module.infra.service.db.DataSourceConfigService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.db.vo.DataSourceConfigCreateReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.db.vo.DataSourceConfigRespVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.db.vo.DataSourceConfigUpdateReqVO; +import cn.fuxiaoaio.ygg.module.infra.convert.db.DataSourceConfigConvert; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.db.DataSourceConfigDO; +import cn.fuxiaoaio.ygg.module.infra.service.db.DataSourceConfigService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -18,7 +18,7 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 数据源配置") @RestController diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/DatabaseDocController.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/db/DatabaseDocController.java similarity index 98% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/DatabaseDocController.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/db/DatabaseDocController.java index 8a44df1df..5cd1699a4 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/DatabaseDocController.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/db/DatabaseDocController.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.infra.controller.admin.db; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.db; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.IdUtil; -import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; +import cn.fuxiaoaio.ygg.framework.common.util.servlet.ServletUtils; import cn.smallbun.screw.core.Configuration; import cn.smallbun.screw.core.engine.EngineConfig; import cn.smallbun.screw.core.engine.EngineFileType; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigBaseVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/db/vo/DataSourceConfigBaseVO.java old mode 100755 new mode 100644 similarity index 93% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigBaseVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/db/vo/DataSourceConfigBaseVO.java index ff410ce65..fca775a7c --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigBaseVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/db/vo/DataSourceConfigBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.db.vo; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.db.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigCreateReqVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/db/vo/DataSourceConfigCreateReqVO.java old mode 100755 new mode 100644 similarity index 88% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigCreateReqVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/db/vo/DataSourceConfigCreateReqVO.java index b67797baf..1809b764b --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigCreateReqVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/db/vo/DataSourceConfigCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.db.vo; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.db.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigRespVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/db/vo/DataSourceConfigRespVO.java old mode 100755 new mode 100644 similarity index 89% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigRespVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/db/vo/DataSourceConfigRespVO.java index 4002d4f06..4a84780e4 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigRespVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/db/vo/DataSourceConfigRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.db.vo; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.db.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigUpdateReqVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/db/vo/DataSourceConfigUpdateReqVO.java old mode 100755 new mode 100644 similarity index 90% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigUpdateReqVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/db/vo/DataSourceConfigUpdateReqVO.java index 6bf318e9a..e712319d6 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigUpdateReqVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/db/vo/DataSourceConfigUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.db.vo; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.db.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileConfigController.http b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/FileConfigController.http similarity index 92% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileConfigController.http rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/FileConfigController.http index 61dede43f..f5491a6ab 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileConfigController.http +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/FileConfigController.http @@ -13,7 +13,7 @@ Authorization: Bearer {{token}} "accessSecret": "kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP", "bucket": "ruoyi-vue-pro", "endpoint": "s3-cn-south-1.qiniucs.com", - "domain": "http://test.yudao.iocoder.cn", + "domain": "http://test.fuxiaoaio.iocoder.cn", "region": "oss-cn-beijing" } } @@ -33,7 +33,7 @@ Authorization: Bearer {{token}} "accessSecret": "kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP", "bucket": "ruoyi-vue-pro", "endpoint": "s3-cn-south-1.qiniucs.com", - "domain": "http://test.yudao.iocoder.cn", + "domain": "http://test.fuxiaoaio.iocoder.cn", "region": "oss-cn-beijing" } } diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileConfigController.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/FileConfigController.java old mode 100755 new mode 100644 similarity index 82% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileConfigController.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/FileConfigController.java index 1ea122e34..a40e8b77b --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileConfigController.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/FileConfigController.java @@ -1,14 +1,14 @@ -package cn.iocoder.yudao.module.infra.controller.admin.file; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.file; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.infra.controller.admin.file.vo.config.FileConfigCreateReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.file.vo.config.FileConfigPageReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.file.vo.config.FileConfigRespVO; -import cn.iocoder.yudao.module.infra.controller.admin.file.vo.config.FileConfigUpdateReqVO; -import cn.iocoder.yudao.module.infra.convert.file.FileConfigConvert; -import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileConfigDO; -import cn.iocoder.yudao.module.infra.service.file.FileConfigService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.config.FileConfigCreateReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.config.FileConfigPageReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.config.FileConfigRespVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.config.FileConfigUpdateReqVO; +import cn.fuxiaoaio.ygg.module.infra.convert.file.FileConfigConvert; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.file.FileConfigDO; +import cn.fuxiaoaio.ygg.module.infra.service.file.FileConfigService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 文件配置") @RestController diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/FileController.java similarity index 81% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/FileController.java index 82a9ec232..058be5cc1 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/FileController.java @@ -1,17 +1,17 @@ -package cn.iocoder.yudao.module.infra.controller.admin.file; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.file; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FilePageReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FileRespVO; -import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FileUploadReqVO; -import cn.iocoder.yudao.module.infra.convert.file.FileConvert; -import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO; -import cn.iocoder.yudao.module.infra.service.file.FileService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.servlet.ServletUtils; +import cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.file.FilePageReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.file.FileRespVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.file.FileUploadReqVO; +import cn.fuxiaoaio.ygg.module.infra.convert.file.FileConvert; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.file.FileDO; +import cn.fuxiaoaio.ygg.module.infra.service.file.FileService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 文件存储") @RestController diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigBaseVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/vo/config/FileConfigBaseVO.java old mode 100755 new mode 100644 similarity index 90% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigBaseVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/vo/config/FileConfigBaseVO.java index 5520ebfec..73f3f2131 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigBaseVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/vo/config/FileConfigBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.file.vo.config; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.config; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigCreateReqVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/vo/config/FileConfigCreateReqVO.java old mode 100755 new mode 100644 similarity index 92% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigCreateReqVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/vo/config/FileConfigCreateReqVO.java index 1830f23a4..c50200b48 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigCreateReqVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/vo/config/FileConfigCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.file.vo.config; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.config; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigPageReqVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/vo/config/FileConfigPageReqVO.java old mode 100755 new mode 100644 similarity index 83% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigPageReqVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/vo/config/FileConfigPageReqVO.java index 2b76612bb..2c26379d9 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigPageReqVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/vo/config/FileConfigPageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.infra.controller.admin.file.vo.config; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.config; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 文件配置分页 Request VO") @Data diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigRespVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/vo/config/FileConfigRespVO.java old mode 100755 new mode 100644 similarity index 89% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigRespVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/vo/config/FileConfigRespVO.java index ac0834bbd..a18b21d70 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigRespVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/vo/config/FileConfigRespVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.infra.controller.admin.file.vo.config; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.config; -import cn.iocoder.yudao.framework.file.core.client.FileClientConfig; +import cn.fuxiaoaio.ygg.framework.file.core.client.FileClientConfig; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigUpdateReqVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/vo/config/FileConfigUpdateReqVO.java old mode 100755 new mode 100644 similarity index 92% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigUpdateReqVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/vo/config/FileConfigUpdateReqVO.java index 5b5fe2224..59d86fb69 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigUpdateReqVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/vo/config/FileConfigUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.file.vo.config; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.config; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FilePageReqVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/vo/file/FilePageReqVO.java similarity index 81% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FilePageReqVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/vo/file/FilePageReqVO.java index 2c240d4a4..bb81ace4b 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FilePageReqVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/vo/file/FilePageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.infra.controller.admin.file.vo.file; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.file; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 文件分页 Request VO") @Data @@ -18,7 +18,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_ @ToString(callSuper = true) public class FilePageReqVO extends PageParam { - @Schema(description = "文件路径,模糊匹配", example = "yudao") + @Schema(description = "文件路径,模糊匹配", example = "fuxiaoaio") private String path; @Schema(description = "文件类型,模糊匹配", example = "jpg") diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FileRespVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/vo/file/FileRespVO.java similarity index 86% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FileRespVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/vo/file/FileRespVO.java index a8344ee21..b10c41726 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FileRespVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/vo/file/FileRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.file.vo.file; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.file; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -13,10 +13,10 @@ public class FileRespVO { @Schema(description = "文件编号", required = true, example = "1024") private Long id; - @Schema(description = "文件路径", required = true, example = "yudao.jpg") + @Schema(description = "文件路径", required = true, example = "fuxiaoaio.jpg") private String path; - @Schema(description = "文件 URL", required = true, example = "https://www.iocoder.cn/yudao.jpg") + @Schema(description = "文件 URL", required = true, example = "https://www.iocoder.cn/fuxiaoaio.jpg") private String url; @Schema(description = "文件类型", example = "jpg") diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FileUploadReqVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/vo/file/FileUploadReqVO.java similarity index 78% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FileUploadReqVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/vo/file/FileUploadReqVO.java index 83d38c81e..9096ce8e6 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FileUploadReqVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/file/vo/file/FileUploadReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.file.vo.file; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.file; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -15,7 +15,7 @@ public class FileUploadReqVO { @NotNull(message = "文件附件不能为空") private MultipartFile file; - @Schema(description = "文件附件", example = "yudaoyuanma.png") + @Schema(description = "文件附件", example = "fuxiaoaioyuanma.png") private String path; } \ No newline at end of file diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobController.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/job/JobController.java similarity index 82% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobController.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/job/JobController.java index b34e1e8c5..3425a64da 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobController.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/job/JobController.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.infra.controller.admin.job; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.job; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.security.access.prepost.PreAuthorize; @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.error; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.error; @Tag(name = "管理后台 - 定时任务") @RestController diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/ApiAccessLogController.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/ApiAccessLogController.java similarity index 70% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/ApiAccessLogController.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/ApiAccessLogController.java index 3533e8c0c..a97c33ac8 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/ApiAccessLogController.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/ApiAccessLogController.java @@ -1,16 +1,16 @@ -package cn.iocoder.yudao.module.infra.controller.admin.logger; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.logger; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogExcelVO; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogExportReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogPageReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogRespVO; -import cn.iocoder.yudao.module.infra.convert.logger.ApiAccessLogConvert; -import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiAccessLogDO; -import cn.iocoder.yudao.module.infra.service.logger.ApiAccessLogService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.excel.core.util.ExcelUtils; +import cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogExcelVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogExportReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogPageReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogRespVO; +import cn.fuxiaoaio.ygg.module.infra.convert.logger.ApiAccessLogConvert; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.logger.ApiAccessLogDO; +import cn.fuxiaoaio.ygg.module.infra.service.logger.ApiAccessLogService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import org.springframework.security.access.prepost.PreAuthorize; @@ -25,8 +25,8 @@ import javax.validation.Valid; import java.io.IOException; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - API 访问日志") @RestController diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/ApiErrorLogController.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/ApiErrorLogController.java similarity index 74% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/ApiErrorLogController.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/ApiErrorLogController.java index 9d582670c..90be0ec8a 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/ApiErrorLogController.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/ApiErrorLogController.java @@ -1,16 +1,16 @@ -package cn.iocoder.yudao.module.infra.controller.admin.logger; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.logger; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogExcelVO; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogExportReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogPageReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogRespVO; -import cn.iocoder.yudao.module.infra.convert.logger.ApiErrorLogConvert; -import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiErrorLogDO; -import cn.iocoder.yudao.module.infra.service.logger.ApiErrorLogService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.excel.core.util.ExcelUtils; +import cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogExcelVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogExportReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogPageReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogRespVO; +import cn.fuxiaoaio.ygg.module.infra.convert.logger.ApiErrorLogConvert; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.logger.ApiErrorLogDO; +import cn.fuxiaoaio.ygg.module.infra.service.logger.ApiErrorLogService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -25,9 +25,9 @@ import javax.validation.Valid; import java.io.IOException; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; -import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; +import static cn.fuxiaoaio.ygg.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; @Tag(name = "管理后台 - API 错误日志") @RestController diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogBaseVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogBaseVO.java similarity index 95% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogBaseVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogBaseVO.java index 94e17c9af..c73d5ea2d 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogBaseVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apiaccesslog; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; /** * API 访问日志 Base VO，提供给添加、修改、详细的子 VO 使用 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogExcelVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogExcelVO.java similarity index 83% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogExcelVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogExcelVO.java index 21447743d..c8f3fc45c 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogExcelVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogExcelVO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apiaccesslog; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; -import cn.iocoder.yudao.module.system.enums.DictTypeConstants; +import cn.fuxiaoaio.ygg.framework.excel.core.annotations.DictFormat; +import cn.fuxiaoaio.ygg.framework.excel.core.convert.DictConvert; +import cn.fuxiaoaio.ygg.module.system.enums.DictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogExportReqVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogExportReqVO.java similarity index 90% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogExportReqVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogExportReqVO.java index 82ae47ef8..668d161ef 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogExportReqVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogExportReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apiaccesslog; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - API 访问日志 Excel 导出 Request VO,参数和 ApiAccessLogPageReqVO 是一致的") @Data diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogPageReqVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogPageReqVO.java similarity index 87% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogPageReqVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogPageReqVO.java index 31ca93e77..65aa29e85 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogPageReqVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogPageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apiaccesslog; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - API 访问日志分页 Request VO") @Data diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogRespVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogRespVO.java similarity index 90% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogRespVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogRespVO.java index be4feb65e..a1faed3d9 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogRespVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apiaccesslog; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogBaseVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogBaseVO.java similarity index 96% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogBaseVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogBaseVO.java index ae5448160..1a32625e6 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogBaseVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apierrorlog; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; /** * API 错误日志 Base VO，提供给添加、修改、详细的子 VO 使用 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogExcelVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogExcelVO.java similarity index 86% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogExcelVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogExcelVO.java index 08f10894f..af3fd2dd8 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogExcelVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogExcelVO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apierrorlog; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; -import cn.iocoder.yudao.module.infra.enums.DictTypeConstants; +import cn.fuxiaoaio.ygg.framework.excel.core.annotations.DictFormat; +import cn.fuxiaoaio.ygg.framework.excel.core.convert.DictConvert; +import cn.fuxiaoaio.ygg.module.infra.enums.DictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; @@ -26,7 +26,7 @@ public class ApiErrorLogExcelVO { private Integer userId; @ExcelProperty(value = "用户类型", converter = DictConvert.class) - @DictFormat(cn.iocoder.yudao.module.system.enums.DictTypeConstants.USER_TYPE) + @DictFormat(cn.fuxiaoaio.ygg.module.system.enums.DictTypeConstants.USER_TYPE) private Integer userType; @ExcelProperty("应用名") diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogExportReqVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogExportReqVO.java similarity index 89% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogExportReqVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogExportReqVO.java index c618d2f5c..5c4fa8e3b 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogExportReqVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogExportReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apierrorlog; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - API 错误日志 Excel 导出 Request VO,参数和 ApiErrorLogPageReqVO 是一致的") @Data diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogPageReqVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogPageReqVO.java similarity index 86% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogPageReqVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogPageReqVO.java index e29cfdbad..b65426a87 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogPageReqVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogPageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apierrorlog; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - API 错误日志分页 Request VO") @Data diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogRespVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogRespVO.java similarity index 92% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogRespVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogRespVO.java index 899d3c877..a7ad83f0a 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogRespVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apierrorlog; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/RedisController.http b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/redis/RedisController.http similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/RedisController.http rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/redis/RedisController.http diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/RedisController.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/redis/RedisController.java similarity index 89% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/RedisController.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/redis/RedisController.java index 56eec47cc..9dfd3d9e8 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/RedisController.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/redis/RedisController.java @@ -1,14 +1,14 @@ -package cn.iocoder.yudao.module.infra.controller.admin.redis; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.redis; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine; -import cn.iocoder.yudao.framework.redis.core.RedisKeyRegistry; -import cn.iocoder.yudao.module.infra.controller.admin.redis.vo.RedisKeyDefineRespVO; -import cn.iocoder.yudao.module.infra.controller.admin.redis.vo.RedisKeyValueRespVO; -import cn.iocoder.yudao.module.infra.controller.admin.redis.vo.RedisMonitorRespVO; -import cn.iocoder.yudao.module.infra.convert.redis.RedisConvert; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.redis.core.RedisKeyDefine; +import cn.fuxiaoaio.ygg.framework.redis.core.RedisKeyRegistry; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.redis.vo.RedisKeyDefineRespVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.redis.vo.RedisKeyValueRespVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.redis.vo.RedisMonitorRespVO; +import cn.fuxiaoaio.ygg.module.infra.convert.redis.RedisConvert; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -26,7 +26,7 @@ import java.util.List; import java.util.Properties; import java.util.Set; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - Redis 监控") @RestController diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/vo/RedisKeyDefineRespVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/redis/vo/RedisKeyDefineRespVO.java similarity index 89% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/vo/RedisKeyDefineRespVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/redis/vo/RedisKeyDefineRespVO.java index 82e88d740..7bec5d517 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/vo/RedisKeyDefineRespVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/redis/vo/RedisKeyDefineRespVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.infra.controller.admin.redis.vo; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.redis.vo; -import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine; +import cn.fuxiaoaio.ygg.framework.redis.core.RedisKeyDefine; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/vo/RedisKeyRespVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/redis/vo/RedisKeyRespVO.java similarity index 89% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/vo/RedisKeyRespVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/redis/vo/RedisKeyRespVO.java index bcb5b820f..c79395115 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/vo/RedisKeyRespVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/redis/vo/RedisKeyRespVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.infra.controller.admin.redis.vo; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.redis.vo; -import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine; +import cn.fuxiaoaio.ygg.framework.redis.core.RedisKeyDefine; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/vo/RedisKeyValueRespVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/redis/vo/RedisKeyValueRespVO.java similarity index 88% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/vo/RedisKeyValueRespVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/redis/vo/RedisKeyValueRespVO.java index 52075abc1..b16d1142a 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/vo/RedisKeyValueRespVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/redis/vo/RedisKeyValueRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.redis.vo; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.redis.vo; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/vo/RedisMonitorRespVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/redis/vo/RedisMonitorRespVO.java similarity index 94% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/vo/RedisMonitorRespVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/redis/vo/RedisMonitorRespVO.java index 51a91b23f..759a0d39d 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/redis/vo/RedisMonitorRespVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/redis/vo/RedisMonitorRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.redis.vo; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.redis.vo; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/TestDemoController.http b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/test/TestDemoController.http similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/TestDemoController.http rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/test/TestDemoController.http diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/TestDemoController.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/test/TestDemoController.java old mode 100755 new mode 100644 similarity index 84% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/TestDemoController.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/test/TestDemoController.java index 8bf3dd3f2..96f18edfc --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/TestDemoController.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/test/TestDemoController.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.module.infra.controller.admin.test; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.test; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import cn.iocoder.yudao.module.infra.controller.admin.test.vo.*; -import cn.iocoder.yudao.module.infra.convert.test.TestDemoConvert; -import cn.iocoder.yudao.module.infra.dal.dataobject.test.TestDemoDO; -import cn.iocoder.yudao.module.infra.service.test.TestDemoService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.excel.core.util.ExcelUtils; +import cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.test.vo.*; +import cn.fuxiaoaio.ygg.module.infra.convert.test.TestDemoConvert; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.test.TestDemoDO; +import cn.fuxiaoaio.ygg.module.infra.service.test.TestDemoService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -22,8 +22,8 @@ import java.io.IOException; import java.util.Collection; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 字典类型") @RestController diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoBaseVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/test/vo/TestDemoBaseVO.java old mode 100755 new mode 100644 similarity index 93% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoBaseVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/test/vo/TestDemoBaseVO.java index fcc5c0761..d523a8084 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoBaseVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/test/vo/TestDemoBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.test.vo; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.test.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoCreateReqVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/test/vo/TestDemoCreateReqVO.java old mode 100755 new mode 100644 similarity index 80% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoCreateReqVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/test/vo/TestDemoCreateReqVO.java index 2f84f6376..5d756bd0c --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoCreateReqVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/test/vo/TestDemoCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.test.vo; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.test.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoExcelVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/test/vo/TestDemoExcelVO.java old mode 100755 new mode 100644 similarity index 90% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoExcelVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/test/vo/TestDemoExcelVO.java index be94c31d7..d90f9e2ab --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoExcelVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/test/vo/TestDemoExcelVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.test.vo; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.test.vo; import lombok.*; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoExportReqVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/test/vo/TestDemoExportReqVO.java old mode 100755 new mode 100644 similarity index 87% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoExportReqVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/test/vo/TestDemoExportReqVO.java index 115d92aef..bf121bbd4 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoExportReqVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/test/vo/TestDemoExportReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.test.vo; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.test.vo; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 字典类型 Excel 导出 Request VO,参数和 TestDemoPageReqVO 是一致的") @Data diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoPageReqVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/test/vo/TestDemoPageReqVO.java old mode 100755 new mode 100644 similarity index 84% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoPageReqVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/test/vo/TestDemoPageReqVO.java index 88040176f..0344eb1bc --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoPageReqVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/test/vo/TestDemoPageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.infra.controller.admin.test.vo; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.test.vo; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 字典类型分页 Request VO") @Data diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoRespVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/test/vo/TestDemoRespVO.java old mode 100755 new mode 100644 similarity index 89% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoRespVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/test/vo/TestDemoRespVO.java index a76fdb425..d2b4d5745 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoRespVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/test/vo/TestDemoRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.test.vo; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.test.vo; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoUpdateReqVO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/test/vo/TestDemoUpdateReqVO.java old mode 100755 new mode 100644 similarity index 86% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoUpdateReqVO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/test/vo/TestDemoUpdateReqVO.java index 12765e561..147fdad54 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoUpdateReqVO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/admin/test/vo/TestDemoUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.test.vo; +package cn.fuxiaoaio.ygg.module.infra.controller.admin.test.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/app/package-info.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/app/package-info.java new file mode 100644 index 000000000..462956efb --- /dev/null +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/app/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package cn.fuxiaoaio.ygg.module.infra.controller.app; diff --git a/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/package-info.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/package-info.java new file mode 100644 index 000000000..bbf54727c --- /dev/null +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/controller/package-info.java @@ -0,0 +1,6 @@ +/** + * 提供 RESTful API 给前端： + * 1. admin 包：提供给管理后台 fuxiaoaio-ui-admin 前端项目 + * 2. app 包：提供给用户 APP fuxiaoaio-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分 + */ +package cn.fuxiaoaio.ygg.module.infra.controller; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/codegen/CodegenConvert.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/codegen/CodegenConvert.java similarity index 83% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/codegen/CodegenConvert.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/codegen/CodegenConvert.java index 1d286c52f..d4d5f4233 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/codegen/CodegenConvert.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/codegen/CodegenConvert.java @@ -1,14 +1,14 @@ -package cn.iocoder.yudao.module.infra.convert.codegen; +package cn.fuxiaoaio.ygg.module.infra.convert.codegen; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.CodegenDetailRespVO; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.CodegenPreviewRespVO; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.CodegenUpdateReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.column.CodegenColumnRespVO; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.table.CodegenTableRespVO; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.table.DatabaseTableRespVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenColumnDO; -import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenTableDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.CodegenDetailRespVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.CodegenPreviewRespVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.CodegenUpdateReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.column.CodegenColumnRespVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.table.CodegenTableRespVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.table.DatabaseTableRespVO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.codegen.CodegenColumnDO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.codegen.CodegenTableDO; import com.baomidou.mybatisplus.generator.config.po.TableField; import com.baomidou.mybatisplus.generator.config.po.TableInfo; import org.apache.ibatis.type.JdbcType; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/config/ConfigConvert.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/config/ConfigConvert.java similarity index 62% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/config/ConfigConvert.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/config/ConfigConvert.java index 94bcc0eae..2ec499acc 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/config/ConfigConvert.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/config/ConfigConvert.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.infra.convert.config; +package cn.fuxiaoaio.ygg.module.infra.convert.config; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigCreateReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigExcelVO; -import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigRespVO; -import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigUpdateReqVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.config.ConfigDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.config.vo.ConfigCreateReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.config.vo.ConfigExcelVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.config.vo.ConfigRespVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.config.vo.ConfigUpdateReqVO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.config.ConfigDO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/db/DataSourceConfigConvert.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/db/DataSourceConfigConvert.java old mode 100755 new mode 100644 similarity index 71% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/db/DataSourceConfigConvert.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/db/DataSourceConfigConvert.java index d81d85cee..fe805b934 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/db/DataSourceConfigConvert.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/db/DataSourceConfigConvert.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.module.infra.convert.db; +package cn.fuxiaoaio.ygg.module.infra.convert.db; import java.util.*; -import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import cn.iocoder.yudao.module.infra.controller.admin.db.vo.*; -import cn.iocoder.yudao.module.infra.dal.dataobject.db.DataSourceConfigDO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.db.vo.*; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.db.DataSourceConfigDO; /** * 数据源配置 Convert diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/file/FileConfigConvert.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/file/FileConfigConvert.java old mode 100755 new mode 100644 similarity index 68% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/file/FileConfigConvert.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/file/FileConfigConvert.java index 442368302..4aae846d2 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/file/FileConfigConvert.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/file/FileConfigConvert.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.infra.convert.file; +package cn.fuxiaoaio.ygg.module.infra.convert.file; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.infra.controller.admin.file.vo.config.FileConfigCreateReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.file.vo.config.FileConfigRespVO; -import cn.iocoder.yudao.module.infra.controller.admin.file.vo.config.FileConfigUpdateReqVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileConfigDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.config.FileConfigCreateReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.config.FileConfigRespVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.config.FileConfigUpdateReqVO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.file.FileConfigDO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/file/FileConvert.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/file/FileConvert.java similarity index 55% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/file/FileConvert.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/file/FileConvert.java index ee7e5186b..4dae796a0 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/file/FileConvert.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/file/FileConvert.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.infra.convert.file; +package cn.fuxiaoaio.ygg.module.infra.convert.file; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FileRespVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.file.FileRespVO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.file.FileDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/logger/ApiAccessLogConvert.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/logger/ApiAccessLogConvert.java similarity index 62% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/logger/ApiAccessLogConvert.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/logger/ApiAccessLogConvert.java index 03232bc75..db4efe465 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/logger/ApiAccessLogConvert.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/logger/ApiAccessLogConvert.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.infra.convert.logger; +package cn.fuxiaoaio.ygg.module.infra.convert.logger; -import cn.iocoder.yudao.framework.apilog.core.service.ApiAccessLog; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogExcelVO; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogRespVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiAccessLogDO; +import cn.fuxiaoaio.ygg.framework.apilog.core.service.ApiAccessLog; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogExcelVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogRespVO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.logger.ApiAccessLogDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/logger/ApiErrorLogConvert.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/logger/ApiErrorLogConvert.java similarity index 59% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/logger/ApiErrorLogConvert.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/logger/ApiErrorLogConvert.java index fb3a21d8c..0b56d7d8c 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/logger/ApiErrorLogConvert.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/logger/ApiErrorLogConvert.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.infra.convert.logger; +package cn.fuxiaoaio.ygg.module.infra.convert.logger; -import cn.iocoder.yudao.framework.apilog.core.service.ApiErrorLog; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogExcelVO; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogRespVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiErrorLogDO; +import cn.fuxiaoaio.ygg.framework.apilog.core.service.ApiErrorLog; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogExcelVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogRespVO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.logger.ApiErrorLogDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/package-info.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/package-info.java similarity index 62% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/package-info.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/package-info.java index 8e2759308..c1aa7f14d 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/package-info.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/package-info.java @@ -3,4 +3,4 @@ * * 目前使用 MapStruct 框架 */ -package cn.iocoder.yudao.module.infra.convert; +package cn.fuxiaoaio.ygg.module.infra.convert; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/redis/RedisConvert.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/redis/RedisConvert.java similarity index 82% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/redis/RedisConvert.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/redis/RedisConvert.java index 6a1ded7d2..d28c08dee 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/redis/RedisConvert.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/redis/RedisConvert.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.infra.convert.redis; +package cn.fuxiaoaio.ygg.module.infra.convert.redis; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine; -import cn.iocoder.yudao.module.infra.controller.admin.redis.vo.RedisKeyDefineRespVO; -import cn.iocoder.yudao.module.infra.controller.admin.redis.vo.RedisMonitorRespVO; +import cn.fuxiaoaio.ygg.framework.redis.core.RedisKeyDefine; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.redis.vo.RedisKeyDefineRespVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.redis.vo.RedisMonitorRespVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/test/TestDemoConvert.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/test/TestDemoConvert.java old mode 100755 new mode 100644 similarity index 61% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/test/TestDemoConvert.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/test/TestDemoConvert.java index 07a29f5a2..5e314d913 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/test/TestDemoConvert.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/test/TestDemoConvert.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.infra.convert.test; +package cn.fuxiaoaio.ygg.module.infra.convert.test; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.infra.controller.admin.test.vo.TestDemoCreateReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.test.vo.TestDemoExcelVO; -import cn.iocoder.yudao.module.infra.controller.admin.test.vo.TestDemoRespVO; -import cn.iocoder.yudao.module.infra.controller.admin.test.vo.TestDemoUpdateReqVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.test.TestDemoDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.test.vo.TestDemoCreateReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.test.vo.TestDemoExcelVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.test.vo.TestDemoRespVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.test.vo.TestDemoUpdateReqVO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.test.TestDemoDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md new file mode 100644 index 000000000..8c7cde516 --- /dev/null +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md @@ -0,0 +1 @@ + diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenColumnDO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/codegen/CodegenColumnDO.java similarity index 92% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenColumnDO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/codegen/CodegenColumnDO.java index 368162214..3d4f5416c 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenColumnDO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/codegen/CodegenColumnDO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.infra.dal.dataobject.codegen; +package cn.fuxiaoaio.ygg.module.infra.dal.dataobject.codegen; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.infra.enums.codegen.CodegenColumnHtmlTypeEnum; -import cn.iocoder.yudao.module.infra.enums.codegen.CodegenColumnListConditionEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.module.infra.enums.codegen.CodegenColumnHtmlTypeEnum; +import cn.fuxiaoaio.ygg.module.infra.enums.codegen.CodegenColumnListConditionEnum; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenTableDO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/codegen/CodegenTableDO.java similarity index 86% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenTableDO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/codegen/CodegenTableDO.java index fcad02354..c0b482484 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenTableDO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/codegen/CodegenTableDO.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.infra.dal.dataobject.codegen; +package cn.fuxiaoaio.ygg.module.infra.dal.dataobject.codegen; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.infra.dal.dataobject.db.DataSourceConfigDO; -import cn.iocoder.yudao.module.infra.enums.codegen.CodegenFrontTypeEnum; -import cn.iocoder.yudao.module.infra.enums.codegen.CodegenSceneEnum; -import cn.iocoder.yudao.module.infra.enums.codegen.CodegenTemplateTypeEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.db.DataSourceConfigDO; +import cn.fuxiaoaio.ygg.module.infra.enums.codegen.CodegenFrontTypeEnum; +import cn.fuxiaoaio.ygg.module.infra.enums.codegen.CodegenSceneEnum; +import cn.fuxiaoaio.ygg.module.infra.enums.codegen.CodegenTemplateTypeEnum; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/config/ConfigDO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/config/ConfigDO.java similarity index 87% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/config/ConfigDO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/config/ConfigDO.java index 03b677072..6cb04d3c9 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/config/ConfigDO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/config/ConfigDO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.infra.dal.dataobject.config; +package cn.fuxiaoaio.ygg.module.infra.dal.dataobject.config; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.infra.enums.config.ConfigTypeEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.module.infra.enums.config.ConfigTypeEnum; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/db/DataSourceConfigDO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/db/DataSourceConfigDO.java similarity index 84% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/db/DataSourceConfigDO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/db/DataSourceConfigDO.java index 138babe52..bf7b9bbea 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/db/DataSourceConfigDO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/db/DataSourceConfigDO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.infra.dal.dataobject.db; +package cn.fuxiaoaio.ygg.module.infra.dal.dataobject.db; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.framework.mybatis.core.type.EncryptTypeHandler; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.type.EncryptTypeHandler; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/file/FileConfigDO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/file/FileConfigDO.java old mode 100755 new mode 100644 similarity index 84% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/file/FileConfigDO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/file/FileConfigDO.java index c30a9d5c1..d35a15b40 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/file/FileConfigDO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/file/FileConfigDO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.infra.dal.dataobject.file; +package cn.fuxiaoaio.ygg.module.infra.dal.dataobject.file; -import cn.iocoder.yudao.framework.file.core.client.FileClientConfig; -import cn.iocoder.yudao.framework.file.core.enums.FileStorageEnum; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.file.core.client.FileClientConfig; +import cn.fuxiaoaio.ygg.framework.file.core.enums.FileStorageEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/file/FileContentDO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/file/FileContentDO.java similarity index 84% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/file/FileContentDO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/file/FileContentDO.java index e19a1ce9f..fb87df4b7 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/file/FileContentDO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/file/FileContentDO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.infra.dal.dataobject.file; +package cn.fuxiaoaio.ygg.module.infra.dal.dataobject.file; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; @@ -10,7 +10,7 @@ import lombok.*; /** * 文件内容表 * - * 专门用于存储 {@link cn.iocoder.yudao.framework.file.core.client.db.DBFileClient} 的文件内容 + * 专门用于存储 {@link cn.fuxiaoaio.ygg.framework.file.core.client.db.DBFileClient} 的文件内容 * * @author 芋道源码 */ diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/file/FileDO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/file/FileDO.java similarity index 90% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/file/FileDO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/file/FileDO.java index c0fb007e1..49a45989f 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/file/FileDO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/file/FileDO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.infra.dal.dataobject.file; +package cn.fuxiaoaio.ygg.module.infra.dal.dataobject.file; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/logger/ApiAccessLogDO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/logger/ApiAccessLogDO.java similarity index 89% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/logger/ApiAccessLogDO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/logger/ApiAccessLogDO.java index ab4292bf9..e9cb1fe0f 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/logger/ApiAccessLogDO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/logger/ApiAccessLogDO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.infra.dal.dataobject.logger; +package cn.fuxiaoaio.ygg.module.infra.dal.dataobject.logger; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/logger/ApiErrorLogDO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/logger/ApiErrorLogDO.java similarity index 91% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/logger/ApiErrorLogDO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/logger/ApiErrorLogDO.java index 7dc040981..e7d5d60b9 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/logger/ApiErrorLogDO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/logger/ApiErrorLogDO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.infra.dal.dataobject.logger; +package cn.fuxiaoaio.ygg.module.infra.dal.dataobject.logger; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.infra.enums.logger.ApiErrorLogProcessStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.module.infra.enums.logger.ApiErrorLogProcessStatusEnum; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -149,7 +149,7 @@ public class ApiErrorLogDO extends BaseDO { /** * 处理用户编号 * - * 关联 cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.user.SysUserDO.SysUserDO#getId() + * 关联 cn.fuxiaoaio.ygg.adminserver.modules.system.dal.dataobject.user.SysUserDO.SysUserDO#getId() */ private Long processUserId; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/test/TestDemoDO.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/test/TestDemoDO.java old mode 100755 new mode 100644 similarity index 88% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/test/TestDemoDO.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/test/TestDemoDO.java index da1f4cb53..f556f04c4 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/test/TestDemoDO.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/dataobject/test/TestDemoDO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.infra.dal.dataobject.test; +package cn.fuxiaoaio.ygg.module.infra.dal.dataobject.test; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/codegen/CodegenColumnMapper.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/codegen/CodegenColumnMapper.java similarity index 71% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/codegen/CodegenColumnMapper.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/codegen/CodegenColumnMapper.java index 3f1aedb97..c8ff89217 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/codegen/CodegenColumnMapper.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/codegen/CodegenColumnMapper.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.infra.dal.mysql.codegen; +package cn.fuxiaoaio.ygg.module.infra.dal.mysql.codegen; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenColumnDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.codegen.CodegenColumnDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/codegen/CodegenTableMapper.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/codegen/CodegenTableMapper.java similarity index 76% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/codegen/CodegenTableMapper.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/codegen/CodegenTableMapper.java index 006e24bd1..f6efd651d 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/codegen/CodegenTableMapper.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/codegen/CodegenTableMapper.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.infra.dal.mysql.codegen; +package cn.fuxiaoaio.ygg.module.infra.dal.mysql.codegen; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.table.CodegenTablePageReqVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenTableDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.table.CodegenTablePageReqVO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.codegen.CodegenTableDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/config/ConfigMapper.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/config/ConfigMapper.java similarity index 72% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/config/ConfigMapper.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/config/ConfigMapper.java index 49eea5517..e09185535 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/config/ConfigMapper.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/config/ConfigMapper.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.infra.dal.mysql.config; +package cn.fuxiaoaio.ygg.module.infra.dal.mysql.config; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigExportReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigPageReqVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.config.ConfigDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.config.vo.ConfigExportReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.config.vo.ConfigPageReqVO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.config.ConfigDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/db/DataSourceConfigMapper.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/db/DataSourceConfigMapper.java old mode 100755 new mode 100644 similarity index 54% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/db/DataSourceConfigMapper.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/db/DataSourceConfigMapper.java index 5ad8be428..6bcc164b0 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/db/DataSourceConfigMapper.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/db/DataSourceConfigMapper.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.infra.dal.mysql.db; +package cn.fuxiaoaio.ygg.module.infra.dal.mysql.db; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.infra.dal.dataobject.db.DataSourceConfigDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.db.DataSourceConfigDO; import org.apache.ibatis.annotations.Mapper; /** diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileConfigMapper.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/file/FileConfigMapper.java old mode 100755 new mode 100644 similarity index 62% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileConfigMapper.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/file/FileConfigMapper.java index a2bf16be4..c1edbaede --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileConfigMapper.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/file/FileConfigMapper.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.infra.dal.mysql.file; +package cn.fuxiaoaio.ygg.module.infra.dal.mysql.file; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.infra.controller.admin.file.vo.config.FileConfigPageReqVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileConfigDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.config.FileConfigPageReqVO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.file.FileConfigDO; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileContentDAOImpl.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/file/FileContentDAOImpl.java similarity index 89% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileContentDAOImpl.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/file/FileContentDAOImpl.java index 2492c803d..cb1ef8abb 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileContentDAOImpl.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/file/FileContentDAOImpl.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.infra.dal.mysql.file; +package cn.fuxiaoaio.ygg.module.infra.dal.mysql.file; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.yudao.framework.file.core.client.db.DBFileContentFrameworkDAO; -import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileContentDO; +import cn.fuxiaoaio.ygg.framework.file.core.client.db.DBFileContentFrameworkDAO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.file.FileContentDO; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.stereotype.Repository; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileContentMapper.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/file/FileContentMapper.java similarity index 61% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileContentMapper.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/file/FileContentMapper.java index 501979dbe..9994bd3ae 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileContentMapper.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/file/FileContentMapper.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.infra.dal.mysql.file; +package cn.fuxiaoaio.ygg.module.infra.dal.mysql.file; -import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileContentDO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.file.FileContentDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileMapper.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/file/FileMapper.java similarity index 62% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileMapper.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/file/FileMapper.java index 11233a457..ecff10f28 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileMapper.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/file/FileMapper.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.infra.dal.mysql.file; +package cn.fuxiaoaio.ygg.module.infra.dal.mysql.file; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FilePageReqVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.file.FilePageReqVO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.file.FileDO; import org.apache.ibatis.annotations.Mapper; /** diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/logger/ApiAccessLogMapper.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/logger/ApiAccessLogMapper.java similarity index 81% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/logger/ApiAccessLogMapper.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/logger/ApiAccessLogMapper.java index 427675636..4fd0136ac 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/logger/ApiAccessLogMapper.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/logger/ApiAccessLogMapper.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.infra.dal.mysql.logger; +package cn.fuxiaoaio.ygg.module.infra.dal.mysql.logger; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogExportReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogPageReqVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiAccessLogDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogExportReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogPageReqVO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.logger.ApiAccessLogDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/logger/ApiErrorLogMapper.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/logger/ApiErrorLogMapper.java similarity index 80% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/logger/ApiErrorLogMapper.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/logger/ApiErrorLogMapper.java index e9748b624..0af68c5c8 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/logger/ApiErrorLogMapper.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/logger/ApiErrorLogMapper.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.infra.dal.mysql.logger; +package cn.fuxiaoaio.ygg.module.infra.dal.mysql.logger; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogExportReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogPageReqVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiErrorLogDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogExportReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogPageReqVO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.logger.ApiErrorLogDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/test/TestDemoMapper.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/test/TestDemoMapper.java old mode 100755 new mode 100644 similarity index 78% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/test/TestDemoMapper.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/test/TestDemoMapper.java index d600b3f4b..0607a1e2a --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/test/TestDemoMapper.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/dal/mysql/test/TestDemoMapper.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.infra.dal.mysql.test; +package cn.fuxiaoaio.ygg.module.infra.dal.mysql.test; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.infra.controller.admin.test.vo.TestDemoExportReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.test.vo.TestDemoPageReqVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.test.TestDemoDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.test.vo.TestDemoExportReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.test.vo.TestDemoPageReqVO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.test.TestDemoDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenColumnHtmlTypeEnum.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/codegen/CodegenColumnHtmlTypeEnum.java similarity index 92% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenColumnHtmlTypeEnum.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/codegen/CodegenColumnHtmlTypeEnum.java index 5474ba1a8..a2505ad4a 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenColumnHtmlTypeEnum.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/codegen/CodegenColumnHtmlTypeEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.enums.codegen; +package cn.fuxiaoaio.ygg.module.infra.enums.codegen; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenColumnListConditionEnum.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/codegen/CodegenColumnListConditionEnum.java similarity index 87% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenColumnListConditionEnum.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/codegen/CodegenColumnListConditionEnum.java index 709870098..93a1d986d 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenColumnListConditionEnum.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/codegen/CodegenColumnListConditionEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.enums.codegen; +package cn.fuxiaoaio.ygg.module.infra.enums.codegen; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenFrontTypeEnum.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/codegen/CodegenFrontTypeEnum.java similarity index 89% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenFrontTypeEnum.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/codegen/CodegenFrontTypeEnum.java index b7d2403dc..c8b1254e9 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenFrontTypeEnum.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/codegen/CodegenFrontTypeEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.enums.codegen; +package cn.fuxiaoaio.ygg.module.infra.enums.codegen; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenSceneEnum.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/codegen/CodegenSceneEnum.java similarity index 93% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenSceneEnum.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/codegen/CodegenSceneEnum.java index f1fdea0c0..9f8ab09ed 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenSceneEnum.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/codegen/CodegenSceneEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.enums.codegen; +package cn.fuxiaoaio.ygg.module.infra.enums.codegen; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenTemplateTypeEnum.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/codegen/CodegenTemplateTypeEnum.java similarity index 86% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenTemplateTypeEnum.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/codegen/CodegenTemplateTypeEnum.java index ce2799e34..50c7b7c92 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenTemplateTypeEnum.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/codegen/CodegenTemplateTypeEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.enums.codegen; +package cn.fuxiaoaio.ygg.module.infra.enums.codegen; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/config/ConfigTypeEnum.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/config/ConfigTypeEnum.java similarity index 83% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/config/ConfigTypeEnum.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/config/ConfigTypeEnum.java index 15c20152f..cdd682d6e 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/config/ConfigTypeEnum.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/config/ConfigTypeEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.enums.config; +package cn.fuxiaoaio.ygg.module.infra.enums.config; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/logger/ApiErrorLogProcessStatusEnum.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/logger/ApiErrorLogProcessStatusEnum.java similarity index 88% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/logger/ApiErrorLogProcessStatusEnum.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/logger/ApiErrorLogProcessStatusEnum.java index b3097534c..7e0ec58f7 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/logger/ApiErrorLogProcessStatusEnum.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/logger/ApiErrorLogProcessStatusEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.enums.logger; +package cn.fuxiaoaio.ygg.module.infra.enums.logger; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/package-info.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/package-info.java new file mode 100644 index 000000000..a780c9446 --- /dev/null +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/enums/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package cn.fuxiaoaio.ygg.module.infra.enums; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/codegen/config/CodegenConfiguration.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/codegen/config/CodegenConfiguration.java similarity index 81% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/codegen/config/CodegenConfiguration.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/codegen/config/CodegenConfiguration.java index d49723d5c..99ba77aff 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/codegen/config/CodegenConfiguration.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/codegen/config/CodegenConfiguration.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.framework.codegen.config; +package cn.fuxiaoaio.ygg.module.infra.framework.codegen.config; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/codegen/config/CodegenProperties.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/codegen/config/CodegenProperties.java similarity index 82% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/codegen/config/CodegenProperties.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/codegen/config/CodegenProperties.java index 4039a70d6..40129998d 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/codegen/config/CodegenProperties.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/codegen/config/CodegenProperties.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.infra.framework.codegen.config; +package cn.fuxiaoaio.ygg.module.infra.framework.codegen.config; -import cn.iocoder.yudao.module.infra.enums.codegen.CodegenFrontTypeEnum; +import cn.fuxiaoaio.ygg.module.infra.enums.codegen.CodegenFrontTypeEnum; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.validation.annotation.Validated; @@ -9,7 +9,7 @@ import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.util.Collection; -@ConfigurationProperties(prefix = "yudao.codegen") +@ConfigurationProperties(prefix = "fuxiaoaio.codegen") @Validated @Data public class CodegenProperties { diff --git a/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/codegen/package-info.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/codegen/package-info.java new file mode 100644 index 000000000..cb1ff52de --- /dev/null +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/codegen/package-info.java @@ -0,0 +1,4 @@ +/** + * 代码生成器 + */ +package cn.fuxiaoaio.ygg.module.infra.framework.codegen; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/monitor/config/AdminServerConfiguration.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/monitor/config/AdminServerConfiguration.java similarity index 78% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/monitor/config/AdminServerConfiguration.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/monitor/config/AdminServerConfiguration.java index 0c29865c3..fd147f1d3 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/monitor/config/AdminServerConfiguration.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/monitor/config/AdminServerConfiguration.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.framework.monitor.config; +package cn.fuxiaoaio.ygg.module.infra.framework.monitor.config; import de.codecentric.boot.admin.server.config.EnableAdminServer; import org.springframework.context.annotation.Configuration; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/monitor/package-info.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/monitor/package-info.java similarity index 52% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/monitor/package-info.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/monitor/package-info.java index f52e72c76..677379dcf 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/monitor/package-info.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/monitor/package-info.java @@ -1,4 +1,4 @@ /** * 使用 Spring Boot Admin 实现简单的监控平台 */ -package cn.iocoder.yudao.module.infra.framework.monitor; +package cn.fuxiaoaio.ygg.module.infra.framework.monitor; diff --git a/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md new file mode 100644 index 000000000..9d993e3c5 --- /dev/null +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md @@ -0,0 +1 @@ + diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/package-info.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/package-info.java similarity index 61% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/package-info.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/package-info.java index 77a646af8..d257777e4 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/package-info.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/package-info.java @@ -3,4 +3,4 @@ * * @author 芋道源码 */ -package cn.iocoder.yudao.module.infra.framework; +package cn.fuxiaoaio.ygg.module.infra.framework; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/rpc/config/RpcConfiguration.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/rpc/config/RpcConfiguration.java similarity index 67% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/rpc/config/RpcConfiguration.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/rpc/config/RpcConfiguration.java index f0ac5a6cc..d80f21601 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/rpc/config/RpcConfiguration.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/rpc/config/RpcConfiguration.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.infra.framework.rpc.config; +package cn.fuxiaoaio.ygg.module.infra.framework.rpc.config; -import cn.iocoder.yudao.module.system.api.user.AdminUserApi; +import cn.fuxiaoaio.ygg.module.system.api.user.AdminUserApi; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Configuration; diff --git a/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/rpc/package-info.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/rpc/package-info.java new file mode 100644 index 000000000..1a5bb2c59 --- /dev/null +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/rpc/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package cn.fuxiaoaio.ygg.module.infra.framework.rpc; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/security/config/SecurityConfiguration.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/security/config/SecurityConfiguration.java similarity index 91% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/security/config/SecurityConfiguration.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/security/config/SecurityConfiguration.java index c5b947e11..3bfbc15a6 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/security/config/SecurityConfiguration.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/security/config/SecurityConfiguration.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.infra.framework.security.config; +package cn.fuxiaoaio.ygg.module.infra.framework.security.config; -import cn.iocoder.yudao.framework.security.config.AuthorizeRequestsCustomizer; -import cn.iocoder.yudao.module.infra.enums.ApiConstants; +import cn.fuxiaoaio.ygg.framework.security.config.AuthorizeRequestsCustomizer; +import cn.fuxiaoaio.ygg.module.infra.enums.ApiConstants; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/security/core/package-info.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/security/core/package-info.java new file mode 100644 index 000000000..1e7a5f78e --- /dev/null +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/framework/security/core/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package cn.fuxiaoaio.ygg.module.infra.framework.security.core; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/mq/consumer/file/FileConfigRefreshConsumer.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/mq/consumer/file/FileConfigRefreshConsumer.java similarity index 76% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/mq/consumer/file/FileConfigRefreshConsumer.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/mq/consumer/file/FileConfigRefreshConsumer.java index 415373064..cd50a4218 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/mq/consumer/file/FileConfigRefreshConsumer.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/mq/consumer/file/FileConfigRefreshConsumer.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.infra.mq.consumer.file; +package cn.fuxiaoaio.ygg.module.infra.mq.consumer.file; -import cn.iocoder.yudao.module.infra.mq.message.file.FileConfigRefreshMessage; -import cn.iocoder.yudao.module.infra.service.file.FileConfigService; +import cn.fuxiaoaio.ygg.module.infra.mq.message.file.FileConfigRefreshMessage; +import cn.fuxiaoaio.ygg.module.infra.service.file.FileConfigService; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/mq/message/file/FileConfigRefreshMessage.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/mq/message/file/FileConfigRefreshMessage.java similarity index 89% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/mq/message/file/FileConfigRefreshMessage.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/mq/message/file/FileConfigRefreshMessage.java index db45856a3..abe25ffb7 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/mq/message/file/FileConfigRefreshMessage.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/mq/message/file/FileConfigRefreshMessage.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.mq.message.file; +package cn.fuxiaoaio.ygg.module.infra.mq.message.file; import lombok.Data; import org.springframework.cloud.bus.event.RemoteApplicationEvent; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/mq/producer/file/FileConfigProducer.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/mq/producer/file/FileConfigProducer.java similarity index 69% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/mq/producer/file/FileConfigProducer.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/mq/producer/file/FileConfigProducer.java index b06ab2d5c..a438c3eba 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/mq/producer/file/FileConfigProducer.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/mq/producer/file/FileConfigProducer.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.infra.mq.producer.file; +package cn.fuxiaoaio.ygg.module.infra.mq.producer.file; -import cn.iocoder.yudao.framework.mq.core.bus.AbstractBusProducer; -import cn.iocoder.yudao.module.infra.mq.message.file.FileConfigRefreshMessage; +import cn.fuxiaoaio.ygg.framework.mq.core.bus.AbstractBusProducer; +import cn.fuxiaoaio.ygg.module.infra.mq.message.file.FileConfigRefreshMessage; import org.springframework.stereotype.Component; /** diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/package-info.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/package-info.java similarity index 92% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/package-info.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/package-info.java index b45e7a209..2b9e762f3 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/package-info.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/package-info.java @@ -6,4 +6,4 @@ * 1. Controller URL：以 /infra/ 开头，避免和其它 Module 冲突 * 2. DataObject 表名：以 infra_ 开头，方便在数据库中区分 */ -package cn.iocoder.yudao.module.infra; +package cn.fuxiaoaio.ygg.module.infra; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenService.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/codegen/CodegenService.java similarity index 81% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenService.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/codegen/CodegenService.java index d4d266a72..60ac50657 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenService.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/codegen/CodegenService.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.infra.service.codegen; +package cn.fuxiaoaio.ygg.module.infra.service.codegen; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.CodegenCreateListReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.CodegenUpdateReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.table.CodegenTablePageReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.table.DatabaseTableRespVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenColumnDO; -import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenTableDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.CodegenCreateListReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.CodegenUpdateReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.table.CodegenTablePageReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.table.DatabaseTableRespVO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.codegen.CodegenColumnDO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.codegen.CodegenTableDO; import java.util.List; import java.util.Map; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImpl.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/codegen/CodegenServiceImpl.java similarity index 89% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImpl.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/codegen/CodegenServiceImpl.java index 029fe4162..a9bd1de47 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImpl.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/codegen/CodegenServiceImpl.java @@ -1,24 +1,24 @@ -package cn.iocoder.yudao.module.infra.service.codegen; +package cn.fuxiaoaio.ygg.module.infra.service.codegen; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.CodegenCreateListReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.CodegenUpdateReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.table.CodegenTablePageReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.table.DatabaseTableRespVO; -import cn.iocoder.yudao.module.infra.convert.codegen.CodegenConvert; -import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenColumnDO; -import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenTableDO; -import cn.iocoder.yudao.module.infra.dal.mysql.codegen.CodegenColumnMapper; -import cn.iocoder.yudao.module.infra.dal.mysql.codegen.CodegenTableMapper; -import cn.iocoder.yudao.module.infra.enums.codegen.CodegenSceneEnum; -import cn.iocoder.yudao.module.infra.framework.codegen.config.CodegenProperties; -import cn.iocoder.yudao.module.infra.service.codegen.inner.CodegenBuilder; -import cn.iocoder.yudao.module.infra.service.codegen.inner.CodegenEngine; -import cn.iocoder.yudao.module.infra.service.db.DatabaseTableService; -import cn.iocoder.yudao.module.system.api.user.AdminUserApi; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.CodegenCreateListReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.CodegenUpdateReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.table.CodegenTablePageReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.codegen.vo.table.DatabaseTableRespVO; +import cn.fuxiaoaio.ygg.module.infra.convert.codegen.CodegenConvert; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.codegen.CodegenColumnDO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.codegen.CodegenTableDO; +import cn.fuxiaoaio.ygg.module.infra.dal.mysql.codegen.CodegenColumnMapper; +import cn.fuxiaoaio.ygg.module.infra.dal.mysql.codegen.CodegenTableMapper; +import cn.fuxiaoaio.ygg.module.infra.enums.codegen.CodegenSceneEnum; +import cn.fuxiaoaio.ygg.module.infra.framework.codegen.config.CodegenProperties; +import cn.fuxiaoaio.ygg.module.infra.service.codegen.inner.CodegenBuilder; +import cn.fuxiaoaio.ygg.module.infra.service.codegen.inner.CodegenEngine; +import cn.fuxiaoaio.ygg.module.infra.service.db.DatabaseTableService; +import cn.fuxiaoaio.ygg.module.system.api.user.AdminUserApi; import com.baomidou.mybatisplus.generator.config.po.TableField; import com.baomidou.mybatisplus.generator.config.po.TableInfo; import org.springframework.stereotype.Service; @@ -32,8 +32,8 @@ import java.util.Set; import java.util.function.BiPredicate; import java.util.stream.Collectors; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.module.infra.enums.ErrorCodeConstants.*; /** * 代码生成 Service 实现类 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenBuilder.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/codegen/inner/CodegenBuilder.java similarity index 93% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenBuilder.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/codegen/inner/CodegenBuilder.java index 90f5816f3..3b197adc6 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenBuilder.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/codegen/inner/CodegenBuilder.java @@ -1,15 +1,15 @@ -package cn.iocoder.yudao.module.infra.service.codegen.inner; +package cn.fuxiaoaio.ygg.module.infra.service.codegen.inner; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.infra.convert.codegen.CodegenConvert; -import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenColumnDO; -import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenTableDO; -import cn.iocoder.yudao.module.infra.enums.codegen.CodegenColumnHtmlTypeEnum; -import cn.iocoder.yudao.module.infra.enums.codegen.CodegenColumnListConditionEnum; -import cn.iocoder.yudao.module.infra.enums.codegen.CodegenTemplateTypeEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.module.infra.convert.codegen.CodegenConvert; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.codegen.CodegenColumnDO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.codegen.CodegenTableDO; +import cn.fuxiaoaio.ygg.module.infra.enums.codegen.CodegenColumnHtmlTypeEnum; +import cn.fuxiaoaio.ygg.module.infra.enums.codegen.CodegenColumnListConditionEnum; +import cn.fuxiaoaio.ygg.module.infra.enums.codegen.CodegenTemplateTypeEnum; import com.baomidou.mybatisplus.generator.config.po.TableField; import com.baomidou.mybatisplus.generator.config.po.TableInfo; import com.google.common.collect.Sets; @@ -61,7 +61,7 @@ public class CodegenBuilder { */ public static final String TENANT_ID_FIELD = "tenantId"; /** - * {@link cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO} 的字段 + * {@link cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO} 的字段 */ public static final Set BASE_DO_FIELDS = new HashSet<>(); /** diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/codegen/inner/CodegenEngine.java similarity index 88% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/codegen/inner/CodegenEngine.java index 42f14a4ae..0432d2ba1 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/codegen/inner/CodegenEngine.java @@ -1,31 +1,31 @@ -package cn.iocoder.yudao.module.infra.service.codegen.inner; +package cn.fuxiaoaio.ygg.module.infra.service.codegen.inner; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.template.TemplateConfig; import cn.hutool.extra.template.TemplateEngine; import cn.hutool.extra.template.engine.velocity.VelocityEngine; -import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils; -import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum; -import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenColumnDO; -import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenTableDO; -import cn.iocoder.yudao.module.infra.enums.codegen.CodegenFrontTypeEnum; -import cn.iocoder.yudao.module.infra.enums.codegen.CodegenSceneEnum; -import cn.iocoder.yudao.module.infra.framework.codegen.config.CodegenProperties; +import cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils; +import cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils; +import cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils; +import cn.fuxiaoaio.ygg.framework.excel.core.annotations.DictFormat; +import cn.fuxiaoaio.ygg.framework.excel.core.convert.DictConvert; +import cn.fuxiaoaio.ygg.framework.excel.core.util.ExcelUtils; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog; +import cn.fuxiaoaio.ygg.framework.operatelog.core.enums.OperateTypeEnum; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.codegen.CodegenColumnDO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.codegen.CodegenTableDO; +import cn.fuxiaoaio.ygg.module.infra.enums.codegen.CodegenFrontTypeEnum; +import cn.fuxiaoaio.ygg.module.infra.enums.codegen.CodegenSceneEnum; +import cn.fuxiaoaio.ygg.module.infra.framework.codegen.config.CodegenProperties; import com.google.common.collect.ImmutableTable; import com.google.common.collect.Maps; import com.google.common.collect.Table; @@ -260,14 +260,14 @@ public class CodegenEngine { } private static String javaModuleFilePath(String path, String module, String src) { - return "yudao-module-${table.moduleName}/" + // 顶级模块 - "yudao-module-${table.moduleName}-" + module + "/" + // 子模块 + return "fuxiaoaio-module-${table.moduleName}/" + // 顶级模块 + "fuxiaoaio-module-${table.moduleName}-" + module + "/" + // 子模块 "src/" + src + "/java/${basePackage}/module/${table.moduleName}/" + path + ".java"; } private static String mapperXmlFilePath() { - return "yudao-module-${table.moduleName}/" + // 顶级模块 - "yudao-module-${table.moduleName}-biz/" + // 子模块 + return "fuxiaoaio-module-${table.moduleName}/" + // 顶级模块 + "fuxiaoaio-module-${table.moduleName}-biz/" + // 子模块 "src/main/resources/mapper/${table.businessName}/${table.className}Mapper.xml"; } @@ -276,7 +276,7 @@ public class CodegenEngine { } private static String vueFilePath(String path) { - return "yudao-ui-${sceneEnum.basePackage}/" + // 顶级目录 + return "fuxiaoaio-ui-${sceneEnum.basePackage}/" + // 顶级目录 "src/" + path; } @@ -285,7 +285,7 @@ public class CodegenEngine { } private static String vue3FilePath(String path) { - return "yudao-ui-${sceneEnum.basePackage}-vue3/" + // 顶级目录 + return "fuxiaoaio-ui-${sceneEnum.basePackage}-vue3/" + // 顶级目录 "src/" + path; } diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/config/ConfigService.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/config/ConfigService.java similarity index 75% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/config/ConfigService.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/config/ConfigService.java index abd82e54a..f599bc10e 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/config/ConfigService.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/config/ConfigService.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.infra.service.config; +package cn.fuxiaoaio.ygg.module.infra.service.config; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigCreateReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigExportReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigPageReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigUpdateReqVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.config.ConfigDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.config.vo.ConfigCreateReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.config.vo.ConfigExportReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.config.vo.ConfigPageReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.config.vo.ConfigUpdateReqVO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.config.ConfigDO; import javax.validation.Valid; import java.util.List; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/config/ConfigServiceImpl.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/config/ConfigServiceImpl.java similarity index 81% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/config/ConfigServiceImpl.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/config/ConfigServiceImpl.java index 51c912be7..832e4bff4 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/config/ConfigServiceImpl.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/config/ConfigServiceImpl.java @@ -1,15 +1,15 @@ -package cn.iocoder.yudao.module.infra.service.config; +package cn.fuxiaoaio.ygg.module.infra.service.config; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigCreateReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigExportReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigPageReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigUpdateReqVO; -import cn.iocoder.yudao.module.infra.convert.config.ConfigConvert; -import cn.iocoder.yudao.module.infra.dal.dataobject.config.ConfigDO; -import cn.iocoder.yudao.module.infra.dal.mysql.config.ConfigMapper; -import cn.iocoder.yudao.module.infra.enums.config.ConfigTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.config.vo.ConfigCreateReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.config.vo.ConfigExportReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.config.vo.ConfigPageReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.config.vo.ConfigUpdateReqVO; +import cn.fuxiaoaio.ygg.module.infra.convert.config.ConfigConvert; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.config.ConfigDO; +import cn.fuxiaoaio.ygg.module.infra.dal.mysql.config.ConfigMapper; +import cn.fuxiaoaio.ygg.module.infra.enums.config.ConfigTypeEnum; import com.google.common.annotations.VisibleForTesting; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -18,8 +18,8 @@ import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import java.util.List; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.module.infra.enums.ErrorCodeConstants.*; /** * 参数配置 Service 实现类 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigService.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/db/DataSourceConfigService.java old mode 100755 new mode 100644 similarity index 81% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigService.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/db/DataSourceConfigService.java index 002d00944..e1d9f4783 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigService.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/db/DataSourceConfigService.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.infra.service.db; +package cn.fuxiaoaio.ygg.module.infra.service.db; -import cn.iocoder.yudao.module.infra.controller.admin.db.vo.DataSourceConfigCreateReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.db.vo.DataSourceConfigUpdateReqVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.db.DataSourceConfigDO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.db.vo.DataSourceConfigCreateReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.db.vo.DataSourceConfigUpdateReqVO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.db.DataSourceConfigDO; import javax.validation.Valid; import java.util.List; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImpl.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/db/DataSourceConfigServiceImpl.java old mode 100755 new mode 100644 similarity index 84% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImpl.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/db/DataSourceConfigServiceImpl.java index e4365c205..60ec7b780 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImpl.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/db/DataSourceConfigServiceImpl.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.infra.service.db; +package cn.fuxiaoaio.ygg.module.infra.service.db; -import cn.iocoder.yudao.framework.mybatis.core.util.JdbcUtils; -import cn.iocoder.yudao.module.infra.controller.admin.db.vo.DataSourceConfigCreateReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.db.vo.DataSourceConfigUpdateReqVO; -import cn.iocoder.yudao.module.infra.convert.db.DataSourceConfigConvert; -import cn.iocoder.yudao.module.infra.dal.dataobject.db.DataSourceConfigDO; -import cn.iocoder.yudao.module.infra.dal.mysql.db.DataSourceConfigMapper; +import cn.fuxiaoaio.ygg.framework.mybatis.core.util.JdbcUtils; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.db.vo.DataSourceConfigCreateReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.db.vo.DataSourceConfigUpdateReqVO; +import cn.fuxiaoaio.ygg.module.infra.convert.db.DataSourceConfigConvert; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.db.DataSourceConfigDO; +import cn.fuxiaoaio.ygg.module.infra.dal.mysql.db.DataSourceConfigMapper; import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty; import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties; import org.springframework.stereotype.Service; @@ -15,9 +15,9 @@ import javax.annotation.Resource; import java.util.List; import java.util.Objects; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.DATA_SOURCE_CONFIG_NOT_EXISTS; -import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.DATA_SOURCE_CONFIG_NOT_OK; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.module.infra.enums.ErrorCodeConstants.DATA_SOURCE_CONFIG_NOT_EXISTS; +import static cn.fuxiaoaio.ygg.module.infra.enums.ErrorCodeConstants.DATA_SOURCE_CONFIG_NOT_OK; /** * 数据源配置 Service 实现类 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableService.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/db/DatabaseTableService.java similarity index 94% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableService.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/db/DatabaseTableService.java index 9fd2ee9d6..2deb2e0aa 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableService.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/db/DatabaseTableService.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.service.db; +package cn.fuxiaoaio.ygg.module.infra.service.db; import com.baomidou.mybatisplus.generator.config.po.TableInfo; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/db/DatabaseTableServiceImpl.java similarity index 96% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/db/DatabaseTableServiceImpl.java index 0d9b4f130..630b8e654 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/db/DatabaseTableServiceImpl.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.infra.service.db; +package cn.fuxiaoaio.ygg.module.infra.service.db; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.module.infra.dal.dataobject.db.DataSourceConfigDO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.db.DataSourceConfigDO; import com.baomidou.mybatisplus.generator.config.DataSourceConfig; import com.baomidou.mybatisplus.generator.config.GlobalConfig; import com.baomidou.mybatisplus.generator.config.StrategyConfig; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigService.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/file/FileConfigService.java old mode 100755 new mode 100644 similarity index 79% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigService.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/file/FileConfigService.java index 43ab5bc68..8cb01eed3 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigService.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/file/FileConfigService.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.infra.service.file; +package cn.fuxiaoaio.ygg.module.infra.service.file; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.file.core.client.FileClient; -import cn.iocoder.yudao.module.infra.controller.admin.file.vo.config.FileConfigCreateReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.file.vo.config.FileConfigPageReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.file.vo.config.FileConfigUpdateReqVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileConfigDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.file.core.client.FileClient; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.config.FileConfigCreateReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.config.FileConfigPageReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.config.FileConfigUpdateReqVO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.file.FileConfigDO; import javax.validation.Valid; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImpl.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/file/FileConfigServiceImpl.java old mode 100755 new mode 100644 similarity index 83% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImpl.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/file/FileConfigServiceImpl.java index 6236df6ff..45a59535a --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImpl.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/file/FileConfigServiceImpl.java @@ -1,21 +1,21 @@ -package cn.iocoder.yudao.module.infra.service.file; +package cn.fuxiaoaio.ygg.module.infra.service.file; import cn.hutool.core.io.resource.ResourceUtil; import cn.hutool.core.util.IdUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; -import cn.iocoder.yudao.framework.common.util.validation.ValidationUtils; -import cn.iocoder.yudao.framework.file.core.client.FileClient; -import cn.iocoder.yudao.framework.file.core.client.FileClientConfig; -import cn.iocoder.yudao.framework.file.core.client.FileClientFactory; -import cn.iocoder.yudao.framework.file.core.enums.FileStorageEnum; -import cn.iocoder.yudao.module.infra.controller.admin.file.vo.config.FileConfigCreateReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.file.vo.config.FileConfigPageReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.file.vo.config.FileConfigUpdateReqVO; -import cn.iocoder.yudao.module.infra.convert.file.FileConfigConvert; -import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileConfigDO; -import cn.iocoder.yudao.module.infra.dal.mysql.file.FileConfigMapper; -import cn.iocoder.yudao.module.infra.mq.producer.file.FileConfigProducer; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.framework.common.util.validation.ValidationUtils; +import cn.fuxiaoaio.ygg.framework.file.core.client.FileClient; +import cn.fuxiaoaio.ygg.framework.file.core.client.FileClientConfig; +import cn.fuxiaoaio.ygg.framework.file.core.client.FileClientFactory; +import cn.fuxiaoaio.ygg.framework.file.core.enums.FileStorageEnum; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.config.FileConfigCreateReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.config.FileConfigPageReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.config.FileConfigUpdateReqVO; +import cn.fuxiaoaio.ygg.module.infra.convert.file.FileConfigConvert; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.file.FileConfigDO; +import cn.fuxiaoaio.ygg.module.infra.dal.mysql.file.FileConfigMapper; +import cn.fuxiaoaio.ygg.module.infra.mq.producer.file.FileConfigProducer; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -30,9 +30,9 @@ import javax.validation.Validator; import java.util.List; import java.util.Map; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.FILE_CONFIG_DELETE_FAIL_MASTER; -import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.FILE_CONFIG_NOT_EXISTS; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.module.infra.enums.ErrorCodeConstants.FILE_CONFIG_DELETE_FAIL_MASTER; +import static cn.fuxiaoaio.ygg.module.infra.enums.ErrorCodeConstants.FILE_CONFIG_NOT_EXISTS; /** * 文件配置 Service 实现类 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileService.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/file/FileService.java similarity index 79% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileService.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/file/FileService.java index 52710a990..c0d1bbe0c 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileService.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/file/FileService.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.infra.service.file; +package cn.fuxiaoaio.ygg.module.infra.service.file; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FilePageReqVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.file.FilePageReqVO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.file.FileDO; /** * 文件 Service 接口 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/file/FileServiceImpl.java similarity index 80% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/file/FileServiceImpl.java index 0732765d8..188110452 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/file/FileServiceImpl.java @@ -1,21 +1,21 @@ -package cn.iocoder.yudao.module.infra.service.file; +package cn.fuxiaoaio.ygg.module.infra.service.file; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.io.FileUtils; -import cn.iocoder.yudao.framework.file.core.client.FileClient; -import cn.iocoder.yudao.framework.file.core.utils.FileTypeUtils; -import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FilePageReqVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO; -import cn.iocoder.yudao.module.infra.dal.mysql.file.FileMapper; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.io.FileUtils; +import cn.fuxiaoaio.ygg.framework.file.core.client.FileClient; +import cn.fuxiaoaio.ygg.framework.file.core.utils.FileTypeUtils; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.file.vo.file.FilePageReqVO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.file.FileDO; +import cn.fuxiaoaio.ygg.module.infra.dal.mysql.file.FileMapper; import lombok.SneakyThrows; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.FILE_NOT_EXISTS; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.module.infra.enums.ErrorCodeConstants.FILE_NOT_EXISTS; /** * 文件 Service 实现类 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogService.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/logger/ApiAccessLogService.java similarity index 64% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogService.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/logger/ApiAccessLogService.java index e8159cf62..249387985 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogService.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/logger/ApiAccessLogService.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.infra.service.logger; +package cn.fuxiaoaio.ygg.module.infra.service.logger; -import cn.iocoder.yudao.framework.apilog.core.service.ApiAccessLog; -import cn.iocoder.yudao.framework.apilog.core.service.ApiAccessLogFrameworkService; -import cn.iocoder.yudao.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogExportReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogPageReqVO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiAccessLogDO; +import cn.fuxiaoaio.ygg.framework.apilog.core.service.ApiAccessLog; +import cn.fuxiaoaio.ygg.framework.apilog.core.service.ApiAccessLogFrameworkService; +import cn.fuxiaoaio.ygg.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogExportReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogPageReqVO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.logger.ApiAccessLogDO; import java.util.List; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImpl.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/logger/ApiAccessLogServiceImpl.java similarity index 67% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImpl.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/logger/ApiAccessLogServiceImpl.java index a2311dc94..61e2a4020 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImpl.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/logger/ApiAccessLogServiceImpl.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.module.infra.service.logger; +package cn.fuxiaoaio.ygg.module.infra.service.logger; -import cn.iocoder.yudao.framework.apilog.core.service.ApiAccessLog; -import cn.iocoder.yudao.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogExportReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogPageReqVO; -import cn.iocoder.yudao.module.infra.convert.logger.ApiAccessLogConvert; -import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiAccessLogDO; -import cn.iocoder.yudao.module.infra.dal.mysql.logger.ApiAccessLogMapper; -import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.apilog.core.service.ApiAccessLog; +import cn.fuxiaoaio.ygg.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogExportReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogPageReqVO; +import cn.fuxiaoaio.ygg.module.infra.convert.logger.ApiAccessLogConvert; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.logger.ApiAccessLogDO; +import cn.fuxiaoaio.ygg.module.infra.dal.mysql.logger.ApiAccessLogMapper; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogService.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/logger/ApiErrorLogService.java similarity index 69% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogService.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/logger/ApiErrorLogService.java index b30d438a0..11253b88d 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogService.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/logger/ApiErrorLogService.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.infra.service.logger; +package cn.fuxiaoaio.ygg.module.infra.service.logger; -import cn.iocoder.yudao.framework.apilog.core.service.ApiErrorLog; -import cn.iocoder.yudao.framework.apilog.core.service.ApiErrorLogFrameworkService; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogExportReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogPageReqVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiErrorLogDO; +import cn.fuxiaoaio.ygg.framework.apilog.core.service.ApiErrorLog; +import cn.fuxiaoaio.ygg.framework.apilog.core.service.ApiErrorLogFrameworkService; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogExportReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogPageReqVO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.logger.ApiErrorLogDO; import java.util.List; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImpl.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/logger/ApiErrorLogServiceImpl.java similarity index 72% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImpl.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/logger/ApiErrorLogServiceImpl.java index c0f9252af..fcc870b14 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImpl.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/logger/ApiErrorLogServiceImpl.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.module.infra.service.logger; +package cn.fuxiaoaio.ygg.module.infra.service.logger; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogExportReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogPageReqVO; -import cn.iocoder.yudao.module.infra.convert.logger.ApiErrorLogConvert; -import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiErrorLogDO; -import cn.iocoder.yudao.module.infra.dal.mysql.logger.ApiErrorLogMapper; -import cn.iocoder.yudao.module.infra.enums.logger.ApiErrorLogProcessStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogExportReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogPageReqVO; +import cn.fuxiaoaio.ygg.module.infra.convert.logger.ApiErrorLogConvert; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.logger.ApiErrorLogDO; +import cn.fuxiaoaio.ygg.module.infra.dal.mysql.logger.ApiErrorLogMapper; +import cn.fuxiaoaio.ygg.module.infra.enums.logger.ApiErrorLogProcessStatusEnum; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -15,9 +15,9 @@ import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.List; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.API_ERROR_LOG_NOT_FOUND; -import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.API_ERROR_LOG_PROCESSED; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.module.infra.enums.ErrorCodeConstants.API_ERROR_LOG_NOT_FOUND; +import static cn.fuxiaoaio.ygg.module.infra.enums.ErrorCodeConstants.API_ERROR_LOG_PROCESSED; /** * API 错误日志 Service 实现类 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/test/TestDemoService.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/test/TestDemoService.java old mode 100755 new mode 100644 similarity index 77% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/test/TestDemoService.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/test/TestDemoService.java index 8b33f2824..aac8dbc67 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/test/TestDemoService.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/test/TestDemoService.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.infra.service.test; +package cn.fuxiaoaio.ygg.module.infra.service.test; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.infra.controller.admin.test.vo.TestDemoCreateReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.test.vo.TestDemoExportReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.test.vo.TestDemoPageReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.test.vo.TestDemoUpdateReqVO; -import cn.iocoder.yudao.module.infra.dal.dataobject.test.TestDemoDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.test.vo.TestDemoCreateReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.test.vo.TestDemoExportReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.test.vo.TestDemoPageReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.test.vo.TestDemoUpdateReqVO; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.test.TestDemoDO; import javax.validation.Valid; import java.util.Collection; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/test/TestDemoServiceImpl.java b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/test/TestDemoServiceImpl.java old mode 100755 new mode 100644 similarity index 77% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/test/TestDemoServiceImpl.java rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/test/TestDemoServiceImpl.java index f476b5a72..d0109c634 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/test/TestDemoServiceImpl.java +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/java/cn/fuxiaoaio/ygg/module/infra/service/test/TestDemoServiceImpl.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.module.infra.service.test; +package cn.fuxiaoaio.ygg.module.infra.service.test; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.infra.controller.admin.test.vo.TestDemoCreateReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.test.vo.TestDemoExportReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.test.vo.TestDemoPageReqVO; -import cn.iocoder.yudao.module.infra.controller.admin.test.vo.TestDemoUpdateReqVO; -import cn.iocoder.yudao.module.infra.convert.test.TestDemoConvert; -import cn.iocoder.yudao.module.infra.dal.dataobject.test.TestDemoDO; -import cn.iocoder.yudao.module.infra.dal.mysql.test.TestDemoMapper; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.test.vo.TestDemoCreateReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.test.vo.TestDemoExportReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.test.vo.TestDemoPageReqVO; +import cn.fuxiaoaio.ygg.module.infra.controller.admin.test.vo.TestDemoUpdateReqVO; +import cn.fuxiaoaio.ygg.module.infra.convert.test.TestDemoConvert; +import cn.fuxiaoaio.ygg.module.infra.dal.dataobject.test.TestDemoDO; +import cn.fuxiaoaio.ygg.module.infra.dal.mysql.test.TestDemoMapper; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -17,8 +17,8 @@ import javax.annotation.Resource; import java.util.Collection; import java.util.List; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.TEST_DEMO_NOT_EXISTS; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.module.infra.enums.ErrorCodeConstants.TEST_DEMO_NOT_EXISTS; /** * 字典类型 Service 实现类 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-dev.yaml b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/application-dev.yaml similarity index 83% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-dev.yaml rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/application-dev.yaml index df0135e11..77b051d2f 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-dev.yaml +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/application-dev.yaml @@ -39,21 +39,21 @@ spring: primary: master datasource: master: - name: ruoyi-vue-pro - url: jdbc:mysql://400-infra.server.iocoder.cn:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true - driver-class-name: com.mysql.jdbc.Driver + name: FUXIAOAIO-CLOUD + url: jdbc:mysql://101.43.138.73:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true + driver-class-name: com.mariadb.jdbc.Driver username: root - password: 3WLiVUBEwTbvAfsh + password: 1233Newobject slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改 - name: ruoyi-vue-pro - url: jdbc:mysql://400-infra.server.iocoder.cn:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true - driver-class-name: com.mysql.jdbc.Driver + name: FUXIAOAIO-CLOUD + url: jdbc:mysql://101.43.138.73:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true + driver-class-name: com.mariadb.jdbc.Driver username: root - password: 3WLiVUBEwTbvAfsh + password: 1233Newobject # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 redis: - host: 400-infra.server.iocoder.cn # 地址 + host: 101.43.138.73 # 地址 port: 6379 # 端口 database: 1 # 数据库索引 # password: 123456 # 密码，建议生产环境开启 @@ -104,7 +104,7 @@ spring: --- #################### 芋道相关配置 #################### # 芋道配置项，设置当前项目所有自定义的配置 -yudao: +fuxiaoaio: xss: enable: false exclude-urls: # 如下两个 url，仅仅是为了演示，去掉配置也没关系 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-local.yaml b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/application-local.yaml similarity index 98% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-local.yaml rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/application-local.yaml index 9535289c1..1dcb4e85d 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-local.yaml +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/application-local.yaml @@ -40,7 +40,7 @@ spring: primary: master datasource: master: - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 @@ -51,7 +51,7 @@ spring: # username: sa # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W slave: # 模拟从库，可根据自己需要修改 - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 @@ -118,12 +118,12 @@ spring: logging: level: # 配置自己写的 MyBatis Mapper 打印日志 - cn.iocoder.yudao.module.infra.dal.mysql: debug + cn.fuxiaoaio.ygg.module.infra.dal.mysql: debug --- #################### 芋道相关配置 #################### # 芋道配置项，设置当前项目所有自定义的配置 -yudao: +fuxiaoaio: env: # 多环境的配置项 tag: ${HOSTNAME} security: diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/application.yaml b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/application.yaml similarity index 90% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/application.yaml rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/application.yaml index 4401de904..a1512b3fa 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/application.yaml +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/application.yaml @@ -48,21 +48,21 @@ mybatis-plus: map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。 global-config: db-config: - # 重要说明：如果将配置放到 Nacos 时，请注意将 id-type 设置为对应 DB 的类型，否则会报错；详细见 https://gitee.com/zhijiantianya/yudao-cloud/issues/I5W2N0 讨论 + # 重要说明：如果将配置放到 Nacos 时，请注意将 id-type 设置为对应 DB 的类型，否则会报错；详细见 https://gitee.com/zhijiantianya/fuxiaoaio-cloud/issues/I5W2N0 讨论 id-type: NONE # “智能”模式，基于 IdTypeEnvironmentPostProcessor + 数据源的类型，自动适配成 AUTO、INPUT 模式。 # id-type: AUTO # 自增 ID，适合 MySQL 等直接自增的数据库 # id-type: INPUT # 用户输入 ID，适合 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库 # id-type: ASSIGN_ID # 分配 ID，默认使用雪花算法。注意，Oracle、PostgreSQL、Kingbase、DB2、H2 数据库时，需要去除实体类上的 @KeySequence 注解 logic-delete-value: 1 # 逻辑已删除值(默认为 1) logic-not-delete-value: 0 # 逻辑未删除值(默认为 0) - type-aliases-package: ${yudao.info.base-package}.dal.dataobject + type-aliases-package: ${fuxiaoaio.info.base-package}.dal.dataobject encryptor: password: XDV71a+xqStEA3WH # 加解密的秘钥，可使用 https://www.imaegoo.com/2020/aes-key-generator/ 网站生成 --- #################### RPC 远程调用相关配置 #################### dubbo: scan: - base-packages: ${yudao.info.base-package}.api # 指定 Dubbo 服务实现类的扫描基准包 + base-packages: ${fuxiaoaio.info.base-package}.api # 指定 Dubbo 服务实现类的扫描基准包 protocol: name: dubbo # 协议名称 port: -1 # 协议端口，-1 表示自增端口，从 20880 开始 @@ -113,25 +113,25 @@ xxl: --- #################### 芋道相关配置 #################### -yudao: +fuxiaoaio: info: version: 1.0.0 - base-package: cn.iocoder.yudao.module.infra + base-package: cn.fuxiaoaio.ygg.module.infra web: admin-ui: - url: http://dashboard.yudao.iocoder.cn # Admin 管理后台 UI 的地址 + url: http://dashboard.fuxiaoaio.iocoder.cn # Admin 管理后台 UI 的地址 swagger: title: 管理后台 description: 提供管理员管理的所有功能 - version: ${yudao.info.version} - base-package: ${yudao.info.base-package} + version: ${fuxiaoaio.info.version} + base-package: ${fuxiaoaio.info.base-package} codegen: - base-package: cn.iocoder.yudao + base-package: cn.fuxiaoaio.ygg db-schemas: ${spring.datasource.dynamic.datasource.master.name} front-type: 10 # 前端模版的类型，参见 CodegenFrontTypeEnum 枚举类 error-code: # 错误码相关配置项 constants-class-list: - - cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants + - cn.fuxiaoaio.ygg.module.infra.enums.ErrorCodeConstants tenant: # 多租户相关配置项 enable: true ignore-urls: diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/bootstrap-local.yaml b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/bootstrap-local.yaml similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/bootstrap-local.yaml rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/bootstrap-local.yaml diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/bootstrap.yaml b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/bootstrap.yaml similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/bootstrap.yaml rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/bootstrap.yaml diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/controller.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/controller/controller.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/controller.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/controller/controller.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/_column.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/controller/vo/_column.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/_column.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/controller/vo/_column.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/baseVO.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/controller/vo/baseVO.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/baseVO.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/controller/vo/baseVO.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/createReqVO.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/controller/vo/createReqVO.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/createReqVO.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/controller/vo/createReqVO.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/excelVO.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/controller/vo/excelVO.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/excelVO.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/controller/vo/excelVO.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/exportReqVO.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/controller/vo/exportReqVO.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/exportReqVO.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/controller/vo/exportReqVO.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/pageReqVO.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/controller/vo/pageReqVO.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/pageReqVO.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/controller/vo/pageReqVO.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/respVO.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/controller/vo/respVO.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/respVO.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/controller/vo/respVO.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/updateReqVO.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/controller/vo/updateReqVO.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/updateReqVO.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/controller/vo/updateReqVO.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/convert/convert.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/convert/convert.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/convert/convert.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/convert/convert.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/dal/do.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/dal/do.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/dal/do.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/dal/do.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/dal/mapper.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/dal/mapper.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/dal/mapper.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/dal/mapper.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/dal/mapper.xml.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/dal/mapper.xml.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/dal/mapper.xml.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/dal/mapper.xml.vm diff --git a/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/enums/errorcode.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/enums/errorcode.vm new file mode 100644 index 000000000..7b4eb8e54 --- /dev/null +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/enums/errorcode.vm @@ -0,0 +1,3 @@ +// TODO 待办：请将下面的错误码复制到 fuxiaoaio-module-${table.moduleName}-api 模块的 ErrorCodeConstants 类中。注意，请给“TODO 补充编号”设置一个错误码编号！！！ +// ========== ${table.classComment} TODO 补充编号 ========== +ErrorCode ${simpleClassName_underlineCase.toUpperCase()}_NOT_EXISTS = new ErrorCode(TODO 补充编号, "${table.classComment}不存在"); diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/service/service.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/service/service.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/service/service.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/service/service.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/service/serviceImpl.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/service/serviceImpl.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/service/serviceImpl.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/service/serviceImpl.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/test/serviceTest.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/test/serviceTest.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/test/serviceTest.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/java/test/serviceTest.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/sql/h2.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/sql/h2.vm similarity index 83% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/sql/h2.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/sql/h2.vm index 20c33ad59..52e50e7be 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/sql/h2.vm +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/sql/h2.vm @@ -1,4 +1,4 @@ --- 将该建表 SQL 语句，添加到 yudao-module-${table.moduleName}-biz 模块的 test/resources/sql/create_tables.sql 文件里 +-- 将该建表 SQL 语句，添加到 fuxiaoaio-module-${table.moduleName}-biz 模块的 test/resources/sql/create_tables.sql 文件里 CREATE TABLE IF NOT EXISTS "${table.tableName.toLowerCase()}" ( #foreach ($column in $columns) #if (${column.javaType} == 'Long') @@ -31,5 +31,5 @@ CREATE TABLE IF NOT EXISTS "${table.tableName.toLowerCase()}" ( PRIMARY KEY ("${primaryColumn.columnName.toLowerCase()}") ) COMMENT '${table.tableComment}'; --- 将该删表 SQL 语句，添加到 yudao-module-${table.moduleName}-biz 模块的 test/resources/sql/clean.sql 文件里 +-- 将该删表 SQL 语句，添加到 fuxiaoaio-module-${table.moduleName}-biz 模块的 test/resources/sql/clean.sql 文件里 DELETE FROM "${table.tableName}"; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/sql/sql.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/sql/sql.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/sql/sql.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/sql/sql.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/api/api.js.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/vue/api/api.js.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/api/api.js.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/vue/api/api.js.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_schema/api/api.ts.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/vue3_schema/api/api.ts.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_schema/api/api.ts.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/vue3_schema/api/api.ts.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_schema/views/data.ts.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/vue3_schema/views/data.ts.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_schema/views/data.ts.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/vue3_schema/views/data.ts.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_schema/views/form.vue.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/vue3_schema/views/form.vue.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_schema/views/form.vue.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/vue3_schema/views/form.vue.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_schema/views/index.vue.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/vue3_schema/views/index.vue.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_schema/views/index.vue.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/vue3_schema/views/index.vue.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/api/api.ts.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/vue3_vben/api/api.ts.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/api/api.ts.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/vue3_vben/api/api.ts.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/data.ts.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/vue3_vben/views/data.ts.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/data.ts.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/vue3_vben/views/data.ts.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/form.vue.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/vue3_vben/views/form.vue.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/form.vue.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/vue3_vben/views/form.vue.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/index.vue.vm b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/vue3_vben/views/index.vue.vm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/index.vue.vm rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/codegen/vue3_vben/views/index.vue.vm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/file/erweima.jpg b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/file/erweima.jpg similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/file/erweima.jpg rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/file/erweima.jpg diff --git a/yudao-gateway/src/main/resources/logback-spring.xml b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/logback-spring.xml similarity index 95% rename from yudao-gateway/src/main/resources/logback-spring.xml rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/logback-spring.xml index 5f4b30d04..509b469f8 100644 --- a/yudao-gateway/src/main/resources/logback-spring.xml +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/logback-spring.xml @@ -1,8 +1,8 @@ - - + + diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/mapper/null/.gitkeep b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/mapper/null/.gitkeep similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/mapper/null/.gitkeep rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/mapper/null/.gitkeep diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/mapper/test/TestDemoMapper.xml b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/mapper/test/TestDemoMapper.xml similarity index 91% rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/mapper/test/TestDemoMapper.xml rename to fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/mapper/test/TestDemoMapper.xml index d65f2136f..fd65cb010 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/mapper/test/TestDemoMapper.xml +++ b/fuxiaoaio-module-infra/fuxiaoaio-module-infra-biz/src/main/resources/mapper/test/TestDemoMapper.xml @@ -1,6 +1,6 @@ - + - cn.iocoder.cloud - yudao-module-report-api + cn.fuxiaoaio.ygg + fuxiaoaio-module-report-api ${revision} - cn.iocoder.cloud - yudao-module-system-api + cn.fuxiaoaio.ygg + fuxiaoaio-module-system-api ${revision} - cn.iocoder.cloud - yudao-module-infra-api + cn.fuxiaoaio.ygg + fuxiaoaio-module-infra-api ${revision} - cn.iocoder.cloud - yudao-spring-boot-starter-banner + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-banner - cn.iocoder.cloud - yudao-spring-boot-starter-biz-operatelog + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-operatelog - cn.iocoder.cloud - yudao-spring-boot-starter-biz-tenant + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-tenant - cn.iocoder.cloud - yudao-spring-boot-starter-biz-error-code + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-error-code - cn.iocoder.cloud - yudao-spring-boot-starter-security + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-security - cn.iocoder.cloud - yudao-spring-boot-starter-mybatis + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-mybatis - cn.iocoder.cloud - yudao-spring-boot-starter-redis + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-redis - cn.iocoder.cloud - yudao-spring-boot-starter-rpc + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-rpc @@ -97,27 +97,27 @@ - - + + - - + + - cn.iocoder.cloud - yudao-spring-boot-starter-test + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-test test - cn.iocoder.cloud - yudao-spring-boot-starter-monitor + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-monitor diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/ReportServerApplication.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/ReportServerApplication.java similarity index 96% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/ReportServerApplication.java rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/ReportServerApplication.java index 759482a31..5a6ee7fa2 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/ReportServerApplication.java +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/ReportServerApplication.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.report; +package cn.fuxiaoaio.ygg.module.report; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/admin/ajreport/package-info.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/admin/ajreport/package-info.java new file mode 100644 index 000000000..1c9729a58 --- /dev/null +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/admin/ajreport/package-info.java @@ -0,0 +1 @@ +package cn.fuxiaoaio.ygg.module.report.controller.admin.ajreport; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewDataController.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/admin/goview/GoViewDataController.java similarity index 86% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewDataController.java rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/admin/goview/GoViewDataController.java index 31805c1e2..639247cec 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewDataController.java +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/admin/goview/GoViewDataController.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.report.controller.admin.goview; +package cn.fuxiaoaio.ygg.module.report.controller.admin.goview; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.RandomUtil; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import cn.iocoder.yudao.module.report.controller.admin.goview.vo.data.GoViewDataGetBySqlReqVO; -import cn.iocoder.yudao.module.report.controller.admin.goview.vo.data.GoViewDataRespVO; -import cn.iocoder.yudao.module.report.service.goview.GoViewDataService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog; +import cn.fuxiaoaio.ygg.module.report.controller.admin.goview.vo.data.GoViewDataGetBySqlReqVO; +import cn.fuxiaoaio.ygg.module.report.controller.admin.goview.vo.data.GoViewDataRespVO; +import cn.fuxiaoaio.ygg.module.report.service.goview.GoViewDataService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.Map; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; //@Tag(name = "管理后台 - GoView 数据", description = "提供 SQL、HTTP 等数据查询的能力") @RestController diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewProjectController.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/admin/goview/GoViewProjectController.java similarity index 78% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewProjectController.java rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/admin/goview/GoViewProjectController.java index 240be46c3..a4e9f96d1 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/GoViewProjectController.java +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/admin/goview/GoViewProjectController.java @@ -1,14 +1,14 @@ -package cn.iocoder.yudao.module.report.controller.admin.goview; +package cn.fuxiaoaio.ygg.module.report.controller.admin.goview; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectCreateReqVO; -import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectRespVO; -import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectUpdateReqVO; -import cn.iocoder.yudao.module.report.convert.goview.GoViewProjectConvert; -import cn.iocoder.yudao.module.report.dal.dataobject.goview.GoViewProjectDO; -import cn.iocoder.yudao.module.report.service.goview.GoViewProjectService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.report.controller.admin.goview.vo.project.GoViewProjectCreateReqVO; +import cn.fuxiaoaio.ygg.module.report.controller.admin.goview.vo.project.GoViewProjectRespVO; +import cn.fuxiaoaio.ygg.module.report.controller.admin.goview.vo.project.GoViewProjectUpdateReqVO; +import cn.fuxiaoaio.ygg.module.report.convert.goview.GoViewProjectConvert; +import cn.fuxiaoaio.ygg.module.report.dal.dataobject.goview.GoViewProjectDO; +import cn.fuxiaoaio.ygg.module.report.service.goview.GoViewProjectService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -16,8 +16,8 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; //@Tag(name = "管理后台 - GoView 项目") @RestController diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/data/GoViewDataGetBySqlReqVO.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/admin/goview/vo/data/GoViewDataGetBySqlReqVO.java similarity index 85% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/data/GoViewDataGetBySqlReqVO.java rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/admin/goview/vo/data/GoViewDataGetBySqlReqVO.java index ecd1fdcd7..d872d3ba6 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/data/GoViewDataGetBySqlReqVO.java +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/admin/goview/vo/data/GoViewDataGetBySqlReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.report.controller.admin.goview.vo.data; +package cn.fuxiaoaio.ygg.module.report.controller.admin.goview.vo.data; import lombok.Data; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/data/GoViewDataRespVO.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/admin/goview/vo/data/GoViewDataRespVO.java similarity index 88% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/data/GoViewDataRespVO.java rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/admin/goview/vo/data/GoViewDataRespVO.java index 25e4112e5..8b4c16a06 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/data/GoViewDataRespVO.java +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/admin/goview/vo/data/GoViewDataRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.report.controller.admin.goview.vo.data; +package cn.fuxiaoaio.ygg.module.report.controller.admin.goview.vo.data; //import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectCreateReqVO.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/admin/goview/vo/project/GoViewProjectCreateReqVO.java similarity index 84% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectCreateReqVO.java rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/admin/goview/vo/project/GoViewProjectCreateReqVO.java index c9fe3e0cc..cc9b7edf9 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectCreateReqVO.java +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/admin/goview/vo/project/GoViewProjectCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.report.controller.admin.goview.vo.project; +package cn.fuxiaoaio.ygg.module.report.controller.admin.goview.vo.project; import lombok.Data; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectRespVO.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/admin/goview/vo/project/GoViewProjectRespVO.java similarity index 93% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectRespVO.java rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/admin/goview/vo/project/GoViewProjectRespVO.java index 73f823733..7bf8d5cbb 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectRespVO.java +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/admin/goview/vo/project/GoViewProjectRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.report.controller.admin.goview.vo.project; +package cn.fuxiaoaio.ygg.module.report.controller.admin.goview.vo.project; import lombok.Data; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectUpdateReqVO.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/admin/goview/vo/project/GoViewProjectUpdateReqVO.java similarity index 83% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectUpdateReqVO.java rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/admin/goview/vo/project/GoViewProjectUpdateReqVO.java index 97801fe8d..d0b758763 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/goview/vo/project/GoViewProjectUpdateReqVO.java +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/admin/goview/vo/project/GoViewProjectUpdateReqVO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.report.controller.admin.goview.vo.project; +package cn.fuxiaoaio.ygg.module.report.controller.admin.goview.vo.project; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.validation.InEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.validation.InEnum; import lombok.Data; import javax.validation.constraints.NotNull; diff --git a/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/package-info.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/package-info.java new file mode 100644 index 000000000..e5891afd2 --- /dev/null +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/controller/package-info.java @@ -0,0 +1,6 @@ +/** + * 提供 RESTful API 给前端： + * 1. admin 包：提供给管理后台 fuxiaoaio-ui-admin 前端项目 + * 2. app 包：提供给用户 APP fuxiaoaio-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分 + */ +package cn.fuxiaoaio.ygg.module.report.controller; diff --git a/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/convert/ajreport/package-info.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/convert/ajreport/package-info.java new file mode 100644 index 000000000..ec20755fb --- /dev/null +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/convert/ajreport/package-info.java @@ -0,0 +1,4 @@ +/** + * TODO 占位，后续删除 + */ +package cn.fuxiaoaio.ygg.module.report.convert.ajreport; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/convert/goview/GoViewProjectConvert.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/convert/goview/GoViewProjectConvert.java similarity index 61% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/convert/goview/GoViewProjectConvert.java rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/convert/goview/GoViewProjectConvert.java index 9c993a19c..c34a7f827 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/convert/goview/GoViewProjectConvert.java +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/convert/goview/GoViewProjectConvert.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.report.convert.goview; +package cn.fuxiaoaio.ygg.module.report.convert.goview; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectCreateReqVO; -import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectRespVO; -import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectUpdateReqVO; -import cn.iocoder.yudao.module.report.dal.dataobject.goview.GoViewProjectDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.report.controller.admin.goview.vo.project.GoViewProjectCreateReqVO; +import cn.fuxiaoaio.ygg.module.report.controller.admin.goview.vo.project.GoViewProjectRespVO; +import cn.fuxiaoaio.ygg.module.report.controller.admin.goview.vo.project.GoViewProjectUpdateReqVO; +import cn.fuxiaoaio.ygg.module.report.dal.dataobject.goview.GoViewProjectDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/dal/dataobject/ajreport/package-info.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/dal/dataobject/ajreport/package-info.java new file mode 100644 index 000000000..567f45dc7 --- /dev/null +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/dal/dataobject/ajreport/package-info.java @@ -0,0 +1,4 @@ +/** + * TODO 芋艿：占位，待删除 + */ +package cn.fuxiaoaio.ygg.module.report.dal.dataobject.ajreport; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/dataobject/goview/GoViewProjectDO.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/dal/dataobject/goview/GoViewProjectDO.java similarity index 86% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/dataobject/goview/GoViewProjectDO.java rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/dal/dataobject/goview/GoViewProjectDO.java index 38730d29e..dee929e3d 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/dataobject/goview/GoViewProjectDO.java +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/dal/dataobject/goview/GoViewProjectDO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.report.dal.dataobject.goview; +package cn.fuxiaoaio.ygg.module.report.dal.dataobject.goview; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -47,7 +47,7 @@ public class GoViewProjectDO extends BaseDO { * 0 - 已发布 * 1 - 未发布 * - * 枚举 {@link cn.iocoder.yudao.framework.common.enums.CommonStatusEnum} + * 枚举 {@link cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum} */ private Integer status; /** diff --git a/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/dal/mysql/ajreport/package-info.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/dal/mysql/ajreport/package-info.java new file mode 100644 index 000000000..8be5e92a0 --- /dev/null +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/dal/mysql/ajreport/package-info.java @@ -0,0 +1,4 @@ +/** + * TODO 芋艿：占位，待删除 + */ +package cn.fuxiaoaio.ygg.module.report.dal.mysql.ajreport; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/mysql/goview/GoViewProjectMapper.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/dal/mysql/goview/GoViewProjectMapper.java similarity index 54% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/mysql/goview/GoViewProjectMapper.java rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/dal/mysql/goview/GoViewProjectMapper.java index af1ca6345..bda01af00 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/mysql/goview/GoViewProjectMapper.java +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/dal/mysql/goview/GoViewProjectMapper.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.report.dal.mysql.goview; +package cn.fuxiaoaio.ygg.module.report.dal.mysql.goview; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.report.dal.dataobject.goview.GoViewProjectDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.report.dal.dataobject.goview.GoViewProjectDO; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/config/JmReportConfiguration.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/framework/jmreport/config/JmReportConfiguration.java similarity index 75% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/config/JmReportConfiguration.java rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/framework/jmreport/config/JmReportConfiguration.java index 3c99b2858..5cacc8553 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/config/JmReportConfiguration.java +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/framework/jmreport/config/JmReportConfiguration.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.report.framework.jmreport.config; +package cn.fuxiaoaio.ygg.module.report.framework.jmreport.config; -import cn.iocoder.yudao.framework.security.config.SecurityProperties; -import cn.iocoder.yudao.module.system.api.oauth2.OAuth2TokenApi; -import cn.iocoder.yudao.module.report.framework.jmreport.core.service.JmReportTokenServiceImpl; +import cn.fuxiaoaio.ygg.framework.security.config.SecurityProperties; +import cn.fuxiaoaio.ygg.module.system.api.oauth2.OAuth2TokenApi; +import cn.fuxiaoaio.ygg.module.report.framework.jmreport.core.service.JmReportTokenServiceImpl; import org.jeecg.modules.jmreport.api.JmReportTokenServiceI; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java similarity index 86% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java index cdc23c9e4..8fb283c44 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java @@ -1,16 +1,16 @@ -package cn.iocoder.yudao.module.report.framework.jmreport.core.service; +package cn.fuxiaoaio.ygg.module.report.framework.jmreport.core.service; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.exception.ServiceException; -import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; -import cn.iocoder.yudao.framework.security.config.SecurityProperties; -import cn.iocoder.yudao.framework.security.core.LoginUser; -import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; -import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; -import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; -import cn.iocoder.yudao.module.system.api.oauth2.OAuth2TokenApi; -import cn.iocoder.yudao.module.system.api.oauth2.dto.OAuth2AccessTokenCheckRespDTO; +import cn.fuxiaoaio.ygg.framework.common.exception.ServiceException; +import cn.fuxiaoaio.ygg.framework.common.util.servlet.ServletUtils; +import cn.fuxiaoaio.ygg.framework.security.config.SecurityProperties; +import cn.fuxiaoaio.ygg.framework.security.core.LoginUser; +import cn.fuxiaoaio.ygg.framework.security.core.util.SecurityFrameworkUtils; +import cn.fuxiaoaio.ygg.framework.tenant.core.context.TenantContextHolder; +import cn.fuxiaoaio.ygg.framework.web.core.util.WebFrameworkUtils; +import cn.fuxiaoaio.ygg.module.system.api.oauth2.OAuth2TokenApi; +import cn.fuxiaoaio.ygg.module.system.api.oauth2.dto.OAuth2AccessTokenCheckRespDTO; import lombok.RequiredArgsConstructor; import org.jeecg.modules.jmreport.api.JmReportTokenServiceI; import org.springframework.http.HttpHeaders; @@ -51,7 +51,7 @@ public class JmReportTokenServiceImpl implements JmReportTokenServiceI { HttpServletRequest request = ServletUtils.getRequest(); String token = request.getHeader(JM_TOKEN_HEADER); - // 设置到 yudao 系统的 token + // 设置到 fuxiaoaio 系统的 token HttpHeaders headers = new HttpHeaders(); headers.add(securityProperties.getTokenHeader(), String.format(AUTHORIZATION_FORMAT, token)); return headers; diff --git a/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/framework/jmreport/core/web/package-info.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/framework/jmreport/core/web/package-info.java new file mode 100644 index 000000000..48a81a50e --- /dev/null +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/framework/jmreport/core/web/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位，后续会基于 Filter 实现积木报表的认证等功能，替代 {@link cn.fuxiaoaio.ygg.module.report.framework.jmreport.core.service.JmReportTokenServiceImpl} + */ +package cn.fuxiaoaio.ygg.module.report.framework.jmreport.core.web; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/package-info.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/framework/package-info.java similarity index 61% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/package-info.java rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/framework/package-info.java index c2163d8cd..4abe44894 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/package-info.java +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/framework/package-info.java @@ -3,4 +3,4 @@ * * @author 芋道源码 */ -package cn.iocoder.yudao.module.report.framework; +package cn.fuxiaoaio.ygg.module.report.framework; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/config/SecurityConfiguration.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/framework/security/config/SecurityConfiguration.java similarity index 91% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/config/SecurityConfiguration.java rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/framework/security/config/SecurityConfiguration.java index 05b009661..4df21a699 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/config/SecurityConfiguration.java +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/framework/security/config/SecurityConfiguration.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.report.framework.security.config; +package cn.fuxiaoaio.ygg.module.report.framework.security.config; -import cn.iocoder.yudao.framework.security.config.AuthorizeRequestsCustomizer; +import cn.fuxiaoaio.ygg.framework.security.config.AuthorizeRequestsCustomizer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; diff --git a/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/framework/security/core/package-info.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/framework/security/core/package-info.java new file mode 100644 index 000000000..1d8aeb6d8 --- /dev/null +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/framework/security/core/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package cn.fuxiaoaio.ygg.module.report.framework.security.core; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/package-info.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/framework/ureport/package-info.java similarity index 81% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/package-info.java rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/framework/ureport/package-info.java index a4e2e8bf1..2aaf0172b 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/package-info.java +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/framework/ureport/package-info.java @@ -4,4 +4,4 @@ * ureport2 和 jimurepot 是相同类型的产品，不过停更了，最好发布时间是 2018 年。 * 它们之间的功能对比，可见 https://juejin.cn/post/6939836480269320200 地址 */ -package cn.iocoder.yudao.module.report.framework.ureport; +package cn.fuxiaoaio.ygg.module.report.framework.ureport; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/package-info.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/package-info.java similarity index 92% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/package-info.java rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/package-info.java index 3306c0ebb..ce77580ab 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/package-info.java +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/package-info.java @@ -6,4 +6,4 @@ * 1. Controller URL：以 /report/ 开头，避免和其它 Module 冲突 * 2. DataObject 表名：以 report_ 开头，方便在数据库中区分 */ -package cn.iocoder.yudao.module.report; +package cn.fuxiaoaio.ygg.module.report; diff --git a/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/service/ajreport/package-info.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/service/ajreport/package-info.java new file mode 100644 index 000000000..b871ffe6c --- /dev/null +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/service/ajreport/package-info.java @@ -0,0 +1,4 @@ +/** + * TODO 芋艿：占位，待删除 + */ +package cn.fuxiaoaio.ygg.module.report.service.ajreport; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataService.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/service/goview/GoViewDataService.java similarity index 70% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataService.java rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/service/goview/GoViewDataService.java index b912373b1..9f41c033e 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataService.java +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/service/goview/GoViewDataService.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.report.service.goview; +package cn.fuxiaoaio.ygg.module.report.service.goview; -import cn.iocoder.yudao.module.report.controller.admin.goview.vo.data.GoViewDataRespVO; +import cn.fuxiaoaio.ygg.module.report.controller.admin.goview.vo.data.GoViewDataRespVO; /** * GoView 数据 Service 接口 diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImpl.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/service/goview/GoViewDataServiceImpl.java similarity index 94% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImpl.java rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/service/goview/GoViewDataServiceImpl.java index 8938d3e74..d8dfbbcc0 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImpl.java +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/service/goview/GoViewDataServiceImpl.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.report.service.goview; +package cn.fuxiaoaio.ygg.module.report.service.goview; -import cn.iocoder.yudao.module.report.controller.admin.goview.vo.data.GoViewDataRespVO; +import cn.fuxiaoaio.ygg.module.report.controller.admin.goview.vo.data.GoViewDataRespVO; import com.google.common.collect.Maps; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.support.rowset.SqlRowSet; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectService.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/service/goview/GoViewProjectService.java similarity index 74% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectService.java rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/service/goview/GoViewProjectService.java index b171c5905..1171a9763 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectService.java +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/service/goview/GoViewProjectService.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.report.service.goview; +package cn.fuxiaoaio.ygg.module.report.service.goview; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectCreateReqVO; -import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectUpdateReqVO; -import cn.iocoder.yudao.module.report.dal.dataobject.goview.GoViewProjectDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.report.controller.admin.goview.vo.project.GoViewProjectCreateReqVO; +import cn.fuxiaoaio.ygg.module.report.controller.admin.goview.vo.project.GoViewProjectUpdateReqVO; +import cn.fuxiaoaio.ygg.module.report.dal.dataobject.goview.GoViewProjectDO; import javax.validation.Valid; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectServiceImpl.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/service/goview/GoViewProjectServiceImpl.java similarity index 73% rename from yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectServiceImpl.java rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/service/goview/GoViewProjectServiceImpl.java index 2b05052f7..27a895c24 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectServiceImpl.java +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/java/cn/fuxiaoaio/ygg/module/report/service/goview/GoViewProjectServiceImpl.java @@ -1,20 +1,20 @@ -package cn.iocoder.yudao.module.report.service.goview; +package cn.fuxiaoaio.ygg.module.report.service.goview; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectCreateReqVO; -import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectUpdateReqVO; -import cn.iocoder.yudao.module.report.convert.goview.GoViewProjectConvert; -import cn.iocoder.yudao.module.report.dal.dataobject.goview.GoViewProjectDO; -import cn.iocoder.yudao.module.report.dal.mysql.goview.GoViewProjectMapper; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.report.controller.admin.goview.vo.project.GoViewProjectCreateReqVO; +import cn.fuxiaoaio.ygg.module.report.controller.admin.goview.vo.project.GoViewProjectUpdateReqVO; +import cn.fuxiaoaio.ygg.module.report.convert.goview.GoViewProjectConvert; +import cn.fuxiaoaio.ygg.module.report.dal.dataobject.goview.GoViewProjectDO; +import cn.fuxiaoaio.ygg.module.report.dal.mysql.goview.GoViewProjectMapper; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.report.enums.ErrorCodeConstants.GO_VIEW_PROJECT_NOT_EXISTS; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.module.report.enums.ErrorCodeConstants.GO_VIEW_PROJECT_NOT_EXISTS; /** * GoView 项目 Service 实现类 diff --git a/yudao-module-report/yudao-module-report-biz/src/main/resources/application-dev.yaml b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/application-dev.yaml similarity index 82% rename from yudao-module-report/yudao-module-report-biz/src/main/resources/application-dev.yaml rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/application-dev.yaml index e0faca40f..175b7f9af 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/resources/application-dev.yaml +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/application-dev.yaml @@ -39,21 +39,21 @@ spring: primary: master datasource: master: - name: ruoyi-vue-pro - url: jdbc:mysql://400-infra.server.iocoder.cn:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true - driver-class-name: com.mysql.jdbc.Driver + name: FUXIAOAIO-CLOUD + url: jdbc:mysql://101.43.138.73:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true + driver-class-name: com.mariadb.jdbc.Driver username: root - password: 3WLiVUBEwTbvAfsh + password: 1233Newobject slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改 - name: ruoyi-vue-pro - url: jdbc:mysql://400-infra.server.iocoder.cn:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true - driver-class-name: com.mysql.jdbc.Driver + name: FUXIAOAIO-CLOUD + url: jdbc:mysql://101.43.138.73:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true + driver-class-name: com.mariadb.jdbc.Driver username: root - password: 3WLiVUBEwTbvAfsh + password: 1233Newobject # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 redis: - host: 400-infra.server.iocoder.cn # 地址 + host: 101.43.138.73 # 地址 port: 6379 # 端口 database: 1 # 数据库索引 # password: 123456 # 密码，建议生产环境开启 @@ -91,7 +91,7 @@ spring: --- #################### 芋道相关配置 #################### # 芋道配置项，设置当前项目所有自定义的配置 -yudao: +fuxiaoaio: xss: enable: false exclude-urls: # 如下两个 url，仅仅是为了演示，去掉配置也没关系 diff --git a/yudao-module-report/yudao-module-report-biz/src/main/resources/application-local.yaml b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/application-local.yaml similarity index 97% rename from yudao-module-report/yudao-module-report-biz/src/main/resources/application-local.yaml rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/application-local.yaml index cb7e7be2c..83842e88b 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/resources/application-local.yaml +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/application-local.yaml @@ -40,7 +40,7 @@ spring: primary: master datasource: master: - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 @@ -51,7 +51,7 @@ spring: # username: sa # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W slave: # 模拟从库，可根据自己需要修改 - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 @@ -103,12 +103,12 @@ spring: logging: level: # 配置自己写的 MyBatis Mapper 打印日志 - cn.iocoder.yudao.module.report.dal.mysql: debug + cn.fuxiaoaio.ygg.module.report.dal.mysql: debug --- #################### 芋道相关配置 #################### # 芋道配置项，设置当前项目所有自定义的配置 -yudao: +fuxiaoaio: env: # 多环境的配置项 tag: ${HOSTNAME} security: diff --git a/yudao-module-report/yudao-module-report-biz/src/main/resources/application.yaml b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/application.yaml similarity index 86% rename from yudao-module-report/yudao-module-report-biz/src/main/resources/application.yaml rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/application.yaml index 5b1e86b0e..493071802 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/resources/application.yaml +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/application.yaml @@ -48,21 +48,21 @@ mybatis-plus: map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。 global-config: db-config: - # 重要说明：如果将配置放到 Nacos 时，请注意将 id-type 设置为对应 DB 的类型，否则会报错；详细见 https://gitee.com/zhijiantianya/yudao-cloud/issues/I5W2N0 讨论 + # 重要说明：如果将配置放到 Nacos 时，请注意将 id-type 设置为对应 DB 的类型，否则会报错；详细见 https://gitee.com/zhijiantianya/fuxiaoaio-cloud/issues/I5W2N0 讨论 id-type: NONE # “智能”模式，基于 IdTypeEnvironmentPostProcessor + 数据源的类型，自动适配成 AUTO、INPUT 模式。 # id-type: AUTO # 自增 ID，适合 MySQL 等直接自增的数据库 # id-type: INPUT # 用户输入 ID，适合 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库 # id-type: ASSIGN_ID # 分配 ID，默认使用雪花算法。注意，Oracle、PostgreSQL、Kingbase、DB2、H2 数据库时，需要去除实体类上的 @KeySequence 注解 logic-delete-value: 1 # 逻辑已删除值(默认为 1) logic-not-delete-value: 0 # 逻辑未删除值(默认为 0) - type-aliases-package: ${yudao.info.base-package}.dal.dataobject + type-aliases-package: ${fuxiaoaio.info.base-package}.dal.dataobject encryptor: password: XDV71a+xqStEA3WH # 加解密的秘钥，可使用 https://www.imaegoo.com/2020/aes-key-generator/ 网站生成 --- #################### RPC 远程调用相关配置 #################### dubbo: scan: - base-packages: ${yudao.info.base-package}.api # 指定 Dubbo 服务实现类的扫描基准包 + base-packages: ${fuxiaoaio.info.base-package}.api # 指定 Dubbo 服务实现类的扫描基准包 protocol: name: dubbo # 协议名称 port: -1 # 协议端口，-1 表示自增端口，从 20880 开始 @@ -77,21 +77,21 @@ dubbo: --- #################### 芋道相关配置 #################### -yudao: +fuxiaoaio: info: version: 1.0.0 - base-package: cn.iocoder.yudao.module.report + base-package: cn.fuxiaoaio.ygg.module.report web: admin-ui: - url: http://dashboard.yudao.iocoder.cn # Admin 管理后台 UI 的地址 + url: http://dashboard.fuxiaoaio.iocoder.cn # Admin 管理后台 UI 的地址 swagger: title: 管理后台 description: 提供管理员管理的所有功能 - version: ${yudao.info.version} - base-package: ${yudao.info.base-package} + version: ${fuxiaoaio.info.version} + base-package: ${fuxiaoaio.info.base-package} error-code: # 错误码相关配置项 constants-class-list: - - cn.iocoder.yudao.module.report.enums.ErrorCodeConstants + - cn.fuxiaoaio.ygg.module.report.enums.ErrorCodeConstants tenant: # 多租户相关配置项 enable: true diff --git a/yudao-module-report/yudao-module-report-biz/src/main/resources/bootstrap-local.yaml b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/bootstrap-local.yaml similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/main/resources/bootstrap-local.yaml rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/bootstrap-local.yaml diff --git a/yudao-module-report/yudao-module-report-biz/src/main/resources/bootstrap.yaml b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/bootstrap.yaml similarity index 95% rename from yudao-module-report/yudao-module-report-biz/src/main/resources/bootstrap.yaml rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/bootstrap.yaml index caf41b17b..8038e8a32 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/resources/bootstrap.yaml +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/bootstrap.yaml @@ -3,7 +3,7 @@ spring: name: report-server profiles: - active: local + active: dev server: port: 48084 diff --git a/yudao-module-report/yudao-module-report-biz/src/main/resources/logback-spring.xml b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/logback-spring.xml similarity index 95% rename from yudao-module-report/yudao-module-report-biz/src/main/resources/logback-spring.xml rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/logback-spring.xml index 5f4b30d04..509b469f8 100644 --- a/yudao-module-report/yudao-module-report-biz/src/main/resources/logback-spring.xml +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/main/resources/logback-spring.xml @@ -1,8 +1,8 @@ - - + + diff --git a/yudao-module-report/yudao-module-report-biz/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImplTest.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/test/java/cn/fuxiaoaio/ygg/module/report/service/goview/GoViewDataServiceImplTest.java similarity index 92% rename from yudao-module-report/yudao-module-report-biz/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImplTest.java rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/test/java/cn/fuxiaoaio/ygg/module/report/service/goview/GoViewDataServiceImplTest.java index 87b78b8b8..2dda8f128 100644 --- a/yudao-module-report/yudao-module-report-biz/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImplTest.java +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/test/java/cn/fuxiaoaio/ygg/module/report/service/goview/GoViewDataServiceImplTest.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.report.service.goview; +package cn.fuxiaoaio.ygg.module.report.service.goview; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.report.controller.admin.goview.vo.data.GoViewDataRespVO; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.report.controller.admin.goview.vo.data.GoViewDataRespVO; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; diff --git a/yudao-module-report/yudao-module-report-biz/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectServiceImplTest.java b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/test/java/cn/fuxiaoaio/ygg/module/report/service/goview/GoViewProjectServiceImplTest.java similarity index 84% rename from yudao-module-report/yudao-module-report-biz/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectServiceImplTest.java rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/test/java/cn/fuxiaoaio/ygg/module/report/service/goview/GoViewProjectServiceImplTest.java index 2f6bfae7b..f5e117ff5 100644 --- a/yudao-module-report/yudao-module-report-biz/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectServiceImplTest.java +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/test/java/cn/fuxiaoaio/ygg/module/report/service/goview/GoViewProjectServiceImplTest.java @@ -1,22 +1,22 @@ -package cn.iocoder.yudao.module.report.service.goview; +package cn.fuxiaoaio.ygg.module.report.service.goview; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectCreateReqVO; -import cn.iocoder.yudao.module.report.controller.admin.goview.vo.project.GoViewProjectUpdateReqVO; -import cn.iocoder.yudao.module.report.dal.dataobject.goview.GoViewProjectDO; -import cn.iocoder.yudao.module.report.dal.mysql.goview.GoViewProjectMapper; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.report.controller.admin.goview.vo.project.GoViewProjectCreateReqVO; +import cn.fuxiaoaio.ygg.module.report.controller.admin.goview.vo.project.GoViewProjectUpdateReqVO; +import cn.fuxiaoaio.ygg.module.report.dal.dataobject.goview.GoViewProjectDO; +import cn.fuxiaoaio.ygg.module.report.dal.mysql.goview.GoViewProjectMapper; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; import javax.annotation.Resource; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; -import static cn.iocoder.yudao.module.report.enums.ErrorCodeConstants.GO_VIEW_PROJECT_NOT_EXISTS; +import static cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils.cloneIgnoreId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.module.report.enums.ErrorCodeConstants.GO_VIEW_PROJECT_NOT_EXISTS; import static org.junit.jupiter.api.Assertions.*; /** diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/application-unit-test.yaml b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/test/resources/application-unit-test.yaml similarity index 91% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/application-unit-test.yaml rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/test/resources/application-unit-test.yaml index 93e037aab..22a819453 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/application-unit-test.yaml +++ b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/test/resources/application-unit-test.yaml @@ -8,7 +8,7 @@ spring: spring: # 数据源配置项 datasource: - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:h2:mem:testdb;MODE=MYSQL;DATABASE_TO_UPPER=false;NON_KEYWORDS=value; # MODE 使用 MySQL 模式；DATABASE_TO_UPPER 配置表和字段使用小写 driver-class-name: org.h2.Driver username: sa @@ -28,7 +28,7 @@ spring: mybatis-plus: lazy-initialization: true # 单元测试，设置 MyBatis Mapper 延迟加载，加速每个单元测试 - type-aliases-package: ${yudao.info.base-package}.module.*.dal.dataobject + type-aliases-package: ${fuxiaoaio.info.base-package}.module.*.dal.dataobject global-config: db-config: id-type: AUTO # H2 主键递增 @@ -48,6 +48,6 @@ mybatis-plus: --- #################### 芋道相关配置 #################### # 芋道配置项，设置当前项目所有自定义的配置 -yudao: +fuxiaoaio: info: - base-package: cn.iocoder.yudao + base-package: cn.fuxiaoaio.ygg diff --git a/yudao-module-report/yudao-module-report-biz/src/test/resources/logback.xml b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/test/resources/logback.xml similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/test/resources/logback.xml rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/test/resources/logback.xml diff --git a/yudao-module-report/yudao-module-report-biz/src/test/resources/sql/clean.sql b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/test/resources/sql/clean.sql similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/test/resources/sql/clean.sql rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/test/resources/sql/clean.sql diff --git a/yudao-module-report/yudao-module-report-biz/src/test/resources/sql/create_tables.sql b/fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/test/resources/sql/create_tables.sql similarity index 100% rename from yudao-module-report/yudao-module-report-biz/src/test/resources/sql/create_tables.sql rename to fuxiaoaio-module-report/fuxiaoaio-module-report-biz/src/test/resources/sql/create_tables.sql diff --git a/yudao-module-report/pom.xml b/fuxiaoaio-module-report/pom.xml similarity index 70% rename from yudao-module-report/pom.xml rename to fuxiaoaio-module-report/pom.xml index 2c8aecedc..1c60693bd 100644 --- a/yudao-module-report/pom.xml +++ b/fuxiaoaio-module-report/pom.xml @@ -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"> - cn.iocoder.cloud - yudao + cn.fuxiaoaio.ygg + fuxiaoaio ${revision} 4.0.0 - yudao-module-report-api - yudao-module-report-biz + fuxiaoaio-module-report-api + fuxiaoaio-module-report-biz - yudao-module-report + fuxiaoaio-module-report pom ${project.artifactId} diff --git a/yudao-module-system/yudao-module-system-api/pom.xml b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/pom.xml similarity index 84% rename from yudao-module-system/yudao-module-system-api/pom.xml rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/pom.xml index dcd4132ed..c41d5a429 100644 --- a/yudao-module-system/yudao-module-system-api/pom.xml +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/pom.xml @@ -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"> - cn.iocoder.cloud - yudao-module-system + cn.fuxiaoaio.ygg + fuxiaoaio-module-system ${revision} 4.0.0 - yudao-module-system-api + fuxiaoaio-module-system-api jar ${project.artifactId} @@ -18,8 +18,8 @@ - cn.iocoder.cloud - yudao-common + cn.fuxiaoaio.ygg + fuxiaoaio-common diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApi.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/dept/DeptApi.java similarity index 85% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApi.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/dept/DeptApi.java index affa89ea1..cc86bb192 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApi.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/dept/DeptApi.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.system.api.dept; +package cn.fuxiaoaio.ygg.module.system.api.dept; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; -import cn.iocoder.yudao.module.system.enums.ApiConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.module.system.api.dept.dto.DeptRespDTO; +import cn.fuxiaoaio.ygg.module.system.enums.ApiConstants; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/PostApi.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/dept/PostApi.java similarity index 82% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/PostApi.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/dept/PostApi.java index 73d3d38a9..de2b48b64 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/PostApi.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/dept/PostApi.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.api.dept; +package cn.fuxiaoaio.ygg.module.system.api.dept; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.enums.ApiConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.enums.ApiConstants; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/dto/DeptRespDTO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/dept/dto/DeptRespDTO.java similarity index 80% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/dto/DeptRespDTO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/dept/dto/DeptRespDTO.java index d3e66fdd8..c21aae637 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/dto/DeptRespDTO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/dept/dto/DeptRespDTO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.api.dept.dto; +package cn.fuxiaoaio.ygg.module.system.api.dept.dto; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; import lombok.Data; /** diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApi.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/dict/DictDataApi.java similarity index 90% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApi.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/dict/DictDataApi.java index 246aa2db3..9dcb7e8e3 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApi.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/dict/DictDataApi.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.system.api.dict; +package cn.fuxiaoaio.ygg.module.system.api.dict; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.Operation; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO; -import cn.iocoder.yudao.module.system.enums.ApiConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.api.dict.dto.DictDataRespDTO; +import cn.fuxiaoaio.ygg.module.system.enums.ApiConstants; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dict/dto/DictDataRespDTO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/dict/dto/DictDataRespDTO.java similarity index 85% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dict/dto/DictDataRespDTO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/dict/dto/DictDataRespDTO.java index 45da86691..d55f47e87 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dict/dto/DictDataRespDTO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/dict/dto/DictDataRespDTO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.api.dict.dto; +package cn.fuxiaoaio.ygg.module.system.api.dict.dto; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApi.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/errorcode/ErrorCodeApi.java similarity index 85% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApi.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/errorcode/ErrorCodeApi.java index 202fee02a..f24868672 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApi.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/errorcode/ErrorCodeApi.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.system.api.errorcode; +package cn.fuxiaoaio.ygg.module.system.api.errorcode; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeAutoGenerateReqDTO; -import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeRespDTO; -import cn.iocoder.yudao.module.system.enums.ApiConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.api.errorcode.dto.ErrorCodeAutoGenerateReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.errorcode.dto.ErrorCodeRespDTO; +import cn.fuxiaoaio.ygg.module.system.enums.ApiConstants; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/dto/ErrorCodeAutoGenerateReqDTO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/errorcode/dto/ErrorCodeAutoGenerateReqDTO.java similarity index 91% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/dto/ErrorCodeAutoGenerateReqDTO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/errorcode/dto/ErrorCodeAutoGenerateReqDTO.java index da4df83ca..a09a493aa 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/dto/ErrorCodeAutoGenerateReqDTO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/errorcode/dto/ErrorCodeAutoGenerateReqDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.api.errorcode.dto; +package cn.fuxiaoaio.ygg.module.system.api.errorcode.dto; import lombok.Data; import lombok.experimental.Accessors; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/dto/ErrorCodeRespDTO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/errorcode/dto/ErrorCodeRespDTO.java similarity index 86% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/dto/ErrorCodeRespDTO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/errorcode/dto/ErrorCodeRespDTO.java index 99372300b..771943b95 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/dto/ErrorCodeRespDTO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/errorcode/dto/ErrorCodeRespDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.api.errorcode.dto; +package cn.fuxiaoaio.ygg.module.system.api.errorcode.dto; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/LoginLogApi.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/logger/LoginLogApi.java similarity index 74% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/LoginLogApi.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/logger/LoginLogApi.java index f6dd7829b..1ab3cde84 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/LoginLogApi.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/logger/LoginLogApi.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.api.logger; +package cn.fuxiaoaio.ygg.module.system.api.logger; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.api.logger.dto.LoginLogCreateReqDTO; -import cn.iocoder.yudao.module.system.enums.ApiConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.api.logger.dto.LoginLogCreateReqDTO; +import cn.fuxiaoaio.ygg.module.system.enums.ApiConstants; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import org.springframework.cloud.openfeign.FeignClient; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApi.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/logger/OperateLogApi.java similarity index 75% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApi.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/logger/OperateLogApi.java index 9c28cd1f3..c45ab8199 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApi.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/logger/OperateLogApi.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.api.logger; +package cn.fuxiaoaio.ygg.module.system.api.logger; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.api.logger.dto.OperateLogCreateReqDTO; -import cn.iocoder.yudao.module.system.enums.ApiConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.api.logger.dto.OperateLogCreateReqDTO; +import cn.fuxiaoaio.ygg.module.system.enums.ApiConstants; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import org.springframework.cloud.openfeign.FeignClient; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/LoginLogCreateReqDTO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/logger/dto/LoginLogCreateReqDTO.java similarity index 95% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/LoginLogCreateReqDTO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/logger/dto/LoginLogCreateReqDTO.java index e8d380f56..98a2f03f1 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/LoginLogCreateReqDTO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/logger/dto/LoginLogCreateReqDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.api.logger.dto; +package cn.fuxiaoaio.ygg.module.system.api.logger.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -28,7 +28,7 @@ public class LoginLogCreateReqDTO { @Schema(description = "用户类型,参见 UserTypeEnum 枚举", required = true, example = "2" ) @NotNull(message = "用户类型不能为空") private Integer userType; - @Schema(description = "用户账号", required = true, example = "yudao") + @Schema(description = "用户账号", required = true, example = "fuxiaoaio") @NotBlank(message = "用户账号不能为空") @Size(max = 30, message = "用户账号长度不能超过30个字符") private String username; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogCreateReqDTO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/logger/dto/OperateLogCreateReqDTO.java similarity index 96% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogCreateReqDTO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/logger/dto/OperateLogCreateReqDTO.java index 712aadfa3..c10b49422 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogCreateReqDTO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/logger/dto/OperateLogCreateReqDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.api.logger.dto; +package cn.fuxiaoaio.ygg.module.system.api.logger.dto; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -57,7 +57,7 @@ public class OperateLogCreateReqDTO { @NotEmpty(message = "浏览器 UserAgent 不能为空") private String userAgent; - @Schema(description = "Java 方法名", required = true, example = "cn.iocoder.yudao.UserController.save(...)") + @Schema(description = "Java 方法名", required = true, example = "cn.fuxiaoaio.ygg.UserController.save(...)") @NotEmpty(message = "Java 方法名不能为空") private String javaMethod; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApi.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/mail/MailSendApi.java similarity index 81% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApi.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/mail/MailSendApi.java index 56f9a8b56..81155c134 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApi.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/mail/MailSendApi.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.api.mail; +package cn.fuxiaoaio.ygg.module.system.api.mail; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.api.mail.dto.MailSendSingleToUserReqDTO; -import cn.iocoder.yudao.module.system.enums.ApiConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.api.mail.dto.MailSendSingleToUserReqDTO; +import cn.fuxiaoaio.ygg.module.system.enums.ApiConstants; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import org.springframework.cloud.openfeign.FeignClient; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java similarity index 94% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java index 230fc2f86..9714119e8 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.api.mail.dto; +package cn.fuxiaoaio.ygg.module.system.api.mail.dto; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/notify/NotifyMessageSendApi.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/notify/NotifyMessageSendApi.java similarity index 79% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/notify/NotifyMessageSendApi.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/notify/NotifyMessageSendApi.java index 5535d6717..6de2e39fc 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/notify/NotifyMessageSendApi.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/notify/NotifyMessageSendApi.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.api.notify; +package cn.fuxiaoaio.ygg.module.system.api.notify; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.api.notify.dto.NotifySendSingleToUserReqDTO; -import cn.iocoder.yudao.module.system.enums.ApiConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.api.notify.dto.NotifySendSingleToUserReqDTO; +import cn.fuxiaoaio.ygg.module.system.enums.ApiConstants; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import org.springframework.cloud.openfeign.FeignClient; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/notify/dto/NotifySendSingleToUserReqDTO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/notify/dto/NotifySendSingleToUserReqDTO.java similarity index 93% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/notify/dto/NotifySendSingleToUserReqDTO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/notify/dto/NotifySendSingleToUserReqDTO.java index 22e9bee44..d533603d1 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/notify/dto/NotifySendSingleToUserReqDTO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/notify/dto/NotifySendSingleToUserReqDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.api.notify.dto; +package cn.fuxiaoaio.ygg.module.system.api.notify.dto; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/OAuth2TokenApi.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/oauth2/OAuth2TokenApi.java similarity index 83% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/OAuth2TokenApi.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/oauth2/OAuth2TokenApi.java index 55d64dd1b..395446935 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/OAuth2TokenApi.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/oauth2/OAuth2TokenApi.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.api.oauth2; +package cn.fuxiaoaio.ygg.module.system.api.oauth2; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.api.oauth2.dto.OAuth2AccessTokenCheckRespDTO; -import cn.iocoder.yudao.module.system.api.oauth2.dto.OAuth2AccessTokenCreateReqDTO; -import cn.iocoder.yudao.module.system.api.oauth2.dto.OAuth2AccessTokenRespDTO; -import cn.iocoder.yudao.module.system.enums.ApiConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.api.oauth2.dto.OAuth2AccessTokenCheckRespDTO; +import cn.fuxiaoaio.ygg.module.system.api.oauth2.dto.OAuth2AccessTokenCreateReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.oauth2.dto.OAuth2AccessTokenRespDTO; +import cn.fuxiaoaio.ygg.module.system.enums.ApiConstants; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -44,7 +44,7 @@ public interface OAuth2TokenApi { @Operation(summary = "刷新访问令牌") @Parameters({ @Parameter(name = "refreshToken", description = "刷新令牌", required = true, example = "haha"), - @Parameter(name = "clientId", description = "客户端编号", required = true, example = "yudaoyuanma") + @Parameter(name = "clientId", description = "客户端编号", required = true, example = "fuxiaoaioyuanma") }) CommonResult refreshAccessToken(@RequestParam("refreshToken") String refreshToken, @RequestParam("clientId") String clientId); diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/dto/OAuth2AccessTokenCheckRespDTO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/oauth2/dto/OAuth2AccessTokenCheckRespDTO.java similarity index 93% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/dto/OAuth2AccessTokenCheckRespDTO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/oauth2/dto/OAuth2AccessTokenCheckRespDTO.java index 3478aee03..175ae796d 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/dto/OAuth2AccessTokenCheckRespDTO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/oauth2/dto/OAuth2AccessTokenCheckRespDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.api.oauth2.dto; +package cn.fuxiaoaio.ygg.module.system.api.oauth2.dto; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/dto/OAuth2AccessTokenCreateReqDTO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/oauth2/dto/OAuth2AccessTokenCreateReqDTO.java similarity index 83% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/dto/OAuth2AccessTokenCreateReqDTO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/oauth2/dto/OAuth2AccessTokenCreateReqDTO.java index f2264e11e..73c6c1895 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/dto/OAuth2AccessTokenCreateReqDTO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/oauth2/dto/OAuth2AccessTokenCreateReqDTO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.api.oauth2.dto; +package cn.fuxiaoaio.ygg.module.system.api.oauth2.dto; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.common.validation.InEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.validation.InEnum; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -23,7 +23,7 @@ public class OAuth2AccessTokenCreateReqDTO implements Serializable { @InEnum(value = UserTypeEnum.class, message = "用户类型必须是 {value}") private Integer userType; - @Schema(description = "客户端编号", required = true, example = "yudaoyuanma") + @Schema(description = "客户端编号", required = true, example = "fuxiaoaioyuanma") @NotNull(message = "客户端编号不能为空") private String clientId; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/dto/OAuth2AccessTokenRespDTO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/oauth2/dto/OAuth2AccessTokenRespDTO.java similarity index 94% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/dto/OAuth2AccessTokenRespDTO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/oauth2/dto/OAuth2AccessTokenRespDTO.java index baeb97a00..d41c90ae1 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/dto/OAuth2AccessTokenRespDTO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/oauth2/dto/OAuth2AccessTokenRespDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.api.oauth2.dto; +package cn.fuxiaoaio.ygg.module.system.api.oauth2.dto; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/package-info.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/package-info.java similarity index 58% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/package-info.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/package-info.java index 25bfc4441..52db981bd 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/package-info.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/package-info.java @@ -1,4 +1,4 @@ /** * System API 包，定义暴露给其它模块的 API */ -package cn.iocoder.yudao.module.system.api; +package cn.fuxiaoaio.ygg.module.system.api; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/permission/PermissionApi.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/permission/PermissionApi.java similarity index 90% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/permission/PermissionApi.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/permission/PermissionApi.java index 9b023acc4..dcb3a2536 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/permission/PermissionApi.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/permission/PermissionApi.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.api.permission; +package cn.fuxiaoaio.ygg.module.system.api.permission; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.api.permission.dto.DeptDataPermissionRespDTO; -import cn.iocoder.yudao.module.system.enums.ApiConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.api.permission.dto.DeptDataPermissionRespDTO; +import cn.fuxiaoaio.ygg.module.system.enums.ApiConstants; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/permission/RoleApi.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/permission/RoleApi.java similarity index 82% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/permission/RoleApi.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/permission/RoleApi.java index 33c6fa23e..357409962 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/permission/RoleApi.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/permission/RoleApi.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.api.permission; +package cn.fuxiaoaio.ygg.module.system.api.permission; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.enums.ApiConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.enums.ApiConstants; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/permission/dto/DeptDataPermissionRespDTO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/permission/dto/DeptDataPermissionRespDTO.java similarity index 90% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/permission/dto/DeptDataPermissionRespDTO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/permission/dto/DeptDataPermissionRespDTO.java index 5650e89b9..9ab298354 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/permission/dto/DeptDataPermissionRespDTO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/permission/dto/DeptDataPermissionRespDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.api.permission.dto; +package cn.fuxiaoaio.ygg.module.system.api.permission.dto; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sensitiveword/SensitiveWordApi.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sensitiveword/SensitiveWordApi.java similarity index 90% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sensitiveword/SensitiveWordApi.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sensitiveword/SensitiveWordApi.java index 35b6b3f5c..ee4cdd320 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sensitiveword/SensitiveWordApi.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sensitiveword/SensitiveWordApi.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.api.sensitiveword; +package cn.fuxiaoaio.ygg.module.system.api.sensitiveword; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.enums.ApiConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.enums.ApiConstants; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsCodeApi.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sms/SmsCodeApi.java similarity index 77% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsCodeApi.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sms/SmsCodeApi.java index a68865201..5e2dea2a0 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsCodeApi.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sms/SmsCodeApi.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.api.sms; +package cn.fuxiaoaio.ygg.module.system.api.sms; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeValidateReqDTO; -import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeSendReqDTO; -import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeUseReqDTO; -import cn.iocoder.yudao.module.system.enums.ApiConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.api.sms.dto.code.SmsCodeValidateReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.sms.dto.code.SmsCodeSendReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.sms.dto.code.SmsCodeUseReqDTO; +import cn.fuxiaoaio.ygg.module.system.enums.ApiConstants; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import org.springframework.cloud.openfeign.FeignClient; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsSendApi.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sms/SmsSendApi.java similarity index 82% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsSendApi.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sms/SmsSendApi.java index 93faa18f1..c8fbf56bf 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsSendApi.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sms/SmsSendApi.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.api.sms; +package cn.fuxiaoaio.ygg.module.system.api.sms; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.api.sms.dto.send.SmsSendSingleToUserReqDTO; -import cn.iocoder.yudao.module.system.enums.ApiConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.api.sms.dto.send.SmsSendSingleToUserReqDTO; +import cn.fuxiaoaio.ygg.module.system.enums.ApiConstants; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import org.springframework.cloud.openfeign.FeignClient; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeSendReqDTO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sms/dto/code/SmsCodeSendReqDTO.java similarity index 77% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeSendReqDTO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sms/dto/code/SmsCodeSendReqDTO.java index 2c0779f1b..0cd73c7af 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeSendReqDTO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sms/dto/code/SmsCodeSendReqDTO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.api.sms.dto.code; +package cn.fuxiaoaio.ygg.module.system.api.sms.dto.code; -import cn.iocoder.yudao.framework.common.validation.InEnum; -import cn.iocoder.yudao.framework.common.validation.Mobile; -import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum; +import cn.fuxiaoaio.ygg.framework.common.validation.InEnum; +import cn.fuxiaoaio.ygg.framework.common.validation.Mobile; +import cn.fuxiaoaio.ygg.module.system.enums.sms.SmsSceneEnum; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeUseReqDTO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sms/dto/code/SmsCodeUseReqDTO.java similarity index 80% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeUseReqDTO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sms/dto/code/SmsCodeUseReqDTO.java index b2641afd5..67bec4e75 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeUseReqDTO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sms/dto/code/SmsCodeUseReqDTO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.api.sms.dto.code; +package cn.fuxiaoaio.ygg.module.system.api.sms.dto.code; -import cn.iocoder.yudao.framework.common.validation.InEnum; -import cn.iocoder.yudao.framework.common.validation.Mobile; -import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum; +import cn.fuxiaoaio.ygg.framework.common.validation.InEnum; +import cn.fuxiaoaio.ygg.framework.common.validation.Mobile; +import cn.fuxiaoaio.ygg.module.system.enums.sms.SmsSceneEnum; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeValidateReqDTO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sms/dto/code/SmsCodeValidateReqDTO.java similarity index 77% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeValidateReqDTO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sms/dto/code/SmsCodeValidateReqDTO.java index 9fba60262..34882d438 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/code/SmsCodeValidateReqDTO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sms/dto/code/SmsCodeValidateReqDTO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.api.sms.dto.code; +package cn.fuxiaoaio.ygg.module.system.api.sms.dto.code; -import cn.iocoder.yudao.framework.common.validation.InEnum; -import cn.iocoder.yudao.framework.common.validation.Mobile; -import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum; +import cn.fuxiaoaio.ygg.framework.common.validation.InEnum; +import cn.fuxiaoaio.ygg.framework.common.validation.Mobile; +import cn.fuxiaoaio.ygg.module.system.enums.sms.SmsSceneEnum; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java similarity index 87% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java index 45538386b..92493c0a6 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.api.sms.dto.send; +package cn.fuxiaoaio.ygg.module.system.api.sms.dto.send; -import cn.iocoder.yudao.framework.common.validation.Mobile; +import cn.fuxiaoaio.ygg.framework.common.validation.Mobile; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialUserApi.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/social/SocialUserApi.java similarity index 88% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialUserApi.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/social/SocialUserApi.java index 00432635f..eae8b76d4 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialUserApi.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/social/SocialUserApi.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.system.api.social; +package cn.fuxiaoaio.ygg.module.system.api.social; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.api.social.dto.SocialUserBindReqDTO; -import cn.iocoder.yudao.module.system.api.social.dto.SocialUserUnbindReqDTO; -import cn.iocoder.yudao.module.system.enums.ApiConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.api.social.dto.SocialUserBindReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.social.dto.SocialUserUnbindReqDTO; +import cn.fuxiaoaio.ygg.module.system.enums.ApiConstants; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/dto/SocialUserBindReqDTO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/social/dto/SocialUserBindReqDTO.java similarity index 80% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/dto/SocialUserBindReqDTO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/social/dto/SocialUserBindReqDTO.java index a3bb6b315..08e8fcb6d 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/dto/SocialUserBindReqDTO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/social/dto/SocialUserBindReqDTO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.api.social.dto; +package cn.fuxiaoaio.ygg.module.system.api.social.dto; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.common.validation.InEnum; -import cn.iocoder.yudao.module.system.enums.social.SocialTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.validation.InEnum; +import cn.fuxiaoaio.ygg.module.system.enums.social.SocialTypeEnum; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/dto/SocialUserUnbindReqDTO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/social/dto/SocialUserUnbindReqDTO.java similarity index 77% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/dto/SocialUserUnbindReqDTO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/social/dto/SocialUserUnbindReqDTO.java index 56398a8ae..8fa62fd1e 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/dto/SocialUserUnbindReqDTO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/social/dto/SocialUserUnbindReqDTO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.api.social.dto; +package cn.fuxiaoaio.ygg.module.system.api.social.dto; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.common.validation.InEnum; -import cn.iocoder.yudao.module.system.enums.social.SocialTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.validation.InEnum; +import cn.fuxiaoaio.ygg.module.system.enums.social.SocialTypeEnum; import lombok.Data; import javax.validation.constraints.NotEmpty; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/tenant/TenantApi.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/tenant/TenantApi.java similarity index 84% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/tenant/TenantApi.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/tenant/TenantApi.java index 213926392..b44b2afe9 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/tenant/TenantApi.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/tenant/TenantApi.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.api.tenant; +package cn.fuxiaoaio.ygg.module.system.api.tenant; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.enums.ApiConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.enums.ApiConstants; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/user/AdminUserApi.java similarity index 89% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/user/AdminUserApi.java index f84773312..523b90549 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/user/AdminUserApi.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.system.api.user; +package cn.fuxiaoaio.ygg.module.system.api.user; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; -import cn.iocoder.yudao.module.system.enums.ApiConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.module.system.api.user.dto.AdminUserRespDTO; +import cn.fuxiaoaio.ygg.module.system.enums.ApiConstants; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/dto/AdminUserRespDTO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/user/dto/AdminUserRespDTO.java similarity index 83% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/dto/AdminUserRespDTO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/user/dto/AdminUserRespDTO.java index ac13c3a8b..5b83b1ac1 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/dto/AdminUserRespDTO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/api/user/dto/AdminUserRespDTO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.api.user.dto; +package cn.fuxiaoaio.ygg.module.system.api.user.dto; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; import lombok.Data; import java.util.Set; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ApiConstants.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/ApiConstants.java similarity index 78% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ApiConstants.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/ApiConstants.java index 8f7decf59..0b7869858 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ApiConstants.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/ApiConstants.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.enums; +package cn.fuxiaoaio.ygg.module.system.enums; -import cn.iocoder.yudao.framework.common.enums.RpcConstants; +import cn.fuxiaoaio.ygg.framework.common.enums.RpcConstants; /** * API 相关的枚举 diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/DictTypeConstants.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/DictTypeConstants.java similarity index 95% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/DictTypeConstants.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/DictTypeConstants.java index c0e342383..b06f69871 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/DictTypeConstants.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/DictTypeConstants.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.enums; +package cn.fuxiaoaio.ygg.module.system.enums; /** * System 字典类型的枚举类 diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/ErrorCodeConstants.java similarity index 99% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/ErrorCodeConstants.java index 050ccbf5b..1ef778440 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/ErrorCodeConstants.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.enums; +package cn.fuxiaoaio.ygg.module.system.enums; -import cn.iocoder.yudao.framework.common.exception.ErrorCode; +import cn.fuxiaoaio.ygg.framework.common.exception.ErrorCode; /** * System 错误码枚举类 diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/common/SexEnum.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/common/SexEnum.java similarity index 85% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/common/SexEnum.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/common/SexEnum.java index f6120c418..d4ad3b534 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/common/SexEnum.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/common/SexEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.enums.common; +package cn.fuxiaoaio.ygg.module.system.enums.common; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/dept/DeptIdEnum.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/dept/DeptIdEnum.java similarity index 81% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/dept/DeptIdEnum.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/dept/DeptIdEnum.java index 2a7effec2..a55651717 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/dept/DeptIdEnum.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/dept/DeptIdEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.enums.dept; +package cn.fuxiaoaio.ygg.module.system.enums.dept; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/errorcode/ErrorCodeTypeEnum.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/errorcode/ErrorCodeTypeEnum.java similarity index 83% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/errorcode/ErrorCodeTypeEnum.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/errorcode/ErrorCodeTypeEnum.java index 97349e763..c0edf9e30 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/errorcode/ErrorCodeTypeEnum.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/errorcode/ErrorCodeTypeEnum.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.enums.errorcode; +package cn.fuxiaoaio.ygg.module.system.enums.errorcode; -import cn.iocoder.yudao.framework.common.core.IntArrayValuable; +import cn.fuxiaoaio.ygg.framework.common.core.IntArrayValuable; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/logger/LoginLogTypeEnum.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/logger/LoginLogTypeEnum.java similarity index 90% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/logger/LoginLogTypeEnum.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/logger/LoginLogTypeEnum.java index 4c51f9168..83e44b488 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/logger/LoginLogTypeEnum.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/logger/LoginLogTypeEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.enums.logger; +package cn.fuxiaoaio.ygg.module.system.enums.logger; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/logger/LoginResultEnum.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/logger/LoginResultEnum.java similarity index 90% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/logger/LoginResultEnum.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/logger/LoginResultEnum.java index 7084e13da..61acf3ab1 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/logger/LoginResultEnum.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/logger/LoginResultEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.enums.logger; +package cn.fuxiaoaio.ygg.module.system.enums.logger; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/mail/MailSendStatusEnum.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/mail/MailSendStatusEnum.java similarity index 88% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/mail/MailSendStatusEnum.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/mail/MailSendStatusEnum.java index 7cb16edef..8ee806886 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/mail/MailSendStatusEnum.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/mail/MailSendStatusEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.enums.mail; +package cn.fuxiaoaio.ygg.module.system.enums.mail; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/notice/NoticeTypeEnum.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/notice/NoticeTypeEnum.java similarity index 83% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/notice/NoticeTypeEnum.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/notice/NoticeTypeEnum.java index 9a2a3c462..e985070d8 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/notice/NoticeTypeEnum.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/notice/NoticeTypeEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.enums.notice; +package cn.fuxiaoaio.ygg.module.system.enums.notice; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/oauth2/OAuth2ClientConstants.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/oauth2/OAuth2ClientConstants.java similarity index 75% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/oauth2/OAuth2ClientConstants.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/oauth2/OAuth2ClientConstants.java index a123d57b9..c22974833 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/oauth2/OAuth2ClientConstants.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/oauth2/OAuth2ClientConstants.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.enums.oauth2; +package cn.fuxiaoaio.ygg.module.system.enums.oauth2; /** * OAuth2.0 客户端的通用枚举 diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/oauth2/OAuth2GrantTypeEnum.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/oauth2/OAuth2GrantTypeEnum.java similarity index 93% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/oauth2/OAuth2GrantTypeEnum.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/oauth2/OAuth2GrantTypeEnum.java index 80ce4610b..20505ad40 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/oauth2/OAuth2GrantTypeEnum.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/oauth2/OAuth2GrantTypeEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.enums.oauth2; +package cn.fuxiaoaio.ygg.module.system.enums.oauth2; import cn.hutool.core.util.ArrayUtil; import lombok.AllArgsConstructor; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/permission/DataScopeEnum.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/permission/DataScopeEnum.java similarity index 89% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/permission/DataScopeEnum.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/permission/DataScopeEnum.java index 7146b98ef..0b3578fd0 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/permission/DataScopeEnum.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/permission/DataScopeEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.enums.permission; +package cn.fuxiaoaio.ygg.module.system.enums.permission; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/permission/MenuTypeEnum.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/permission/MenuTypeEnum.java similarity index 84% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/permission/MenuTypeEnum.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/permission/MenuTypeEnum.java index 575a33c44..bd55014c6 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/permission/MenuTypeEnum.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/permission/MenuTypeEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.enums.permission; +package cn.fuxiaoaio.ygg.module.system.enums.permission; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/permission/RoleCodeEnum.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/permission/RoleCodeEnum.java similarity index 81% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/permission/RoleCodeEnum.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/permission/RoleCodeEnum.java index b13b3b71a..82501d6d8 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/permission/RoleCodeEnum.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/permission/RoleCodeEnum.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.enums.permission; +package cn.fuxiaoaio.ygg.module.system.enums.permission; -import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; +import cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/permission/RoleTypeEnum.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/permission/RoleTypeEnum.java similarity index 81% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/permission/RoleTypeEnum.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/permission/RoleTypeEnum.java index 1607b20b3..c177ae3a9 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/permission/RoleTypeEnum.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/permission/RoleTypeEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.enums.permission; +package cn.fuxiaoaio.ygg.module.system.enums.permission; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/sms/SmsReceiveStatusEnum.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/sms/SmsReceiveStatusEnum.java similarity index 87% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/sms/SmsReceiveStatusEnum.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/sms/SmsReceiveStatusEnum.java index 581ee6f9a..2064d73b7 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/sms/SmsReceiveStatusEnum.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/sms/SmsReceiveStatusEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.enums.sms; +package cn.fuxiaoaio.ygg.module.system.enums.sms; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/sms/SmsSceneEnum.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/sms/SmsSceneEnum.java similarity index 91% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/sms/SmsSceneEnum.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/sms/SmsSceneEnum.java index 9a674c89f..610c4a363 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/sms/SmsSceneEnum.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/sms/SmsSceneEnum.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.enums.sms; +package cn.fuxiaoaio.ygg.module.system.enums.sms; 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; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/sms/SmsSendStatusEnum.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/sms/SmsSendStatusEnum.java similarity index 88% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/sms/SmsSendStatusEnum.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/sms/SmsSendStatusEnum.java index 307c9f6b7..82cdde0cd 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/sms/SmsSendStatusEnum.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/sms/SmsSendStatusEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.enums.sms; +package cn.fuxiaoaio.ygg.module.system.enums.sms; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/sms/SmsTemplateTypeEnum.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/sms/SmsTemplateTypeEnum.java similarity index 87% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/sms/SmsTemplateTypeEnum.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/sms/SmsTemplateTypeEnum.java index d24b07a9e..f08d39b81 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/sms/SmsTemplateTypeEnum.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/sms/SmsTemplateTypeEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.enums.sms; +package cn.fuxiaoaio.ygg.module.system.enums.sms; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/social/SocialTypeEnum.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/social/SocialTypeEnum.java similarity index 94% rename from yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/social/SocialTypeEnum.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/social/SocialTypeEnum.java index 77833b2e6..0f47d201c 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/social/SocialTypeEnum.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-api/src/main/java/cn/fuxiaoaio/ygg/module/system/enums/social/SocialTypeEnum.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.enums.social; +package cn.fuxiaoaio.ygg.module.system.enums.social; 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; diff --git a/yudao-module-system/yudao-module-system-biz/pom.xml b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/pom.xml similarity index 57% rename from yudao-module-system/yudao-module-system-biz/pom.xml rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/pom.xml index e30a32d94..23464abec 100644 --- a/yudao-module-system/yudao-module-system-biz/pom.xml +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/pom.xml @@ -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"> - cn.iocoder.cloud - yudao-module-system + cn.fuxiaoaio.ygg + fuxiaoaio-module-system ${revision} 4.0.0 - yudao-module-system-biz + fuxiaoaio-module-system-biz jar ${project.artifactId} @@ -25,81 +25,81 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-env + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-env - cn.iocoder.cloud - yudao-module-system-api + cn.fuxiaoaio.ygg + fuxiaoaio-module-system-api ${revision} - cn.iocoder.cloud - yudao-module-infra-api + cn.fuxiaoaio.ygg + fuxiaoaio-module-infra-api ${revision} - cn.iocoder.cloud - yudao-spring-boot-starter-banner + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-banner - cn.iocoder.cloud - yudao-spring-boot-starter-biz-operatelog + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-operatelog - cn.iocoder.cloud - yudao-spring-boot-starter-biz-sms + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-sms - cn.iocoder.cloud - yudao-spring-boot-starter-biz-dict + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-dict - cn.iocoder.cloud - yudao-spring-boot-starter-biz-data-permission + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-data-permission - cn.iocoder.cloud - yudao-spring-boot-starter-biz-social + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-social - cn.iocoder.cloud - yudao-spring-boot-starter-biz-tenant + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-tenant - cn.iocoder.cloud - yudao-spring-boot-starter-biz-error-code + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-error-code - cn.iocoder.cloud - yudao-spring-boot-starter-biz-ip + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-biz-ip - cn.iocoder.cloud - yudao-spring-boot-starter-security + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-security - cn.iocoder.cloud - yudao-spring-boot-starter-mybatis + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-mybatis - cn.iocoder.cloud - yudao-spring-boot-starter-redis + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-redis - cn.iocoder.cloud - yudao-spring-boot-starter-rpc + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-rpc @@ -116,38 +116,38 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-job + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-job - cn.iocoder.cloud - yudao-spring-boot-starter-mq + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-mq - - + + - cn.iocoder.cloud - yudao-spring-boot-starter-test + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-test test - cn.iocoder.cloud - yudao-spring-boot-starter-excel + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-excel - cn.iocoder.cloud - yudao-spring-boot-starter-captcha + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-captcha @@ -157,8 +157,8 @@ - cn.iocoder.cloud - yudao-spring-boot-starter-monitor + cn.fuxiaoaio.ygg + fuxiaoaio-spring-boot-starter-monitor diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/SystemServerApplication.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/SystemServerApplication.java similarity index 96% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/SystemServerApplication.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/SystemServerApplication.java index d2979d435..965d482ba 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/SystemServerApplication.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/SystemServerApplication.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system; +package cn.fuxiaoaio.ygg.module.system; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/dept/DeptApiImpl.java similarity index 69% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/dept/DeptApiImpl.java index e70818451..99cfe3f2f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/dept/DeptApiImpl.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.api.dept; +package cn.fuxiaoaio.ygg.module.system.api.dept; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; -import cn.iocoder.yudao.module.system.convert.dept.DeptConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; -import cn.iocoder.yudao.module.system.service.dept.DeptService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.api.dept.dto.DeptRespDTO; +import cn.fuxiaoaio.ygg.module.system.convert.dept.DeptConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.DeptDO; +import cn.fuxiaoaio.ygg.module.system.service.dept.DeptService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -13,8 +13,8 @@ import javax.annotation.Resource; import java.util.Collection; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.module.system.enums.ApiConstants.VERSION; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.module.system.enums.ApiConstants.VERSION; @RestController // 提供 RESTful API 接口，给 Feign 调用 @DubboService(version = VERSION) // 提供 Dubbo RPC 接口，给 Dubbo Consumer 调用 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/PostApiImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/dept/PostApiImpl.java similarity index 71% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/PostApiImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/dept/PostApiImpl.java index 9d3273445..8ffbff7ce 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/PostApiImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/dept/PostApiImpl.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.api.dept; +package cn.fuxiaoaio.ygg.module.system.api.dept; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.service.dept.PostService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.service.dept.PostService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.Collection; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.module.system.enums.ApiConstants.VERSION; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.module.system.enums.ApiConstants.VERSION; @RestController // 提供 RESTful API 接口，给 Feign 调用 @DubboService(version = VERSION) // 提供 Dubbo RPC 接口，给 Dubbo Consumer 调用 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApiImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/dict/DictDataApiImpl.java similarity index 72% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApiImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/dict/DictDataApiImpl.java index 886211796..765ac5f7b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApiImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/dict/DictDataApiImpl.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.api.dict; +package cn.fuxiaoaio.ygg.module.system.api.dict; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO; -import cn.iocoder.yudao.module.system.convert.dict.DictDataConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO; -import cn.iocoder.yudao.module.system.service.dict.DictDataService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.api.dict.dto.DictDataRespDTO; +import cn.fuxiaoaio.ygg.module.system.convert.dict.DictDataConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dict.DictDataDO; +import cn.fuxiaoaio.ygg.module.system.service.dict.DictDataService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.Collection; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.module.system.enums.ApiConstants.VERSION; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.module.system.enums.ApiConstants.VERSION; @RestController // 提供 RESTful API 接口，给 Feign 调用 @DubboService(version = VERSION) // 提供 Dubbo RPC 接口，给 Dubbo Consumer 调用 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApiImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/errorcode/ErrorCodeApiImpl.java similarity index 71% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApiImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/errorcode/ErrorCodeApiImpl.java index 5ec9f3109..3161088a7 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApiImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/errorcode/ErrorCodeApiImpl.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.system.api.errorcode; +package cn.fuxiaoaio.ygg.module.system.api.errorcode; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeAutoGenerateReqDTO; -import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeRespDTO; -import cn.iocoder.yudao.module.system.service.errorcode.ErrorCodeService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.api.errorcode.dto.ErrorCodeAutoGenerateReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.errorcode.dto.ErrorCodeRespDTO; +import cn.fuxiaoaio.ygg.module.system.service.errorcode.ErrorCodeService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -12,8 +12,8 @@ import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.module.system.enums.ApiConstants.VERSION; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.module.system.enums.ApiConstants.VERSION; @RestController // 提供 RESTful API 接口，给 Feign 调用 @DubboService(version = VERSION) // 提供 Dubbo RPC 接口，给 Dubbo Consumer 调用 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/logger/LoginLogApiImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/logger/LoginLogApiImpl.java similarity index 67% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/logger/LoginLogApiImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/logger/LoginLogApiImpl.java index 5ab35dca6..277e99d31 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/logger/LoginLogApiImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/logger/LoginLogApiImpl.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.api.logger; +package cn.fuxiaoaio.ygg.module.system.api.logger; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.api.logger.dto.LoginLogCreateReqDTO; -import cn.iocoder.yudao.module.system.service.logger.LoginLogService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.api.logger.dto.LoginLogCreateReqDTO; +import cn.fuxiaoaio.ygg.module.system.service.logger.LoginLogService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.module.system.enums.ApiConstants.VERSION; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.module.system.enums.ApiConstants.VERSION; @RestController // 提供 RESTful API 接口，给 Feign 调用 @DubboService(version = VERSION) // 提供 Dubbo RPC 接口，给 Dubbo Consumer 调用 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApiImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/logger/OperateLogApiImpl.java similarity index 66% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApiImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/logger/OperateLogApiImpl.java index f756c92a2..a89ad8572 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApiImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/logger/OperateLogApiImpl.java @@ -1,16 +1,16 @@ -package cn.iocoder.yudao.module.system.api.logger; +package cn.fuxiaoaio.ygg.module.system.api.logger; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.api.logger.dto.OperateLogCreateReqDTO; -import cn.iocoder.yudao.module.system.service.logger.OperateLogService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.api.logger.dto.OperateLogCreateReqDTO; +import cn.fuxiaoaio.ygg.module.system.service.logger.OperateLogService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.module.system.enums.ApiConstants.VERSION; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.module.system.enums.ApiConstants.VERSION; @RestController // 提供 RESTful API 接口，给 Feign 调用 @DubboService(version = VERSION) // 提供 Dubbo RPC 接口，给 Dubbo Consumer 调用 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApiImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/mail/MailSendApiImpl.java similarity index 67% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApiImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/mail/MailSendApiImpl.java index 8c8c8335a..98ccd556f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApiImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/mail/MailSendApiImpl.java @@ -1,19 +1,19 @@ -package cn.iocoder.yudao.module.system.api.mail; +package cn.fuxiaoaio.ygg.module.system.api.mail; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.api.mail.dto.MailSendSingleToUserReqDTO; -import cn.iocoder.yudao.module.system.api.sms.SmsSendApi; -import cn.iocoder.yudao.module.system.api.sms.dto.send.SmsSendSingleToUserReqDTO; -import cn.iocoder.yudao.module.system.service.mail.MailSendService; -import cn.iocoder.yudao.module.system.service.sms.SmsSendService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.api.mail.dto.MailSendSingleToUserReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.sms.SmsSendApi; +import cn.fuxiaoaio.ygg.module.system.api.sms.dto.send.SmsSendSingleToUserReqDTO; +import cn.fuxiaoaio.ygg.module.system.service.mail.MailSendService; +import cn.fuxiaoaio.ygg.module.system.service.sms.SmsSendService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.module.system.enums.ApiConstants.VERSION; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.module.system.enums.ApiConstants.VERSION; @RestController // 提供 RESTful API 接口，给 Feign 调用 @DubboService(version = VERSION) // 提供 Dubbo RPC 接口，给 Dubbo Consumer 调用 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/notify/notify/NotifyMessageSendApiImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/notify/notify/NotifyMessageSendApiImpl.java similarity index 72% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/notify/notify/NotifyMessageSendApiImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/notify/notify/NotifyMessageSendApiImpl.java index 58fa1fea1..f1b9c9fe6 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/notify/notify/NotifyMessageSendApiImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/notify/notify/NotifyMessageSendApiImpl.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.system.api.notify.notify; +package cn.fuxiaoaio.ygg.module.system.api.notify.notify; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.api.notify.NotifyMessageSendApi; -import cn.iocoder.yudao.module.system.api.notify.dto.NotifySendSingleToUserReqDTO; -import cn.iocoder.yudao.module.system.service.notify.NotifySendService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.api.notify.NotifyMessageSendApi; +import cn.fuxiaoaio.ygg.module.system.api.notify.dto.NotifySendSingleToUserReqDTO; +import cn.fuxiaoaio.ygg.module.system.service.notify.NotifySendService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.module.system.enums.ApiConstants.VERSION; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.module.system.enums.ApiConstants.VERSION; @RestController // 提供 RESTful API 接口，给 Feign 调用 @DubboService(version = VERSION) // 提供 Dubbo RPC 接口，给 Dubbo Consumer 调用 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/OAuth2TokenApiImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/oauth2/OAuth2TokenApiImpl.java similarity index 75% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/OAuth2TokenApiImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/oauth2/OAuth2TokenApiImpl.java index 3c0e11829..e7b1403eb 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/OAuth2TokenApiImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/oauth2/OAuth2TokenApiImpl.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.system.api.oauth2; +package cn.fuxiaoaio.ygg.module.system.api.oauth2; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.api.oauth2.dto.OAuth2AccessTokenCheckRespDTO; -import cn.iocoder.yudao.module.system.api.oauth2.dto.OAuth2AccessTokenCreateReqDTO; -import cn.iocoder.yudao.module.system.api.oauth2.dto.OAuth2AccessTokenRespDTO; -import cn.iocoder.yudao.module.system.convert.auth.OAuth2TokenConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; -import cn.iocoder.yudao.module.system.service.oauth2.OAuth2TokenService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.api.oauth2.dto.OAuth2AccessTokenCheckRespDTO; +import cn.fuxiaoaio.ygg.module.system.api.oauth2.dto.OAuth2AccessTokenCreateReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.oauth2.dto.OAuth2AccessTokenRespDTO; +import cn.fuxiaoaio.ygg.module.system.convert.auth.OAuth2TokenConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; +import cn.fuxiaoaio.ygg.module.system.service.oauth2.OAuth2TokenService; import io.swagger.v3.oas.annotations.Operation; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.validation.annotation.Validated; @@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.module.system.enums.ApiConstants.VERSION; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.module.system.enums.ApiConstants.VERSION; @RestController // 提供 RESTful API 接口，给 Feign 调用 @DubboService(version = VERSION) // 提供 Dubbo RPC 接口，给 Dubbo Consumer 调用 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/permission/PermissionApiImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/permission/PermissionApiImpl.java similarity index 78% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/permission/PermissionApiImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/permission/PermissionApiImpl.java index fcdad6f29..50da44f77 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/permission/PermissionApiImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/permission/PermissionApiImpl.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.api.permission; +package cn.fuxiaoaio.ygg.module.system.api.permission; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.api.permission.dto.DeptDataPermissionRespDTO; -import cn.iocoder.yudao.module.system.service.permission.PermissionService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.api.permission.dto.DeptDataPermissionRespDTO; +import cn.fuxiaoaio.ygg.module.system.service.permission.PermissionService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -11,8 +11,8 @@ import javax.annotation.Resource; import java.util.Collection; import java.util.Set; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.*; -import static cn.iocoder.yudao.module.system.enums.ApiConstants.VERSION; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.*; +import static cn.fuxiaoaio.ygg.module.system.enums.ApiConstants.VERSION; @RestController // 提供 RESTful API 接口，给 Feign 调用 @DubboService(version = VERSION) // 提供 Dubbo RPC 接口，给 Dubbo Consumer 调用 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/permission/RoleApiImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/permission/RoleApiImpl.java similarity index 70% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/permission/RoleApiImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/permission/RoleApiImpl.java index e64d8b783..45a64dcad 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/permission/RoleApiImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/permission/RoleApiImpl.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.api.permission; +package cn.fuxiaoaio.ygg.module.system.api.permission; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.service.permission.RoleService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.service.permission.RoleService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.Collection; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.module.system.enums.ApiConstants.VERSION; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.module.system.enums.ApiConstants.VERSION; @RestController // 提供 RESTful API 接口，给 Feign 调用 @DubboService(version = VERSION) // 提供 Dubbo RPC 接口，给 Dubbo Consumer 调用 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sensitiveword/SensitiveWordApiImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sensitiveword/SensitiveWordApiImpl.java similarity index 75% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sensitiveword/SensitiveWordApiImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sensitiveword/SensitiveWordApiImpl.java index 796595702..ebfd8bf29 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sensitiveword/SensitiveWordApiImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sensitiveword/SensitiveWordApiImpl.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.api.sensitiveword; +package cn.fuxiaoaio.ygg.module.system.api.sensitiveword; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.service.sensitiveword.SensitiveWordService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.service.sensitiveword.SensitiveWordService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.module.system.enums.ApiConstants.VERSION; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.module.system.enums.ApiConstants.VERSION; @RestController // 提供 RESTful API 接口，给 Feign 调用 @DubboService(version = VERSION) // 提供 Dubbo RPC 接口，给 Dubbo Consumer 调用 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsCodeApiImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sms/SmsCodeApiImpl.java similarity index 68% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsCodeApiImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sms/SmsCodeApiImpl.java index c59d21ea3..05503887e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsCodeApiImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sms/SmsCodeApiImpl.java @@ -1,18 +1,18 @@ -package cn.iocoder.yudao.module.system.api.sms; +package cn.fuxiaoaio.ygg.module.system.api.sms; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeValidateReqDTO; -import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeSendReqDTO; -import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeUseReqDTO; -import cn.iocoder.yudao.module.system.service.sms.SmsCodeService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.api.sms.dto.code.SmsCodeValidateReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.sms.dto.code.SmsCodeSendReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.sms.dto.code.SmsCodeUseReqDTO; +import cn.fuxiaoaio.ygg.module.system.service.sms.SmsCodeService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.module.system.enums.ApiConstants.VERSION; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.module.system.enums.ApiConstants.VERSION; @RestController // 提供 RESTful API 接口，给 Feign 调用 @DubboService(version = VERSION) // 提供 Dubbo RPC 接口，给 Dubbo Consumer 调用 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsSendApiImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sms/SmsSendApiImpl.java similarity index 75% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsSendApiImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sms/SmsSendApiImpl.java index edfa9101f..9859db8c0 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sms/SmsSendApiImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/sms/SmsSendApiImpl.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.api.sms; +package cn.fuxiaoaio.ygg.module.system.api.sms; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.api.sms.dto.send.SmsSendSingleToUserReqDTO; -import cn.iocoder.yudao.module.system.service.sms.SmsSendService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.api.sms.dto.send.SmsSendSingleToUserReqDTO; +import cn.fuxiaoaio.ygg.module.system.service.sms.SmsSendService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.module.system.enums.ApiConstants.VERSION; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.module.system.enums.ApiConstants.VERSION; @RestController // 提供 RESTful API 接口，给 Feign 调用 @DubboService(version = VERSION) // 提供 Dubbo RPC 接口，给 Dubbo Consumer 调用 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialUserApiImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/social/SocialUserApiImpl.java similarity index 77% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialUserApiImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/social/SocialUserApiImpl.java index 66009b22f..7f310fc84 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialUserApiImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/social/SocialUserApiImpl.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.system.api.social; +package cn.fuxiaoaio.ygg.module.system.api.social; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.api.social.dto.SocialUserBindReqDTO; -import cn.iocoder.yudao.module.system.api.social.dto.SocialUserUnbindReqDTO; -import cn.iocoder.yudao.module.system.service.social.SocialUserService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.api.social.dto.SocialUserBindReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.social.dto.SocialUserUnbindReqDTO; +import cn.fuxiaoaio.ygg.module.system.service.social.SocialUserService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.module.system.enums.ApiConstants.VERSION; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.module.system.enums.ApiConstants.VERSION; @RestController // 提供 RESTful API 接口，给 Feign 调用 @DubboService(version = VERSION) // 提供 Dubbo RPC 接口，给 Dubbo Consumer 调用 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/tenant/TenantApiImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/tenant/TenantApiImpl.java similarity index 72% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/tenant/TenantApiImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/tenant/TenantApiImpl.java index 008104388..f11a908f6 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/tenant/TenantApiImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/tenant/TenantApiImpl.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.api.tenant; +package cn.fuxiaoaio.ygg.module.system.api.tenant; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.service.tenant.TenantService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.service.tenant.TenantService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -9,8 +9,8 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.module.system.enums.ApiConstants.VERSION; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.module.system.enums.ApiConstants.VERSION; @RestController // 提供 RESTful API 接口，给 Feign 调用 @DubboService(version = VERSION) // 提供 Dubbo RPC 接口，给 Dubbo Consumer 调用 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/user/AdminUserApiImpl.java similarity index 78% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/user/AdminUserApiImpl.java index 5691c682d..538b93e78 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/api/user/AdminUserApiImpl.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.api.user; +package cn.fuxiaoaio.ygg.module.system.api.user; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; -import cn.iocoder.yudao.module.system.convert.user.UserConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; -import cn.iocoder.yudao.module.system.service.user.AdminUserService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.api.user.dto.AdminUserRespDTO; +import cn.fuxiaoaio.ygg.module.system.convert.user.UserConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.module.system.service.user.AdminUserService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -15,8 +15,8 @@ import java.util.Collection; import java.util.List; import java.util.Set; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.module.system.enums.ApiConstants.VERSION; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.module.system.enums.ApiConstants.VERSION; @RestController // 提供 RESTful API 接口，给 Feign 调用 @DubboService(version = VERSION) // 提供 Dubbo RPC 接口，给 Dubbo Consumer 调用 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.http b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/AuthController.http similarity index 100% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.http rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/AuthController.http diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/AuthController.java similarity index 81% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/AuthController.java index d6a3832fb..3c759241f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/AuthController.java @@ -1,23 +1,23 @@ -package cn.iocoder.yudao.module.system.controller.admin.auth; +package cn.fuxiaoaio.ygg.module.system.controller.admin.auth; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.collection.SetUtils; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import cn.iocoder.yudao.framework.security.config.SecurityProperties; -import cn.iocoder.yudao.module.system.controller.admin.auth.vo.*; -import cn.iocoder.yudao.module.system.convert.auth.AuthConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; -import cn.iocoder.yudao.module.system.enums.logger.LoginLogTypeEnum; -import cn.iocoder.yudao.module.system.enums.permission.MenuTypeEnum; -import cn.iocoder.yudao.module.system.service.auth.AdminAuthService; -import cn.iocoder.yudao.module.system.service.permission.PermissionService; -import cn.iocoder.yudao.module.system.service.permission.RoleService; -import cn.iocoder.yudao.module.system.service.social.SocialUserService; -import cn.iocoder.yudao.module.system.service.user.AdminUserService; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.SetUtils; +import cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog; +import cn.fuxiaoaio.ygg.framework.security.config.SecurityProperties; +import cn.fuxiaoaio.ygg.module.system.controller.admin.auth.vo.*; +import cn.fuxiaoaio.ygg.module.system.convert.auth.AuthConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.MenuDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.RoleDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.module.system.enums.logger.LoginLogTypeEnum; +import cn.fuxiaoaio.ygg.module.system.enums.permission.MenuTypeEnum; +import cn.fuxiaoaio.ygg.module.system.service.auth.AdminAuthService; +import cn.fuxiaoaio.ygg.module.system.service.permission.PermissionService; +import cn.fuxiaoaio.ygg.module.system.service.permission.RoleService; +import cn.fuxiaoaio.ygg.module.system.service.social.SocialUserService; +import cn.fuxiaoaio.ygg.module.system.service.user.AdminUserService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -33,9 +33,9 @@ import javax.validation.Valid; import java.util.List; import java.util.Set; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; -import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.obtainAuthorization; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; +import static cn.fuxiaoaio.ygg.framework.security.core.util.SecurityFrameworkUtils.obtainAuthorization; import static java.util.Collections.singleton; @Tag(name = "管理后台 - 认证") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthLoginReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/vo/AuthLoginReqVO.java similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthLoginReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/vo/AuthLoginReqVO.java index 7d00a751b..c840513a7 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthLoginReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/vo/AuthLoginReqVO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.controller.admin.auth.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.auth.vo; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.validation.InEnum; -import cn.iocoder.yudao.module.system.enums.social.SocialTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.validation.InEnum; +import cn.fuxiaoaio.ygg.module.system.enums.social.SocialTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -22,7 +22,7 @@ import javax.validation.constraints.Pattern; @Builder public class AuthLoginReqVO { - @Schema(description = "账号", required = true, example = "yudaoyuanma") + @Schema(description = "账号", required = true, example = "fuxiaoaioyuanma") @NotEmpty(message = "登录账号不能为空") @Length(min = 4, max = 16, message = "账号长度为 4-16 位") @Pattern(regexp = "^[A-Za-z0-9]+$", message = "账号格式为数字以及字母") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthLoginRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/vo/AuthLoginRespVO.java similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthLoginRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/vo/AuthLoginRespVO.java index bc78f8b80..8cb7e6f26 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthLoginRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/vo/AuthLoginRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.auth.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.auth.vo; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthMenuRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/vo/AuthMenuRespVO.java similarity index 96% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthMenuRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/vo/AuthMenuRespVO.java index 9f681de46..65dde470d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthMenuRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/vo/AuthMenuRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.auth.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.auth.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java similarity index 95% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java index 9948a4a90..c0e61d821 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.auth.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.auth.vo; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthSmsLoginReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/vo/AuthSmsLoginReqVO.java similarity index 83% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthSmsLoginReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/vo/AuthSmsLoginReqVO.java index 7c27b97d2..95d27b4ed 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthSmsLoginReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/vo/AuthSmsLoginReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.controller.admin.auth.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.auth.vo; -import cn.iocoder.yudao.framework.common.validation.Mobile; +import cn.fuxiaoaio.ygg.framework.common.validation.Mobile; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -17,7 +17,7 @@ import javax.validation.constraints.NotEmpty; @Builder public class AuthSmsLoginReqVO { - @Schema(description = "手机号", required = true, example = "yudaoyuanma") + @Schema(description = "手机号", required = true, example = "fuxiaoaioyuanma") @NotEmpty(message = "手机号不能为空") @Mobile private String mobile; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthSmsSendReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/vo/AuthSmsSendReqVO.java similarity index 75% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthSmsSendReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/vo/AuthSmsSendReqVO.java index 914e4311d..6d6748f40 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthSmsSendReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/vo/AuthSmsSendReqVO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.controller.admin.auth.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.auth.vo; -import cn.iocoder.yudao.framework.common.validation.InEnum; -import cn.iocoder.yudao.framework.common.validation.Mobile; -import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum; +import cn.fuxiaoaio.ygg.framework.common.validation.InEnum; +import cn.fuxiaoaio.ygg.framework.common.validation.Mobile; +import cn.fuxiaoaio.ygg.module.system.enums.sms.SmsSceneEnum; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -20,7 +20,7 @@ import javax.validation.constraints.NotNull; @Builder public class AuthSmsSendReqVO { - @Schema(description = "手机号", required = true, example = "yudaoyuanma") + @Schema(description = "手机号", required = true, example = "fuxiaoaioyuanma") @NotEmpty(message = "手机号不能为空") @Mobile private String mobile; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthSocialBindLoginReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/vo/AuthSocialBindLoginReqVO.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthSocialBindLoginReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/vo/AuthSocialBindLoginReqVO.java index 6977bb819..fd28fa6e3 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthSocialBindLoginReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/vo/AuthSocialBindLoginReqVO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.controller.admin.auth.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.auth.vo; -import cn.iocoder.yudao.framework.common.validation.InEnum; -import cn.iocoder.yudao.module.system.enums.social.SocialTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.validation.InEnum; +import cn.fuxiaoaio.ygg.module.system.enums.social.SocialTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -34,7 +34,7 @@ public class AuthSocialBindLoginReqVO { @NotEmpty(message = "state 不能为空") private String state; - @Schema(description = "账号", required = true, example = "yudaoyuanma") + @Schema(description = "账号", required = true, example = "fuxiaoaioyuanma") @NotEmpty(message = "登录账号不能为空") @Length(min = 4, max = 16, message = "账号长度为 4-16 位") @Pattern(regexp = "^[A-Za-z0-9]+$", message = "账号格式为数字以及字母") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthSocialLoginReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/vo/AuthSocialLoginReqVO.java similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthSocialLoginReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/vo/AuthSocialLoginReqVO.java index cd86b1778..37a70bc85 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthSocialLoginReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/auth/vo/AuthSocialLoginReqVO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.controller.admin.auth.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.auth.vo; -import cn.iocoder.yudao.framework.common.validation.InEnum; -import cn.iocoder.yudao.module.system.enums.social.SocialTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.validation.InEnum; +import cn.fuxiaoaio.ygg.module.system.enums.social.SocialTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/captcha/CaptchaController.java similarity index 93% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/captcha/CaptchaController.java index 38efeef57..bd43226f9 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/captcha/CaptchaController.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.controller.admin.captcha; +package cn.fuxiaoaio.ygg.module.system.controller.admin.captcha; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.servlet.ServletUtil; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; +import cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog; import com.xingyuv.captcha.model.common.ResponseModel; import com.xingyuv.captcha.model.vo.CaptchaVO; import com.xingyuv.captcha.service.CaptchaService; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/DeptController.java similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/DeptController.java index 7731603e0..5583e3dfc 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/DeptController.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.controller.admin.dept; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dept; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.*; -import cn.iocoder.yudao.module.system.convert.dept.DeptConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; -import cn.iocoder.yudao.module.system.service.dept.DeptService; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.dept.*; +import cn.fuxiaoaio.ygg.module.system.convert.dept.DeptConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.DeptDO; +import cn.fuxiaoaio.ygg.module.system.service.dept.DeptService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -18,7 +18,7 @@ import javax.validation.Valid; import java.util.Comparator; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 部门") @RestController diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/PostController.java similarity index 82% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/PostController.java index 4f0956578..de9f50856 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/PostController.java @@ -1,14 +1,14 @@ -package cn.iocoder.yudao.module.system.controller.admin.dept; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dept; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.*; -import cn.iocoder.yudao.module.system.convert.dept.PostConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO; -import cn.iocoder.yudao.module.system.service.dept.PostService; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.excel.core.util.ExcelUtils; +import cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.post.*; +import cn.fuxiaoaio.ygg.module.system.convert.dept.PostConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.PostDO; +import cn.fuxiaoaio.ygg.module.system.service.dept.PostService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -24,8 +24,8 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 岗位") @RestController diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptBaseVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/dept/DeptBaseVO.java similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptBaseVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/dept/DeptBaseVO.java index 80637158b..bf0c1147d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptBaseVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/dept/DeptBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.dept; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -34,7 +34,7 @@ public class DeptBaseVO { @Size(max = 11, message = "联系电话长度不能超过11个字符") private String phone; - @Schema(description = "邮箱", example = "yudao@iocoder.cn") + @Schema(description = "邮箱", example = "fuxiaoaio@iocoder.cn") @Email(message = "邮箱格式不正确") @Size(max = 50, message = "邮箱长度不能超过50个字符") private String email; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptCreateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/dept/DeptCreateReqVO.java similarity index 83% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptCreateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/dept/DeptCreateReqVO.java index 5cf650c52..d5f2fe1d5 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptCreateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/dept/DeptCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.dept; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java index ae20e774b..af9c361be 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.dept; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/dept/DeptRespVO.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/dept/DeptRespVO.java index 36e977729..a1a3ee452 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/dept/DeptRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.dept; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java index 3da8e14cb..cc78ca52c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.dept; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptUpdateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/dept/DeptUpdateReqVO.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptUpdateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/dept/DeptUpdateReqVO.java index bf53453b9..134d26ca9 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptUpdateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/dept/DeptUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.dept; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostBaseVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostBaseVO.java similarity index 93% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostBaseVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostBaseVO.java index eaad42fc7..4ba2b8a2f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostBaseVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.post; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -19,7 +19,7 @@ public class PostBaseVO { @Size(max = 50, message = "岗位名称长度不能超过50个字符") private String name; - @Schema(description = "岗位编码", required = true, example = "yudao") + @Schema(description = "岗位编码", required = true, example = "fuxiaoaio") @NotBlank(message = "岗位编码不能为空") @Size(max = 64, message = "岗位编码长度不能超过64个字符") private String code; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostCreateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostCreateReqVO.java similarity index 80% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostCreateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostCreateReqVO.java index b2e52e174..fed8e5ec6 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostCreateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.post; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostExcelVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostExcelVO.java similarity index 68% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostExcelVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostExcelVO.java index 0053a7895..af5773ed8 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostExcelVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostExcelVO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.post; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; -import cn.iocoder.yudao.module.system.enums.DictTypeConstants; +import cn.fuxiaoaio.ygg.framework.excel.core.annotations.DictFormat; +import cn.fuxiaoaio.ygg.framework.excel.core.convert.DictConvert; +import cn.fuxiaoaio.ygg.module.system.enums.DictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostExportReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostExportReqVO.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostExportReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostExportReqVO.java index 071e422b1..f019e9da9 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostExportReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostExportReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.post; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -8,7 +8,7 @@ import lombok.Data; @Data public class PostExportReqVO { - @Schema(description = "岗位编码，模糊匹配", example = "yudao") + @Schema(description = "岗位编码，模糊匹配", example = "fuxiaoaio") private String code; @Schema(description = "岗位名称，模糊匹配", example = "芋道") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostListReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostListReqVO.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostListReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostListReqVO.java index 6796a1c66..2365626d1 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostListReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostListReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.post; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostPageReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostPageReqVO.java similarity index 82% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostPageReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostPageReqVO.java index edfbf0610..3f45cc001 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostPageReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostPageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.post; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class PostPageReqVO extends PageParam { - @Schema(description = "岗位编码，模糊匹配", example = "yudao") + @Schema(description = "岗位编码，模糊匹配", example = "fuxiaoaio") private String code; @Schema(description = "岗位名称，模糊匹配", example = "芋道") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostRespVO.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostRespVO.java index 2604512f1..224c8db06 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.post; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostSimpleRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostSimpleRespVO.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostSimpleRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostSimpleRespVO.java index c947fe37e..997359b73 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostSimpleRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostSimpleRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.post; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostUpdateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostUpdateReqVO.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostUpdateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostUpdateReqVO.java index 64defa524..e9664645d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostUpdateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dept/vo/post/PostUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.post; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.http b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/DictDataController.http similarity index 100% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.http rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/DictDataController.http diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/DictDataController.java similarity index 83% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/DictDataController.java index e47814b23..790af2bf6 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/DictDataController.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.module.system.controller.admin.dict; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dict; -import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.*; -import cn.iocoder.yudao.module.system.convert.dict.DictDataConvert; -import cn.iocoder.yudao.module.system.service.dict.DictDataService; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dict.DictDataDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.excel.core.util.ExcelUtils; +import cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.data.*; +import cn.fuxiaoaio.ygg.module.system.convert.dict.DictDataConvert; +import cn.fuxiaoaio.ygg.module.system.service.dict.DictDataService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -21,8 +21,8 @@ import javax.validation.Valid; import java.io.IOException; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 字典数据") @RestController diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictTypeController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/DictTypeController.java similarity index 83% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictTypeController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/DictTypeController.java index eee4d95bc..1244967f7 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictTypeController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/DictTypeController.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.module.system.controller.admin.dict; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dict; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.*; -import cn.iocoder.yudao.module.system.convert.dict.DictTypeConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictTypeDO; -import cn.iocoder.yudao.module.system.service.dict.DictTypeService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.excel.core.util.ExcelUtils; +import cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.type.*; +import cn.fuxiaoaio.ygg.module.system.convert.dict.DictTypeConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dict.DictTypeDO; +import cn.fuxiaoaio.ygg.module.system.service.dict.DictTypeService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -21,8 +21,8 @@ import javax.validation.Valid; import java.io.IOException; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 字典类型") @RestController diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataBaseVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/data/DictDataBaseVO.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataBaseVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/data/DictDataBaseVO.java index 099f21625..c3153c92c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataBaseVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/data/DictDataBaseVO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.controller.admin.dict.vo.data; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.data; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.validation.InEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.validation.InEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataCreateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/data/DictDataCreateReqVO.java similarity index 81% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataCreateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/data/DictDataCreateReqVO.java index 6f225eba4..9294cf6e5 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataCreateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/data/DictDataCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.dict.vo.data; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.data; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataExcelVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/data/DictDataExcelVO.java similarity index 71% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataExcelVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/data/DictDataExcelVO.java index 6dcb9bb50..5270d5328 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataExcelVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/data/DictDataExcelVO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.controller.admin.dict.vo.data; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.data; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; -import cn.iocoder.yudao.module.system.enums.DictTypeConstants; +import cn.fuxiaoaio.ygg.framework.excel.core.annotations.DictFormat; +import cn.fuxiaoaio.ygg.framework.excel.core.convert.DictConvert; +import cn.fuxiaoaio.ygg.module.system.enums.DictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataExportReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/data/DictDataExportReqVO.java similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataExportReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/data/DictDataExportReqVO.java index 48b246c93..b81cf3a35 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataExportReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/data/DictDataExportReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.dict.vo.data; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.data; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataPageReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/data/DictDataPageReqVO.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataPageReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/data/DictDataPageReqVO.java index ab8ca9202..a704aa5a4 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataPageReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/data/DictDataPageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.controller.admin.dict.vo.data; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.data; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/data/DictDataRespVO.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/data/DictDataRespVO.java index fe10520ed..1376af41b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/data/DictDataRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.dict.vo.data; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.data; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataSimpleRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/data/DictDataSimpleRespVO.java similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataSimpleRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/data/DictDataSimpleRespVO.java index 78fc3b66b..d8c45a403 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataSimpleRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/data/DictDataSimpleRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.dict.vo.data; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.data; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataUpdateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/data/DictDataUpdateReqVO.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataUpdateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/data/DictDataUpdateReqVO.java index b6e1c8d12..3f5edac5e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataUpdateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/data/DictDataUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.dict.vo.data; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.data; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeBaseVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/type/DictTypeBaseVO.java similarity index 93% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeBaseVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/type/DictTypeBaseVO.java index 25c5f1b2f..f2de9ef98 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeBaseVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/type/DictTypeBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.dict.vo.type; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.type; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeCreateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/type/DictTypeCreateReqVO.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeCreateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/type/DictTypeCreateReqVO.java index c90ae9ff7..e6e1bd2b9 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeCreateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/type/DictTypeCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.dict.vo.type; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.type; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeExcelVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/type/DictTypeExcelVO.java similarity index 66% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeExcelVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/type/DictTypeExcelVO.java index b7db46d0e..417cf3483 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeExcelVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/type/DictTypeExcelVO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.controller.admin.dict.vo.type; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.type; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; -import cn.iocoder.yudao.module.system.enums.DictTypeConstants; +import cn.fuxiaoaio.ygg.framework.excel.core.annotations.DictFormat; +import cn.fuxiaoaio.ygg.framework.excel.core.convert.DictConvert; +import cn.fuxiaoaio.ygg.module.system.enums.DictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeExportReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/type/DictTypeExportReqVO.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeExportReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/type/DictTypeExportReqVO.java index e4d043974..b5bca6a5c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeExportReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/type/DictTypeExportReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.dict.vo.type; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.type; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 字典类型分页列表 Request VO") @Data diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypePageReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/type/DictTypePageReqVO.java similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypePageReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/type/DictTypePageReqVO.java index a7ae4dccf..3c70b65f8 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypePageReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/type/DictTypePageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.controller.admin.dict.vo.type; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.type; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.Size; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 字典类型分页列表 Request VO") @Data diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/type/DictTypeRespVO.java similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/type/DictTypeRespVO.java index 8eacc79d3..85263cab9 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/type/DictTypeRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.dict.vo.type; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.type; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeSimpleRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/type/DictTypeSimpleRespVO.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeSimpleRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/type/DictTypeSimpleRespVO.java index d848814ac..3c1f1acf5 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeSimpleRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/type/DictTypeSimpleRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.dict.vo.type; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.type; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeUpdateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/type/DictTypeUpdateReqVO.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeUpdateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/type/DictTypeUpdateReqVO.java index 4c78ce212..8236d41c3 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeUpdateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/dict/vo/type/DictTypeUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.dict.vo.type; +package cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.type; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/ErrorCodeController.http b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/errorcode/ErrorCodeController.http similarity index 100% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/ErrorCodeController.http rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/errorcode/ErrorCodeController.http diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/ErrorCodeController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/errorcode/ErrorCodeController.java similarity index 82% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/ErrorCodeController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/errorcode/ErrorCodeController.java index 6fa19cfdb..b13780476 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/ErrorCodeController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/errorcode/ErrorCodeController.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.module.system.controller.admin.errorcode; +package cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import cn.iocoder.yudao.module.system.convert.errorcode.ErrorCodeConvert; -import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.*; -import cn.iocoder.yudao.module.system.dal.dataobject.errorcode.ErrorCodeDO; -import cn.iocoder.yudao.module.system.service.errorcode.ErrorCodeService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.excel.core.util.ExcelUtils; +import cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog; +import cn.fuxiaoaio.ygg.module.system.convert.errorcode.ErrorCodeConvert; +import cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode.vo.*; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.errorcode.ErrorCodeDO; +import cn.fuxiaoaio.ygg.module.system.service.errorcode.ErrorCodeService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -21,8 +21,8 @@ import javax.validation.Valid; import java.io.IOException; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 错误码") @RestController diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeBaseVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/errorcode/vo/ErrorCodeBaseVO.java similarity index 93% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeBaseVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/errorcode/vo/ErrorCodeBaseVO.java index c6aa04eb5..f691feedb 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeBaseVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/errorcode/vo/ErrorCodeBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.errorcode.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeCreateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/errorcode/vo/ErrorCodeCreateReqVO.java similarity index 84% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeCreateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/errorcode/vo/ErrorCodeCreateReqVO.java index 7d5720a38..868275937 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeCreateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/errorcode/vo/ErrorCodeCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.errorcode.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode.vo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeExcelVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/errorcode/vo/ErrorCodeExcelVO.java similarity index 76% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeExcelVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/errorcode/vo/ErrorCodeExcelVO.java index 045b74041..daaf5a8d0 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeExcelVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/errorcode/vo/ErrorCodeExcelVO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.controller.admin.errorcode.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode.vo; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; -//import cn.iocoder.yudao.adminserver.modules.infra.enums.InfDictTypeConstants; +import cn.fuxiaoaio.ygg.framework.excel.core.annotations.DictFormat; +import cn.fuxiaoaio.ygg.framework.excel.core.convert.DictConvert; +//import cn.fuxiaoaio.ygg.adminserver.modules.infra.enums.InfDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeExportReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/errorcode/vo/ErrorCodeExportReqVO.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeExportReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/errorcode/vo/ErrorCodeExportReqVO.java index 1bb446119..52b05a89a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeExportReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/errorcode/vo/ErrorCodeExportReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.errorcode.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode.vo; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 错误码 Excel 导出 Request VO，参数和 InfErrorCodePageReqVO 是一致的") @Data diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodePageReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/errorcode/vo/ErrorCodePageReqVO.java similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodePageReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/errorcode/vo/ErrorCodePageReqVO.java index a456693e4..a619e1f3c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodePageReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/errorcode/vo/ErrorCodePageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.controller.admin.errorcode.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode.vo; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 错误码分页 Request VO") @Data diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/errorcode/vo/ErrorCodeRespVO.java similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/errorcode/vo/ErrorCodeRespVO.java index ca7d54e44..1a09bf7ae 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/errorcode/vo/ErrorCodeRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.errorcode.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode.vo; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeUpdateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/errorcode/vo/ErrorCodeUpdateReqVO.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeUpdateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/errorcode/vo/ErrorCodeUpdateReqVO.java index 5c24ef53f..4eb315513 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeUpdateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/errorcode/vo/ErrorCodeUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.errorcode.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode.vo; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ip/AreaController.http b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/ip/AreaController.http similarity index 100% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ip/AreaController.http rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/ip/AreaController.http diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ip/AreaController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/ip/AreaController.java similarity index 75% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ip/AreaController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/ip/AreaController.java index 25b7cfba2..6bcb4b501 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ip/AreaController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/ip/AreaController.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.system.controller.admin.ip; +package cn.fuxiaoaio.ygg.module.system.controller.admin.ip; import cn.hutool.core.lang.Assert; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.ip.core.Area; -import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils; -import cn.iocoder.yudao.framework.ip.core.utils.IPUtils; -import cn.iocoder.yudao.module.system.controller.admin.ip.vo.AreaNodeRespVO; -import cn.iocoder.yudao.module.system.convert.ip.AreaConvert; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.ip.core.Area; +import cn.fuxiaoaio.ygg.framework.ip.core.utils.AreaUtils; +import cn.fuxiaoaio.ygg.framework.ip.core.utils.IPUtils; +import cn.fuxiaoaio.ygg.module.system.controller.admin.ip.vo.AreaNodeRespVO; +import cn.fuxiaoaio.ygg.module.system.convert.ip.AreaConvert; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 地区") @RestController diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ip/vo/AreaNodeRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/ip/vo/AreaNodeRespVO.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ip/vo/AreaNodeRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/ip/vo/AreaNodeRespVO.java index f99150c02..424da0e21 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ip/vo/AreaNodeRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/ip/vo/AreaNodeRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.ip.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.ip.vo; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/LoginLogController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/LoginLogController.java similarity index 70% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/LoginLogController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/LoginLogController.java index 33099e4de..2c1a64d41 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/LoginLogController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/LoginLogController.java @@ -1,16 +1,16 @@ -package cn.iocoder.yudao.module.system.controller.admin.logger; +package cn.fuxiaoaio.ygg.module.system.controller.admin.logger; -import cn.iocoder.yudao.module.system.dal.dataobject.logger.LoginLogDO; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog.LoginLogExcelVO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog.LoginLogExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog.LoginLogPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog.LoginLogRespVO; -import cn.iocoder.yudao.module.system.convert.logger.LoginLogConvert; -import cn.iocoder.yudao.module.system.service.logger.LoginLogService; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.logger.LoginLogDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.excel.core.util.ExcelUtils; +import cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.loginlog.LoginLogExcelVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.loginlog.LoginLogExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.loginlog.LoginLogPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.loginlog.LoginLogRespVO; +import cn.fuxiaoaio.ygg.module.system.convert.logger.LoginLogConvert; +import cn.fuxiaoaio.ygg.module.system.service.logger.LoginLogService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import org.springframework.security.access.prepost.PreAuthorize; @@ -25,7 +25,7 @@ import javax.validation.Valid; import java.io.IOException; import java.util.List; -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; +import static cn.fuxiaoaio.ygg.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 登录日志") @RestController diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.http b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/OperateLogController.http similarity index 100% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.http rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/OperateLogController.http diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/OperateLogController.java similarity index 72% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/OperateLogController.java index 05b879c38..ec4864816 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/OperateLogController.java @@ -1,20 +1,20 @@ -package cn.iocoder.yudao.module.system.controller.admin.logger; +package cn.fuxiaoaio.ygg.module.system.controller.admin.logger; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogExcelVO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogRespVO; -import cn.iocoder.yudao.module.system.convert.logger.OperateLogConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.logger.OperateLogDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; -import cn.iocoder.yudao.module.system.service.logger.OperateLogService; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.framework.common.util.collection.MapUtils; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import cn.iocoder.yudao.module.system.service.user.AdminUserService; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.operatelog.OperateLogExcelVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.operatelog.OperateLogExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.operatelog.OperateLogRespVO; +import cn.fuxiaoaio.ygg.module.system.convert.logger.OperateLogConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.logger.OperateLogDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.module.system.service.logger.OperateLogService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.framework.common.util.collection.MapUtils; +import cn.fuxiaoaio.ygg.framework.excel.core.util.ExcelUtils; +import cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog; +import cn.fuxiaoaio.ygg.module.system.service.user.AdminUserService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import org.springframework.security.access.prepost.PreAuthorize; @@ -32,8 +32,8 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 操作日志") @RestController diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/loginlog/LoginLogBaseVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/loginlog/LoginLogBaseVO.java similarity index 94% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/loginlog/LoginLogBaseVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/loginlog/LoginLogBaseVO.java index 87e9deb02..1b3a4ac40 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/loginlog/LoginLogBaseVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/loginlog/LoginLogBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog; +package cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.loginlog; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -23,7 +23,7 @@ public class LoginLogBaseVO { @NotEmpty(message = "链路追踪编号不能为空") private String traceId; - @Schema(description = "用户账号", required = true, example = "yudao") + @Schema(description = "用户账号", required = true, example = "fuxiaoaio") @NotBlank(message = "用户账号不能为空") @Size(max = 30, message = "用户账号长度不能超过30个字符") private String username; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/loginlog/LoginLogExcelVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/loginlog/LoginLogExcelVO.java similarity index 76% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/loginlog/LoginLogExcelVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/loginlog/LoginLogExcelVO.java index 897fe4497..8a59024d7 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/loginlog/LoginLogExcelVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/loginlog/LoginLogExcelVO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog; +package cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.loginlog; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; -import cn.iocoder.yudao.module.system.enums.DictTypeConstants; +import cn.fuxiaoaio.ygg.framework.excel.core.annotations.DictFormat; +import cn.fuxiaoaio.ygg.framework.excel.core.convert.DictConvert; +import cn.fuxiaoaio.ygg.module.system.enums.DictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/loginlog/LoginLogExportReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/loginlog/LoginLogExportReqVO.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/loginlog/LoginLogExportReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/loginlog/LoginLogExportReqVO.java index 40a46ff0d..c4f447901 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/loginlog/LoginLogExportReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/loginlog/LoginLogExportReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog; +package cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.loginlog; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 登录日志分页列表 Request VO") @Data diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/loginlog/LoginLogPageReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/loginlog/LoginLogPageReqVO.java similarity index 84% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/loginlog/LoginLogPageReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/loginlog/LoginLogPageReqVO.java index 1f37f7198..5b13e8020 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/loginlog/LoginLogPageReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/loginlog/LoginLogPageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog; +package cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.loginlog; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 登录日志分页列表 Request VO") @Data diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/loginlog/LoginLogRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/loginlog/LoginLogRespVO.java similarity index 93% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/loginlog/LoginLogRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/loginlog/LoginLogRespVO.java index 2ec1ead67..33fb2071c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/loginlog/LoginLogRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/loginlog/LoginLogRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog; +package cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.loginlog; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogBaseVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/operatelog/OperateLogBaseVO.java similarity index 95% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogBaseVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/operatelog/OperateLogBaseVO.java index 2677d002e..243626cec 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogBaseVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/operatelog/OperateLogBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog; +package cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.operatelog; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -57,7 +57,7 @@ public class OperateLogBaseVO { @NotEmpty(message = "浏览器 UserAgent 不能为空") private String userAgent; - @Schema(description = "Java 方法名", required = true, example = "cn.iocoder.yudao.adminserver.UserController.save(...)") + @Schema(description = "Java 方法名", required = true, example = "cn.fuxiaoaio.ygg.adminserver.UserController.save(...)") @NotEmpty(message = "Java 方法名不能为空") private String javaMethod; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogExcelVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/operatelog/OperateLogExcelVO.java similarity index 76% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogExcelVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/operatelog/OperateLogExcelVO.java index 8285a9bf5..2ae1d1708 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogExcelVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/operatelog/OperateLogExcelVO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog; +package cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.operatelog; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; -import cn.iocoder.yudao.module.system.enums.DictTypeConstants; +import cn.fuxiaoaio.ygg.framework.excel.core.annotations.DictFormat; +import cn.fuxiaoaio.ygg.framework.excel.core.convert.DictConvert; +import cn.fuxiaoaio.ygg.module.system.enums.DictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogExportReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/operatelog/OperateLogExportReqVO.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogExportReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/operatelog/OperateLogExportReqVO.java index a182dae17..1bc4f03ee 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogExportReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/operatelog/OperateLogExportReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog; +package cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.operatelog; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 操作日志分页列表 Request VO") @Data diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogPageReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/operatelog/OperateLogPageReqVO.java similarity index 84% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogPageReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/operatelog/OperateLogPageReqVO.java index 62b7b27a3..dcde8cd4b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogPageReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/operatelog/OperateLogPageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog; +package cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.operatelog; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -8,7 +8,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 操作日志分页列表 Request VO") @Data diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java index e0e24595e..55b5fc394 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog; +package cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.operatelog; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/MailAccountController.java similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/MailAccountController.java index b09c2feb2..4988c5c17 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/MailAccountController.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.system.controller.admin.mail; +package cn.fuxiaoaio.ygg.module.system.controller.admin.mail; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.*; -import cn.iocoder.yudao.module.system.convert.mail.MailAccountConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO; -import cn.iocoder.yudao.module.system.service.mail.MailAccountService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.account.*; +import cn.fuxiaoaio.ygg.module.system.convert.mail.MailAccountConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailAccountDO; +import cn.fuxiaoaio.ygg.module.system.service.mail.MailAccountService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -17,7 +17,7 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 邮箱账号") @RestController diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/MailLogController.java similarity index 74% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/MailLogController.java index c87560f30..1b9b1d691 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/MailLogController.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.module.system.controller.admin.mail; +package cn.fuxiaoaio.ygg.module.system.controller.admin.mail; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogRespVO; -import cn.iocoder.yudao.module.system.convert.mail.MailLogConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO; -import cn.iocoder.yudao.module.system.service.mail.MailLogService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.log.MailLogPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.log.MailLogRespVO; +import cn.fuxiaoaio.ygg.module.system.convert.mail.MailLogConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailLogDO; +import cn.fuxiaoaio.ygg.module.system.service.mail.MailLogService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 邮件日志") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.http b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/MailTemplateController.http similarity index 100% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.http rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/MailTemplateController.http diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/MailTemplateController.java similarity index 84% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/MailTemplateController.java index aa023bc2d..c431a703a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/MailTemplateController.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.system.controller.admin.mail; +package cn.fuxiaoaio.ygg.module.system.controller.admin.mail; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.*; -import cn.iocoder.yudao.module.system.convert.mail.MailTemplateConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO; -import cn.iocoder.yudao.module.system.service.mail.MailSendService; -import cn.iocoder.yudao.module.system.service.mail.MailTemplateService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.template.*; +import cn.fuxiaoaio.ygg.module.system.convert.mail.MailTemplateConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailTemplateDO; +import cn.fuxiaoaio.ygg.module.system.service.mail.MailSendService; +import cn.fuxiaoaio.ygg.module.system.service.mail.MailTemplateService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -17,8 +17,8 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; @Tag(name = "管理后台 - 邮件模版") @RestController diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java index 3a1ab53f9..61ea92d35 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/account/MailAccountBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.mail.vo.account; +package cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.account; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -13,12 +13,12 @@ import javax.validation.constraints.NotNull; @Data public class MailAccountBaseVO { - @Schema(description = "邮箱", required = true, example = "yudaoyuanma@123.com") + @Schema(description = "邮箱", required = true, example = "fuxiaoaioyuanma@123.com") @NotNull(message = "邮箱不能为空") @Email(message = "必须是 Email 格式") private String mail; - @Schema(description = "用户名", required = true, example = "yudao") + @Schema(description = "用户名", required = true, example = "fuxiaoaio") @NotNull(message = "用户名不能为空") private String username; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountCreateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/account/MailAccountCreateReqVO.java similarity index 84% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountCreateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/account/MailAccountCreateReqVO.java index 6776ad9f7..9296f3903 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountCreateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/account/MailAccountCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.mail.vo.account; +package cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.account; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java similarity index 77% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java index 94444e227..d88cc2c40 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/account/MailAccountPageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.controller.admin.mail.vo.account; +package cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.account; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -13,10 +13,10 @@ import lombok.ToString; @ToString(callSuper = true) public class MailAccountPageReqVO extends PageParam { - @Schema(description = "邮箱", required = true, example = "yudaoyuanma@123.com") + @Schema(description = "邮箱", required = true, example = "fuxiaoaioyuanma@123.com") private String mail; - @Schema(description = "用户名" , required = true , example = "yudao") + @Schema(description = "用户名" , required = true , example = "fuxiaoaio") private String username; } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/account/MailAccountRespVO.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/account/MailAccountRespVO.java index b62b8c382..a7061f168 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/account/MailAccountRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.mail.vo.account; +package cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.account; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountSimpleRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/account/MailAccountSimpleRespVO.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountSimpleRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/account/MailAccountSimpleRespVO.java index 238a64a5e..fc20b4c9b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountSimpleRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/account/MailAccountSimpleRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.mail.vo.account; +package cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.account; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountUpdateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/account/MailAccountUpdateReqVO.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountUpdateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/account/MailAccountUpdateReqVO.java index 92998ffd8..adf79f002 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountUpdateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/account/MailAccountUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.mail.vo.account; +package cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.account; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogBaseVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/log/MailLogBaseVO.java old mode 100755 new mode 100644 similarity index 95% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogBaseVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/log/MailLogBaseVO.java index 5d8b0f578..e66b62e1e --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogBaseVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/log/MailLogBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.mail.vo.log; +package cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.log; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull; import java.time.LocalDateTime; import java.util.Map; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; /** * 邮件日志 Base VO，提供给添加、修改、详细的子 VO 使用 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java index ad6938059..a6728eeab 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/log/MailLogPageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.controller.admin.mail.vo.log; +package cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.log; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 邮箱日志分页 Request VO") @Data diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/log/MailLogRespVO.java old mode 100755 new mode 100644 similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/log/MailLogRespVO.java index 3fbfaa6da..0f160ec58 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/log/MailLogRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/log/MailLogRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.mail.vo.log; +package cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.log; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java similarity index 96% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java index 5bc0797dd..d3c59da9f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/template/MailTemplateBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.mail.vo.template; +package cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.template; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateCreateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/template/MailTemplateCreateReqVO.java similarity index 84% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateCreateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/template/MailTemplateCreateReqVO.java index b8b47e3b2..e3d23e57c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateCreateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/template/MailTemplateCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.mail.vo.template; +package cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.template; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java index 037f37fa5..03f9e74d8 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/template/MailTemplatePageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.controller.admin.mail.vo.template; +package cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.template; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 邮件模版分页 Request VO") @Data diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/template/MailTemplateRespVO.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/template/MailTemplateRespVO.java index e9f7ad95a..90fee3ef0 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/template/MailTemplateRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.mail.vo.template; +package cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.template; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateSendReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/template/MailTemplateSendReqVO.java similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateSendReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/template/MailTemplateSendReqVO.java index c2d4ce47b..11a620b60 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateSendReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/template/MailTemplateSendReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.mail.vo.template; +package cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.template; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateSimpleRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/template/MailTemplateSimpleRespVO.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateSimpleRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/template/MailTemplateSimpleRespVO.java index 65e4f2ed2..7d0cf0464 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateSimpleRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/template/MailTemplateSimpleRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.mail.vo.template; +package cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.template; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateUpdateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/template/MailTemplateUpdateReqVO.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateUpdateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/template/MailTemplateUpdateReqVO.java index 9cf073788..58294dc37 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/template/MailTemplateUpdateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/mail/vo/template/MailTemplateUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.mail.vo.template; +package cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.template; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/NoticeController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notice/NoticeController.java similarity index 79% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/NoticeController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notice/NoticeController.java index bbb1a3573..4e53fd8cf 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/NoticeController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notice/NoticeController.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.module.system.controller.admin.notice; +package cn.fuxiaoaio.ygg.module.system.controller.admin.notice; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticeCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticePageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticeRespVO; -import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticeUpdateReqVO; -import cn.iocoder.yudao.module.system.convert.notice.NoticeConvert; -import cn.iocoder.yudao.module.system.service.notice.NoticeService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notice.vo.NoticeCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notice.vo.NoticePageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notice.vo.NoticeRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notice.vo.NoticeUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.convert.notice.NoticeConvert; +import cn.fuxiaoaio.ygg.module.system.service.notice.NoticeService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 通知公告") @RestController diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeBaseVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notice/vo/NoticeBaseVO.java similarity index 94% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeBaseVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notice/vo/NoticeBaseVO.java index 75f013764..fdc6c4e8c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeBaseVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notice/vo/NoticeBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.notice.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.notice.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeCreateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notice/vo/NoticeCreateReqVO.java similarity index 81% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeCreateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notice/vo/NoticeCreateReqVO.java index 211f4f0cf..9520958bc 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeCreateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notice/vo/NoticeCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.notice.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.notice.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticePageReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notice/vo/NoticePageReqVO.java similarity index 81% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticePageReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notice/vo/NoticePageReqVO.java index 74b11ab7d..7b8e47b69 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticePageReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notice/vo/NoticePageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.controller.admin.notice.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.notice.vo; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notice/vo/NoticeRespVO.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notice/vo/NoticeRespVO.java index 2c8e538b4..551cf1b31 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notice/vo/NoticeRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.notice.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.notice.vo; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeUpdateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notice/vo/NoticeUpdateReqVO.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeUpdateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notice/vo/NoticeUpdateReqVO.java index cae59e4f9..ed32abe93 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeUpdateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notice/vo/NoticeUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.notice.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.notice.vo; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/NotifyMessageController.java similarity index 83% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/NotifyMessageController.java index e34679f37..6f38bb77f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/NotifyMessageController.java @@ -1,14 +1,14 @@ -package cn.iocoder.yudao.module.system.controller.admin.notify; +package cn.fuxiaoaio.ygg.module.system.controller.admin.notify; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageMyPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageRespVO; -import cn.iocoder.yudao.module.system.convert.notify.NotifyMessageConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO; -import cn.iocoder.yudao.module.system.service.notify.NotifyMessageService; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.message.NotifyMessageMyPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.message.NotifyMessageRespVO; +import cn.fuxiaoaio.ygg.module.system.convert.notify.NotifyMessageConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.notify.NotifyMessageDO; +import cn.fuxiaoaio.ygg.module.system.service.notify.NotifyMessageService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -20,8 +20,8 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; @Tag(name = "管理后台 - 我的站内信") @RestController diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/NotifyTemplateController.java similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/NotifyTemplateController.java index 0db19ce26..04e59c1ce 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/NotifyTemplateController.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.system.controller.admin.notify; +package cn.fuxiaoaio.ygg.module.system.controller.admin.notify; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.*; -import cn.iocoder.yudao.module.system.convert.notify.NotifyTemplateConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO; -import cn.iocoder.yudao.module.system.service.notify.NotifySendService; -import cn.iocoder.yudao.module.system.service.notify.NotifyTemplateService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.template.*; +import cn.fuxiaoaio.ygg.module.system.convert.notify.NotifyTemplateConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.notify.NotifyTemplateDO; +import cn.fuxiaoaio.ygg.module.system.service.notify.NotifySendService; +import cn.fuxiaoaio.ygg.module.system.service.notify.NotifyTemplateService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 站内信模版") @RestController diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java similarity index 94% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java index e5402e461..db10b1248 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.notify.vo.message; +package cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.message; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull; import java.time.LocalDateTime; import java.util.Map; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; /** * 站内信消息 Base VO，提供给添加、修改、详细的子 VO 使用 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageMyPageReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/message/NotifyMessageMyPageReqVO.java similarity index 80% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageMyPageReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/message/NotifyMessageMyPageReqVO.java index 402c4ef36..479039daa 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageMyPageReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/message/NotifyMessageMyPageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.controller.admin.notify.vo.message; +package cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.message; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 站内信分页 Request VO") @Data diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java similarity index 84% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java index 79993cdcd..fbf44d811 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.controller.admin.notify.vo.message; +package cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.message; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 站内信分页 Request VO") @Data diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java index 56842e193..dd1d55bdd 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.notify.vo.message; +package cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.message; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateBaseVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/template/NotifyTemplateBaseVO.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateBaseVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/template/NotifyTemplateBaseVO.java index 3e591feee..cf70fd26f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateBaseVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/template/NotifyTemplateBaseVO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template; +package cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.template; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.validation.InEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.validation.InEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateCreateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/template/NotifyTemplateCreateReqVO.java similarity index 84% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateCreateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/template/NotifyTemplateCreateReqVO.java index 82572c24b..0207741b7 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateCreateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/template/NotifyTemplateCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template; +package cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.template; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplatePageReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/template/NotifyTemplatePageReqVO.java similarity index 84% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplatePageReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/template/NotifyTemplatePageReqVO.java index 60035474b..347825ed5 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplatePageReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/template/NotifyTemplatePageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template; +package cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.template; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 站内信模版分页 Request VO") @Data diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java index 0011ca024..2891764f9 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/template/NotifyTemplateRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template; +package cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.template; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java index 031e18596..6fc4af48e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template; +package cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.template; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateUpdateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/template/NotifyTemplateUpdateReqVO.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateUpdateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/template/NotifyTemplateUpdateReqVO.java index b610475da..fd249dd4d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateUpdateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/notify/vo/template/NotifyTemplateUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template; +package cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.template; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2ClientController.http b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/OAuth2ClientController.http similarity index 100% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2ClientController.http rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/OAuth2ClientController.http diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2ClientController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/OAuth2ClientController.java old mode 100755 new mode 100644 similarity index 80% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2ClientController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/OAuth2ClientController.java index c4ab66787..12e1adff3 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2ClientController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/OAuth2ClientController.java @@ -1,14 +1,14 @@ -package cn.iocoder.yudao.module.system.controller.admin.oauth2; +package cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.client.OAuth2ClientCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.client.OAuth2ClientPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.client.OAuth2ClientRespVO; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.client.OAuth2ClientUpdateReqVO; -import cn.iocoder.yudao.module.system.convert.auth.OAuth2ClientConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ClientDO; -import cn.iocoder.yudao.module.system.service.oauth2.OAuth2ClientService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.client.OAuth2ClientCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.client.OAuth2ClientPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.client.OAuth2ClientRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.client.OAuth2ClientUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.convert.auth.OAuth2ClientConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2ClientDO; +import cn.fuxiaoaio.ygg.module.system.service.oauth2.OAuth2ClientService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - OAuth2 客户端") @RestController diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenController.http b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/OAuth2OpenController.http similarity index 100% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenController.http rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/OAuth2OpenController.http diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/OAuth2OpenController.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/OAuth2OpenController.java index a94da1728..b05b76c55 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/OAuth2OpenController.java @@ -1,27 +1,27 @@ -package cn.iocoder.yudao.module.system.controller.admin.oauth2; +package cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ArrayUtil; 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.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.http.HttpUtils; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.open.OAuth2OpenAccessTokenRespVO; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.open.OAuth2OpenAuthorizeInfoRespVO; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.open.OAuth2OpenCheckTokenRespVO; -import cn.iocoder.yudao.module.system.convert.oauth2.OAuth2OpenConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ApproveDO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ClientDO; -import cn.iocoder.yudao.module.system.enums.oauth2.OAuth2GrantTypeEnum; -import cn.iocoder.yudao.module.system.service.oauth2.OAuth2ApproveService; -import cn.iocoder.yudao.module.system.service.oauth2.OAuth2ClientService; -import cn.iocoder.yudao.module.system.service.oauth2.OAuth2GrantService; -import cn.iocoder.yudao.module.system.service.oauth2.OAuth2TokenService; -import cn.iocoder.yudao.module.system.util.oauth2.OAuth2Utils; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.util.http.HttpUtils; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.open.OAuth2OpenAccessTokenRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.open.OAuth2OpenAuthorizeInfoRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.open.OAuth2OpenCheckTokenRespVO; +import cn.fuxiaoaio.ygg.module.system.convert.oauth2.OAuth2OpenConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2ApproveDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2ClientDO; +import cn.fuxiaoaio.ygg.module.system.enums.oauth2.OAuth2GrantTypeEnum; +import cn.fuxiaoaio.ygg.module.system.service.oauth2.OAuth2ApproveService; +import cn.fuxiaoaio.ygg.module.system.service.oauth2.OAuth2ClientService; +import cn.fuxiaoaio.ygg.module.system.service.oauth2.OAuth2GrantService; +import cn.fuxiaoaio.ygg.module.system.service.oauth2.OAuth2TokenService; +import cn.fuxiaoaio.ygg.module.system.util.oauth2.OAuth2Utils; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -37,11 +37,11 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception0; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; -import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; +import static cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception0; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.convertList; +import static cn.fuxiaoaio.ygg.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; /** * 提供给外部应用调用为主 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2TokenController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/OAuth2TokenController.java similarity index 70% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2TokenController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/OAuth2TokenController.java index 73f7e5c23..6273ebfba 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2TokenController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/OAuth2TokenController.java @@ -1,14 +1,14 @@ -package cn.iocoder.yudao.module.system.controller.admin.oauth2; +package cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.token.OAuth2AccessTokenPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.token.OAuth2AccessTokenRespVO; -import cn.iocoder.yudao.module.system.convert.auth.OAuth2TokenConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; -import cn.iocoder.yudao.module.system.enums.logger.LoginLogTypeEnum; -import cn.iocoder.yudao.module.system.service.auth.AdminAuthService; -import cn.iocoder.yudao.module.system.service.oauth2.OAuth2TokenService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.token.OAuth2AccessTokenPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.token.OAuth2AccessTokenRespVO; +import cn.fuxiaoaio.ygg.module.system.convert.auth.OAuth2TokenConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; +import cn.fuxiaoaio.ygg.module.system.enums.logger.LoginLogTypeEnum; +import cn.fuxiaoaio.ygg.module.system.service.auth.AdminAuthService; +import cn.fuxiaoaio.ygg.module.system.service.oauth2.OAuth2TokenService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - OAuth2.0 令牌") @RestController diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2UserController.http b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/OAuth2UserController.http similarity index 100% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2UserController.http rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/OAuth2UserController.http diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2UserController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/OAuth2UserController.java similarity index 76% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2UserController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/OAuth2UserController.java index c770013ea..cb57bad5d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2UserController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/OAuth2UserController.java @@ -1,16 +1,16 @@ -package cn.iocoder.yudao.module.system.controller.admin.oauth2; +package cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.user.OAuth2UserInfoRespVO; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.user.OAuth2UserUpdateReqVO; -import cn.iocoder.yudao.module.system.convert.oauth2.OAuth2UserConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; -import cn.iocoder.yudao.module.system.service.dept.DeptService; -import cn.iocoder.yudao.module.system.service.dept.PostService; -import cn.iocoder.yudao.module.system.service.user.AdminUserService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.user.OAuth2UserInfoRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.user.OAuth2UserUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.convert.oauth2.OAuth2UserConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.DeptDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.PostDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.module.system.service.dept.DeptService; +import cn.fuxiaoaio.ygg.module.system.service.dept.PostService; +import cn.fuxiaoaio.ygg.module.system.service.user.AdminUserService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import lombok.extern.slf4j.Slf4j; @@ -22,8 +22,8 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; /** * 提供给外部应用调用为主 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/client/OAuth2ClientBaseVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/client/OAuth2ClientBaseVO.java old mode 100755 new mode 100644 similarity index 96% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/client/OAuth2ClientBaseVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/client/OAuth2ClientBaseVO.java index e90ccaa89..e31d750a0 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/client/OAuth2ClientBaseVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/client/OAuth2ClientBaseVO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.client; +package cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.client; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.hibernate.validator.constraints.URL; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/client/OAuth2ClientCreateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/client/OAuth2ClientCreateReqVO.java old mode 100755 new mode 100644 similarity index 81% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/client/OAuth2ClientCreateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/client/OAuth2ClientCreateReqVO.java index 033ab9a7e..65eb5c15a --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/client/OAuth2ClientCreateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/client/OAuth2ClientCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.client; +package cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.client; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/client/OAuth2ClientPageReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/client/OAuth2ClientPageReqVO.java old mode 100755 new mode 100644 similarity index 80% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/client/OAuth2ClientPageReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/client/OAuth2ClientPageReqVO.java index 1982abedf..8af01d0f6 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/client/OAuth2ClientPageReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/client/OAuth2ClientPageReqVO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.client; +package cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.client; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; @Schema(description = "管理后台 - OAuth2 客户端分页 Request VO") @Data diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/client/OAuth2ClientRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/client/OAuth2ClientRespVO.java old mode 100755 new mode 100644 similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/client/OAuth2ClientRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/client/OAuth2ClientRespVO.java index 6cec89c32..19ae586bc --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/client/OAuth2ClientRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/client/OAuth2ClientRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.client; +package cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.client; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/client/OAuth2ClientUpdateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/client/OAuth2ClientUpdateReqVO.java old mode 100755 new mode 100644 similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/client/OAuth2ClientUpdateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/client/OAuth2ClientUpdateReqVO.java index 985f0d89c..1d3272603 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/client/OAuth2ClientUpdateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/client/OAuth2ClientUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.client; +package cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.client; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/open/OAuth2OpenAccessTokenRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/open/OAuth2OpenAccessTokenRespVO.java similarity index 94% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/open/OAuth2OpenAccessTokenRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/open/OAuth2OpenAccessTokenRespVO.java index 8ddd4b2e1..ac552d776 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/open/OAuth2OpenAccessTokenRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/open/OAuth2OpenAccessTokenRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.open; +package cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.open; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/open/OAuth2OpenAuthorizeInfoRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/open/OAuth2OpenAuthorizeInfoRespVO.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/open/OAuth2OpenAuthorizeInfoRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/open/OAuth2OpenAuthorizeInfoRespVO.java index c0132ff07..b3bb046de 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/open/OAuth2OpenAuthorizeInfoRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/open/OAuth2OpenAuthorizeInfoRespVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.open; +package cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.open; -import cn.iocoder.yudao.framework.common.core.KeyValue; +import cn.fuxiaoaio.ygg.framework.common.core.KeyValue; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/open/OAuth2OpenCheckTokenRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/open/OAuth2OpenCheckTokenRespVO.java similarity index 95% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/open/OAuth2OpenCheckTokenRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/open/OAuth2OpenCheckTokenRespVO.java index 5d4b0fb8a..7d9cf35e3 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/open/OAuth2OpenCheckTokenRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/open/OAuth2OpenCheckTokenRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.open; +package cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.open; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenPageReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenPageReqVO.java similarity index 84% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenPageReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenPageReqVO.java index 305ca78d8..3b6f9ca85 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenPageReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenPageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.token; +package cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.token; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenRespVO.java similarity index 95% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenRespVO.java index 7a1810948..2196b737a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/token/OAuth2AccessTokenRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.token; +package cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.token; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java index b155b9341..2338ab52f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.user; +package cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.user; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -23,7 +23,7 @@ public class OAuth2UserInfoRespVO { @Schema(description = "用户昵称", required = true, example = "芋道") private String nickname; - @Schema(description = "用户邮箱", example = "yudao@iocoder.cn") + @Schema(description = "用户邮箱", example = "fuxiaoaio@iocoder.cn") private String email; @Schema(description = "手机号码", example = "15601691300") private String mobile; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/user/OAuth2UserUpdateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/user/OAuth2UserUpdateReqVO.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/user/OAuth2UserUpdateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/user/OAuth2UserUpdateReqVO.java index 101e0f802..bb5f3b626 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/user/OAuth2UserUpdateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/vo/user/OAuth2UserUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.user; +package cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.user; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -20,7 +20,7 @@ public class OAuth2UserUpdateReqVO { @Size(max = 30, message = "用户昵称长度不能超过 30 个字符") private String nickname; - @Schema(description = "用户邮箱", example = "yudao@iocoder.cn") + @Schema(description = "用户邮箱", example = "fuxiaoaio@iocoder.cn") @Email(message = "邮箱格式不正确") @Size(max = 50, message = "邮箱长度不能超过 50 个字符") private String email; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.http b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/MenuController.http similarity index 100% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.http rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/MenuController.http diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/MenuController.java similarity index 86% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/MenuController.java index aac816e57..8a5a2812b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/MenuController.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.controller.admin.permission; +package cn.fuxiaoaio.ygg.module.system.controller.admin.permission; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.*; -import cn.iocoder.yudao.module.system.convert.permission.MenuConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO; -import cn.iocoder.yudao.module.system.service.permission.MenuService; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.menu.*; +import cn.fuxiaoaio.ygg.module.system.convert.permission.MenuConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.MenuDO; +import cn.fuxiaoaio.ygg.module.system.service.permission.MenuService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -18,7 +18,7 @@ import javax.validation.Valid; import java.util.Comparator; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 菜单") @RestController diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/PermissionController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/PermissionController.java similarity index 86% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/PermissionController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/PermissionController.java index 46d148e19..ecb5209c7 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/PermissionController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/PermissionController.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.system.controller.admin.permission; +package cn.fuxiaoaio.ygg.module.system.controller.admin.permission; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.permission.PermissionAssignRoleDataScopeReqVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.permission.PermissionAssignRoleMenuReqVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.permission.PermissionAssignUserRoleReqVO; -import cn.iocoder.yudao.module.system.service.permission.PermissionService; -import cn.iocoder.yudao.module.system.service.tenant.TenantService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.permission.PermissionAssignRoleDataScopeReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.permission.PermissionAssignRoleMenuReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.permission.PermissionAssignUserRoleReqVO; +import cn.fuxiaoaio.ygg.module.system.service.permission.PermissionService; +import cn.fuxiaoaio.ygg.module.system.service.tenant.TenantService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -18,7 +18,7 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.util.Set; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; /** * 权限 Controller，提供赋予用户、角色的权限的 API 接口 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.http b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/RoleController.http similarity index 100% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.http rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/RoleController.http diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/RoleController.java similarity index 83% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/RoleController.java index 83853f16b..c75802274 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/RoleController.java @@ -1,14 +1,14 @@ -package cn.iocoder.yudao.module.system.controller.admin.permission; +package cn.fuxiaoaio.ygg.module.system.controller.admin.permission; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.*; -import cn.iocoder.yudao.module.system.convert.permission.RoleConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; -import cn.iocoder.yudao.module.system.service.permission.RoleService; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.excel.core.util.ExcelUtils; +import cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role.*; +import cn.fuxiaoaio.ygg.module.system.convert.permission.RoleConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.RoleDO; +import cn.fuxiaoaio.ygg.module.system.service.permission.RoleService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -23,8 +23,8 @@ import java.io.IOException; import java.util.Comparator; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; import static java.util.Collections.singleton; @Tag(name = "管理后台 - 角色") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuBaseVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/menu/MenuBaseVO.java similarity index 97% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuBaseVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/menu/MenuBaseVO.java index ddaf16c5a..ed8f902eb 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuBaseVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/menu/MenuBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu; +package cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.menu; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuCreateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/menu/MenuCreateReqVO.java similarity index 79% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuCreateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/menu/MenuCreateReqVO.java index 56721b7fe..09539accb 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuCreateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/menu/MenuCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu; +package cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.menu; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuListReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/menu/MenuListReqVO.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuListReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/menu/MenuListReqVO.java index 6378320bb..e61df137d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuListReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/menu/MenuListReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu; +package cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.menu; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/menu/MenuRespVO.java similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/menu/MenuRespVO.java index 9b5c942a0..cd8279dcb 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/menu/MenuRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu; +package cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.menu; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuSimpleRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/menu/MenuSimpleRespVO.java similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuSimpleRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/menu/MenuSimpleRespVO.java index 68e00180c..f294e3310 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuSimpleRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/menu/MenuSimpleRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu; +package cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.menu; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuUpdateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/menu/MenuUpdateReqVO.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuUpdateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/menu/MenuUpdateReqVO.java index 52e57676d..fbc82bfbf 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuUpdateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/menu/MenuUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu; +package cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.menu; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/permission/PermissionAssignRoleDataScopeReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/permission/PermissionAssignRoleDataScopeReqVO.java similarity index 93% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/permission/PermissionAssignRoleDataScopeReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/permission/PermissionAssignRoleDataScopeReqVO.java index 55b69ccd7..de64bc2ae 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/permission/PermissionAssignRoleDataScopeReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/permission/PermissionAssignRoleDataScopeReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.permission.vo.permission; +package cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.permission; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/permission/PermissionAssignRoleMenuReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/permission/PermissionAssignRoleMenuReqVO.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/permission/PermissionAssignRoleMenuReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/permission/PermissionAssignRoleMenuReqVO.java index ea4ae52b8..8978bd466 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/permission/PermissionAssignRoleMenuReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/permission/PermissionAssignRoleMenuReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.permission.vo.permission; +package cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.permission; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/permission/PermissionAssignUserRoleReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/permission/PermissionAssignUserRoleReqVO.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/permission/PermissionAssignUserRoleReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/permission/PermissionAssignUserRoleReqVO.java index d1b4c5f7f..9d0a63b44 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/permission/PermissionAssignUserRoleReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/permission/PermissionAssignUserRoleReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.permission.vo.permission; +package cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.permission; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleBaseVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RoleBaseVO.java similarity index 94% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleBaseVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RoleBaseVO.java index 2d15c80ee..df2aa060f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleBaseVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RoleBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.permission.vo.role; +package cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleCreateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RoleCreateReqVO.java similarity index 81% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleCreateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RoleCreateReqVO.java index ac4cd8a3e..93294f4e4 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleCreateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RoleCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.permission.vo.role; +package cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleExcelVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RoleExcelVO.java similarity index 71% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleExcelVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RoleExcelVO.java index d22cf9bf2..478313b93 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleExcelVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RoleExcelVO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.controller.admin.permission.vo.role; +package cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; -import cn.iocoder.yudao.module.system.enums.DictTypeConstants; +import cn.fuxiaoaio.ygg.framework.excel.core.annotations.DictFormat; +import cn.fuxiaoaio.ygg.framework.excel.core.convert.DictConvert; +import cn.fuxiaoaio.ygg.module.system.enums.DictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleExportReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RoleExportReqVO.java similarity index 86% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleExportReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RoleExportReqVO.java index 567ed0cd6..7cf260d72 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleExportReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RoleExportReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.permission.vo.role; +package cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 角色分页 Request VO") @Data @@ -16,7 +16,7 @@ public class RoleExportReqVO { @Schema(description = "角色名称，模糊匹配", example = "芋道") private String name; - @Schema(description = "角色标识，模糊匹配", example = "yudao") + @Schema(description = "角色标识，模糊匹配", example = "fuxiaoaio") private String code; @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RolePageReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RolePageReqVO.java similarity index 83% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RolePageReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RolePageReqVO.java index b612ad999..0d6886716 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RolePageReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RolePageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.controller.admin.permission.vo.role; +package cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 角色分页 Request VO") @Data @@ -19,7 +19,7 @@ public class RolePageReqVO extends PageParam { @Schema(description = "角色名称，模糊匹配", example = "芋道") private String name; - @Schema(description = "角色标识，模糊匹配", example = "yudao") + @Schema(description = "角色标识，模糊匹配", example = "fuxiaoaio") private String code; @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RoleRespVO.java similarity index 94% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RoleRespVO.java index 0afea1aed..5fa0ae6cc 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RoleRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.permission.vo.role; +package cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleSimpleRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RoleSimpleRespVO.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleSimpleRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RoleSimpleRespVO.java index 8232baea6..0c79e4e96 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleSimpleRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RoleSimpleRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.permission.vo.role; +package cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleUpdateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RoleUpdateReqVO.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleUpdateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RoleUpdateReqVO.java index 3f8728d1f..dc71998a8 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleUpdateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RoleUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.permission.vo.role; +package cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleUpdateStatusReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RoleUpdateStatusReqVO.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleUpdateStatusReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RoleUpdateStatusReqVO.java index 3124308c0..2e063fe01 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleUpdateStatusReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/permission/vo/role/RoleUpdateStatusReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.permission.vo.role; +package cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/SensitiveWordController.http b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sensitiveword/SensitiveWordController.http similarity index 100% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/SensitiveWordController.http rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sensitiveword/SensitiveWordController.http diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/SensitiveWordController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sensitiveword/SensitiveWordController.java similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/SensitiveWordController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sensitiveword/SensitiveWordController.java index 60b8a8285..883114ff3 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/SensitiveWordController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sensitiveword/SensitiveWordController.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.module.system.controller.admin.sensitiveword; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.*; -import cn.iocoder.yudao.module.system.convert.sensitiveword.SensitiveWordConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.sensitiveword.SensitiveWordDO; -import cn.iocoder.yudao.module.system.service.sensitiveword.SensitiveWordService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.excel.core.util.ExcelUtils; +import cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword.vo.*; +import cn.fuxiaoaio.ygg.module.system.convert.sensitiveword.SensitiveWordConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sensitiveword.SensitiveWordDO; +import cn.fuxiaoaio.ygg.module.system.service.sensitiveword.SensitiveWordService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -22,8 +22,8 @@ import java.io.IOException; import java.util.List; import java.util.Set; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 敏感词") @RestController diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordBaseVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sensitiveword/vo/SensitiveWordBaseVO.java similarity index 93% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordBaseVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sensitiveword/vo/SensitiveWordBaseVO.java index bc5b752ba..870a3e125 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordBaseVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sensitiveword/vo/SensitiveWordBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordCreateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sensitiveword/vo/SensitiveWordCreateReqVO.java similarity index 84% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordCreateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sensitiveword/vo/SensitiveWordCreateReqVO.java index 2e2e89df5..2037ac0f0 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordCreateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sensitiveword/vo/SensitiveWordCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordExcelVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sensitiveword/vo/SensitiveWordExcelVO.java similarity index 69% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordExcelVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sensitiveword/vo/SensitiveWordExcelVO.java index 29409cbe3..c4ddefb6d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordExcelVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sensitiveword/vo/SensitiveWordExcelVO.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword.vo; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; -import cn.iocoder.yudao.framework.excel.core.convert.JsonConvert; -import cn.iocoder.yudao.module.system.enums.DictTypeConstants; +import cn.fuxiaoaio.ygg.framework.excel.core.annotations.DictFormat; +import cn.fuxiaoaio.ygg.framework.excel.core.convert.DictConvert; +import cn.fuxiaoaio.ygg.framework.excel.core.convert.JsonConvert; +import cn.fuxiaoaio.ygg.module.system.enums.DictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordExportReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sensitiveword/vo/SensitiveWordExportReqVO.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordExportReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sensitiveword/vo/SensitiveWordExportReqVO.java index ab1036cb3..46892a2a5 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordExportReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sensitiveword/vo/SensitiveWordExportReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword.vo; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 敏感词 Excel 导出 Request VO，参数和 SensitiveWordPageReqVO 是一致的") @Data diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordPageReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sensitiveword/vo/SensitiveWordPageReqVO.java similarity index 83% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordPageReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sensitiveword/vo/SensitiveWordPageReqVO.java index 5af77eab8..7f84e4403 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordPageReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sensitiveword/vo/SensitiveWordPageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword.vo; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 敏感词分页 Request VO") @Data diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sensitiveword/vo/SensitiveWordRespVO.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sensitiveword/vo/SensitiveWordRespVO.java index 9f888a135..73d1c6e98 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sensitiveword/vo/SensitiveWordRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword.vo; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordUpdateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sensitiveword/vo/SensitiveWordUpdateReqVO.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordUpdateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sensitiveword/vo/SensitiveWordUpdateReqVO.java index 11883f055..ae9b682ee 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordUpdateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sensitiveword/vo/SensitiveWordUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword.vo; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsCallbackController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/SmsCallbackController.java similarity index 82% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsCallbackController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/SmsCallbackController.java index 6cf155797..392098f8c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsCallbackController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/SmsCallbackController.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.controller.admin.sms; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sms; import cn.hutool.core.util.URLUtil; import cn.hutool.extra.servlet.ServletUtil; -import cn.iocoder.yudao.module.system.service.sms.SmsSendService; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import cn.iocoder.yudao.framework.sms.core.enums.SmsChannelEnum; +import cn.fuxiaoaio.ygg.module.system.service.sms.SmsSendService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog; +import cn.fuxiaoaio.ygg.framework.sms.core.enums.SmsChannelEnum; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -18,7 +18,7 @@ import javax.annotation.Resource; import javax.annotation.security.PermitAll; import javax.servlet.http.HttpServletRequest; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 短信回调") @RestController diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/SmsChannelController.java similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/SmsChannelController.java index a58cbe61e..cc5d6490f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/SmsChannelController.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.controller.admin.sms; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sms; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.*; -import cn.iocoder.yudao.module.system.convert.sms.SmsChannelConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsChannelDO; -import cn.iocoder.yudao.module.system.service.sms.SmsChannelService; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.channel.*; +import cn.fuxiaoaio.ygg.module.system.convert.sms.SmsChannelConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsChannelDO; +import cn.fuxiaoaio.ygg.module.system.service.sms.SmsChannelService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -17,7 +17,7 @@ import javax.validation.Valid; import java.util.Comparator; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 短信渠道") @RestController diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsLogController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/SmsLogController.java similarity index 68% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsLogController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/SmsLogController.java index 5345f229b..68c4adf24 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsLogController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/SmsLogController.java @@ -1,16 +1,16 @@ -package cn.iocoder.yudao.module.system.controller.admin.sms; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sms; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.log.SmsLogExcelVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.log.SmsLogExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.log.SmsLogPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.log.SmsLogRespVO; -import cn.iocoder.yudao.module.system.convert.sms.SmsLogConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsLogDO; -import cn.iocoder.yudao.module.system.service.sms.SmsLogService; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.log.SmsLogExcelVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.log.SmsLogExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.log.SmsLogPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.log.SmsLogRespVO; +import cn.fuxiaoaio.ygg.module.system.convert.sms.SmsLogConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsLogDO; +import cn.fuxiaoaio.ygg.module.system.service.sms.SmsLogService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.excel.core.util.ExcelUtils; +import cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import org.springframework.security.access.prepost.PreAuthorize; @@ -25,8 +25,8 @@ import javax.validation.Valid; import java.io.IOException; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 短信日志") @RestController diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsTemplateController.http b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/SmsTemplateController.http similarity index 100% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsTemplateController.http rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/SmsTemplateController.http diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsTemplateController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/SmsTemplateController.java similarity index 83% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsTemplateController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/SmsTemplateController.java index 8be3a3250..4cb54f8f1 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsTemplateController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/SmsTemplateController.java @@ -1,14 +1,14 @@ -package cn.iocoder.yudao.module.system.controller.admin.sms; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sms; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.*; -import cn.iocoder.yudao.module.system.convert.sms.SmsTemplateConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO; -import cn.iocoder.yudao.module.system.service.sms.SmsTemplateService; -import cn.iocoder.yudao.module.system.service.sms.SmsSendService; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template.*; +import cn.fuxiaoaio.ygg.module.system.convert.sms.SmsTemplateConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsTemplateDO; +import cn.fuxiaoaio.ygg.module.system.service.sms.SmsTemplateService; +import cn.fuxiaoaio.ygg.module.system.service.sms.SmsSendService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.excel.core.util.ExcelUtils; +import cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -21,8 +21,8 @@ import javax.validation.Valid; import java.io.IOException; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 短信模板") @RestController diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/channel/SmsChannelBaseVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/channel/SmsChannelBaseVO.java similarity index 93% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/channel/SmsChannelBaseVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/channel/SmsChannelBaseVO.java index 1d47011fb..ab92961d9 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/channel/SmsChannelBaseVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/channel/SmsChannelBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.channel; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -24,7 +24,7 @@ public class SmsChannelBaseVO { @Schema(description = "备注", example = "好吃！") private String remark; - @Schema(description = "短信 API 的账号", required = true, example = "yudao") + @Schema(description = "短信 API 的账号", required = true, example = "fuxiaoaio") @NotNull(message = "短信 API 的账号不能为空") private String apiKey; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/channel/SmsChannelCreateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/channel/SmsChannelCreateReqVO.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/channel/SmsChannelCreateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/channel/SmsChannelCreateReqVO.java index 58b42f4d9..b613a8c2c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/channel/SmsChannelCreateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/channel/SmsChannelCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.channel; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/channel/SmsChannelPageReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/channel/SmsChannelPageReqVO.java similarity index 82% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/channel/SmsChannelPageReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/channel/SmsChannelPageReqVO.java index 18e4f96a3..e280376d8 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/channel/SmsChannelPageReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/channel/SmsChannelPageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.channel; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 短信渠道分页 Request VO") @Data diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/channel/SmsChannelRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/channel/SmsChannelRespVO.java similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/channel/SmsChannelRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/channel/SmsChannelRespVO.java index 5b9ea72f4..59622f2a6 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/channel/SmsChannelRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/channel/SmsChannelRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.channel; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/channel/SmsChannelSimpleRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/channel/SmsChannelSimpleRespVO.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/channel/SmsChannelSimpleRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/channel/SmsChannelSimpleRespVO.java index 4c59f2a61..1e756b12f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/channel/SmsChannelSimpleRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/channel/SmsChannelSimpleRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.channel; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/channel/SmsChannelUpdateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/channel/SmsChannelUpdateReqVO.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/channel/SmsChannelUpdateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/channel/SmsChannelUpdateReqVO.java index 0a1d451d5..38702842a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/channel/SmsChannelUpdateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/channel/SmsChannelUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.channel; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/log/SmsLogExcelVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/log/SmsLogExcelVO.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/log/SmsLogExcelVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/log/SmsLogExcelVO.java index f84da74ac..60310a75a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/log/SmsLogExcelVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/log/SmsLogExcelVO.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.system.controller.admin.sms.vo.log; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.log; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; -import cn.iocoder.yudao.framework.excel.core.convert.JsonConvert; -import cn.iocoder.yudao.module.system.enums.DictTypeConstants; +import cn.fuxiaoaio.ygg.framework.excel.core.annotations.DictFormat; +import cn.fuxiaoaio.ygg.framework.excel.core.convert.DictConvert; +import cn.fuxiaoaio.ygg.framework.excel.core.convert.JsonConvert; +import cn.fuxiaoaio.ygg.module.system.enums.DictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/log/SmsLogExportReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/log/SmsLogExportReqVO.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/log/SmsLogExportReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/log/SmsLogExportReqVO.java index dac30b278..2d18164d8 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/log/SmsLogExportReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/log/SmsLogExportReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.sms.vo.log; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.log; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 短信日志 Excel 导出 Request VO，参数和 SmsLogPageReqVO 是一致的") @Data diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/log/SmsLogPageReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/log/SmsLogPageReqVO.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/log/SmsLogPageReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/log/SmsLogPageReqVO.java index f81da8b14..dfaa896a1 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/log/SmsLogPageReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/log/SmsLogPageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.controller.admin.sms.vo.log; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.log; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 短信日志分页 Request VO") @Data diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/log/SmsLogRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/log/SmsLogRespVO.java similarity index 97% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/log/SmsLogRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/log/SmsLogRespVO.java index 124a1426c..1b5d99ff7 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/log/SmsLogRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/log/SmsLogRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.sms.vo.log; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.log; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/template/SmsTemplateBaseVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/template/SmsTemplateBaseVO.java similarity index 95% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/template/SmsTemplateBaseVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/template/SmsTemplateBaseVO.java index d3e4b0db9..c87d16bed 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/template/SmsTemplateBaseVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/template/SmsTemplateBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.sms.vo.template; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -24,7 +24,7 @@ public class SmsTemplateBaseVO { @NotNull(message = "模板编码不能为空") private String code; - @Schema(description = "模板名称", required = true, example = "yudao") + @Schema(description = "模板名称", required = true, example = "fuxiaoaio") @NotNull(message = "模板名称不能为空") private String name; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/template/SmsTemplateCreateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/template/SmsTemplateCreateReqVO.java similarity index 84% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/template/SmsTemplateCreateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/template/SmsTemplateCreateReqVO.java index 069ebb127..e15a51d42 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/template/SmsTemplateCreateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/template/SmsTemplateCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.sms.vo.template; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/template/SmsTemplateExcelVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/template/SmsTemplateExcelVO.java similarity index 82% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/template/SmsTemplateExcelVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/template/SmsTemplateExcelVO.java index f4f34bd1d..d36982133 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/template/SmsTemplateExcelVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/template/SmsTemplateExcelVO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.controller.admin.sms.vo.template; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; -import cn.iocoder.yudao.module.system.enums.DictTypeConstants; +import cn.fuxiaoaio.ygg.framework.excel.core.annotations.DictFormat; +import cn.fuxiaoaio.ygg.framework.excel.core.convert.DictConvert; +import cn.fuxiaoaio.ygg.module.system.enums.DictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/template/SmsTemplateExportReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/template/SmsTemplateExportReqVO.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/template/SmsTemplateExportReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/template/SmsTemplateExportReqVO.java index b7657c332..cf695854b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/template/SmsTemplateExportReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/template/SmsTemplateExportReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.sms.vo.template; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 短信模板 Excel 导出 Request VO，参数和 SmsTemplatePageReqVO 是一致的") @Data diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/template/SmsTemplatePageReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/template/SmsTemplatePageReqVO.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/template/SmsTemplatePageReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/template/SmsTemplatePageReqVO.java index 21987f1f5..fe1fadf1f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/template/SmsTemplatePageReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/template/SmsTemplatePageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.controller.admin.sms.vo.template; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 短信模板分页 Request VO") @Data diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/template/SmsTemplateRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/template/SmsTemplateRespVO.java similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/template/SmsTemplateRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/template/SmsTemplateRespVO.java index 0ca0fde24..ac5357ef9 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/template/SmsTemplateRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/template/SmsTemplateRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.sms.vo.template; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/template/SmsTemplateSendReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/template/SmsTemplateSendReqVO.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/template/SmsTemplateSendReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/template/SmsTemplateSendReqVO.java index 93eaac275..847d4141d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/template/SmsTemplateSendReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/template/SmsTemplateSendReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.sms.vo.template; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/template/SmsTemplateUpdateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/template/SmsTemplateUpdateReqVO.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/template/SmsTemplateUpdateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/template/SmsTemplateUpdateReqVO.java index 99db6b91d..7e6d84cf5 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/template/SmsTemplateUpdateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/sms/vo/template/SmsTemplateUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.sms.vo.template; +package cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialUserController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/socail/SocialUserController.java similarity index 71% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialUserController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/socail/SocialUserController.java index 3b40b67b2..04f6eb062 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialUserController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/socail/SocialUserController.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.controller.admin.socail; +package cn.fuxiaoaio.ygg.module.system.controller.admin.socail; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.controller.admin.socail.vo.SocialUserBindReqVO; -import cn.iocoder.yudao.module.system.controller.admin.socail.vo.SocialUserUnbindReqVO; -import cn.iocoder.yudao.module.system.convert.social.SocialUserConvert; -import cn.iocoder.yudao.module.system.service.social.SocialUserService; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.socail.vo.SocialUserBindReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.socail.vo.SocialUserUnbindReqVO; +import cn.fuxiaoaio.ygg.module.system.convert.social.SocialUserConvert; +import cn.fuxiaoaio.ygg.module.system.service.social.SocialUserService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import org.springframework.validation.annotation.Validated; @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; -import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; +import static cn.fuxiaoaio.ygg.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; @Tag(name = "管理后台 - 社交用户") @RestController diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/vo/SocialUserBindReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/socail/vo/SocialUserBindReqVO.java similarity index 84% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/vo/SocialUserBindReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/socail/vo/SocialUserBindReqVO.java index 5129895c5..16e8834cb 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/vo/SocialUserBindReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/socail/vo/SocialUserBindReqVO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.controller.admin.socail.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.socail.vo; -import cn.iocoder.yudao.module.system.enums.social.SocialTypeEnum; -import cn.iocoder.yudao.framework.common.validation.InEnum; +import cn.fuxiaoaio.ygg.module.system.enums.social.SocialTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.validation.InEnum; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/vo/SocialUserUnbindReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/socail/vo/SocialUserUnbindReqVO.java similarity index 82% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/vo/SocialUserUnbindReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/socail/vo/SocialUserUnbindReqVO.java index 5c075f21f..f6bad9e80 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/vo/SocialUserUnbindReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/socail/vo/SocialUserUnbindReqVO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.controller.admin.socail.vo; +package cn.fuxiaoaio.ygg.module.system.controller.admin.socail.vo; -import cn.iocoder.yudao.framework.common.validation.InEnum; -import cn.iocoder.yudao.module.system.enums.social.SocialTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.validation.InEnum; +import cn.fuxiaoaio.ygg.module.system.enums.social.SocialTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.http b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/TenantController.http similarity index 100% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.http rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/TenantController.http diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/TenantController.java similarity index 83% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/TenantController.java index e040b0af5..f2b4853d3 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/TenantController.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.module.system.controller.admin.tenant; +package cn.fuxiaoaio.ygg.module.system.controller.admin.tenant; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.*; -import cn.iocoder.yudao.module.system.convert.tenant.TenantConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantDO; -import cn.iocoder.yudao.module.system.service.tenant.TenantService; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.excel.core.util.ExcelUtils; +import cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.tenant.*; +import cn.fuxiaoaio.ygg.module.system.convert.tenant.TenantConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.tenant.TenantDO; +import cn.fuxiaoaio.ygg.module.system.service.tenant.TenantService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -21,8 +21,8 @@ import javax.validation.Valid; import java.io.IOException; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 租户") @RestController diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantPackageController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/TenantPackageController.java similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantPackageController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/TenantPackageController.java index 602426745..25781a61a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantPackageController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/TenantPackageController.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.system.controller.admin.tenant; +package cn.fuxiaoaio.ygg.module.system.controller.admin.tenant; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages.*; -import cn.iocoder.yudao.module.system.convert.tenant.TenantPackageConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantPackageDO; -import cn.iocoder.yudao.module.system.service.tenant.TenantPackageService; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.packages.*; +import cn.fuxiaoaio.ygg.module.system.convert.tenant.TenantPackageConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.tenant.TenantPackageDO; +import cn.fuxiaoaio.ygg.module.system.service.tenant.TenantPackageService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -18,7 +18,7 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 租户套餐") @RestController diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/packages/TenantPackageBaseVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/packages/TenantPackageBaseVO.java old mode 100755 new mode 100644 similarity index 93% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/packages/TenantPackageBaseVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/packages/TenantPackageBaseVO.java index 800b2f3cb..25b756861 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/packages/TenantPackageBaseVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/packages/TenantPackageBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages; +package cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.packages; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/packages/TenantPackageCreateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/packages/TenantPackageCreateReqVO.java old mode 100755 new mode 100644 similarity index 84% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/packages/TenantPackageCreateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/packages/TenantPackageCreateReqVO.java index 255971447..6a498206f --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/packages/TenantPackageCreateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/packages/TenantPackageCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages; +package cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.packages; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/packages/TenantPackagePageReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/packages/TenantPackagePageReqVO.java old mode 100755 new mode 100644 similarity index 83% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/packages/TenantPackagePageReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/packages/TenantPackagePageReqVO.java index 969403879..f03e89c0a --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/packages/TenantPackagePageReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/packages/TenantPackagePageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages; +package cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.packages; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 租户套餐分页 Request VO") @Data diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/packages/TenantPackageRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/packages/TenantPackageRespVO.java old mode 100755 new mode 100644 similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/packages/TenantPackageRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/packages/TenantPackageRespVO.java index 23a6c483b..d2dfb9447 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/packages/TenantPackageRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/packages/TenantPackageRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages; +package cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.packages; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/packages/TenantPackageSimpleRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/packages/TenantPackageSimpleRespVO.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/packages/TenantPackageSimpleRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/packages/TenantPackageSimpleRespVO.java index 4d617225c..e44f485d8 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/packages/TenantPackageSimpleRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/packages/TenantPackageSimpleRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages; +package cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.packages; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/packages/TenantPackageUpdateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/packages/TenantPackageUpdateReqVO.java old mode 100755 new mode 100644 similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/packages/TenantPackageUpdateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/packages/TenantPackageUpdateReqVO.java index 0e1f46b71..aa9abb295 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/packages/TenantPackageUpdateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/packages/TenantPackageUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages; +package cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.packages; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantBaseVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/tenant/TenantBaseVO.java old mode 100755 new mode 100644 similarity index 96% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantBaseVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/tenant/TenantBaseVO.java index 1a79fb847..1e7f459cf --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantBaseVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/tenant/TenantBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant; +package cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.tenant; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantCreateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/tenant/TenantCreateReqVO.java old mode 100755 new mode 100644 similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantCreateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/tenant/TenantCreateReqVO.java index 1b27111dc..69f3cc513 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantCreateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/tenant/TenantCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant; +package cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.tenant; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -15,7 +15,7 @@ import javax.validation.constraints.Size; @ToString(callSuper = true) public class TenantCreateReqVO extends TenantBaseVO { - @Schema(description = "用户账号", required = true, example = "yudao") + @Schema(description = "用户账号", required = true, example = "fuxiaoaio") @NotBlank(message = "用户账号不能为空") @Pattern(regexp = "^[a-zA-Z0-9]{4,30}$", message = "用户账号由 数字、字母 组成") @Size(min = 4, max = 30, message = "用户账号长度为 4-30 个字符") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantExcelVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/tenant/TenantExcelVO.java old mode 100755 new mode 100644 similarity index 72% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantExcelVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/tenant/TenantExcelVO.java index 91b78d2a1..2d702999d --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantExcelVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/tenant/TenantExcelVO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant; +package cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.tenant; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; -import cn.iocoder.yudao.module.system.enums.DictTypeConstants; +import cn.fuxiaoaio.ygg.framework.excel.core.annotations.DictFormat; +import cn.fuxiaoaio.ygg.framework.excel.core.convert.DictConvert; +import cn.fuxiaoaio.ygg.module.system.enums.DictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantExportReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/tenant/TenantExportReqVO.java old mode 100755 new mode 100644 similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantExportReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/tenant/TenantExportReqVO.java index ca219b18c..3816c3749 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantExportReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/tenant/TenantExportReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant; +package cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.tenant; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 租户 Excel 导出 Request VO，参数和 TenantPageReqVO 是一致的" ) @Data diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantPageReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/tenant/TenantPageReqVO.java old mode 100755 new mode 100644 similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantPageReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/tenant/TenantPageReqVO.java index e5704bb68..e786c5296 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantPageReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/tenant/TenantPageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant; +package cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.tenant; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 租户分页 Request VO") @Data diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/tenant/TenantRespVO.java old mode 100755 new mode 100644 similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/tenant/TenantRespVO.java index 1b0c27607..39a00edd2 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/tenant/TenantRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant; +package cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.tenant; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantUpdateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/tenant/TenantUpdateReqVO.java old mode 100755 new mode 100644 similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantUpdateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/tenant/TenantUpdateReqVO.java index ae13d8059..8f8ff29f4 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantUpdateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/tenant/vo/tenant/TenantUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant; +package cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.tenant; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.http b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/UserController.http similarity index 100% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.http rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/UserController.http diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/UserController.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/UserController.java index c2a5246a3..7c4ccae7a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/UserController.java @@ -1,19 +1,19 @@ -package cn.iocoder.yudao.module.system.controller.admin.user; +package cn.fuxiaoaio.ygg.module.system.controller.admin.user; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.*; -import cn.iocoder.yudao.module.system.convert.user.UserConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; -import cn.iocoder.yudao.module.system.service.dept.DeptService; -import cn.iocoder.yudao.module.system.service.user.AdminUserService; -import cn.iocoder.yudao.module.system.enums.common.SexEnum; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.MapUtils; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; +import cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.user.*; +import cn.fuxiaoaio.ygg.module.system.convert.user.UserConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.DeptDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.module.system.service.dept.DeptService; +import cn.fuxiaoaio.ygg.module.system.service.user.AdminUserService; +import cn.fuxiaoaio.ygg.module.system.enums.common.SexEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.MapUtils; +import cn.fuxiaoaio.ygg.framework.excel.core.util.ExcelUtils; +import cn.fuxiaoaio.ygg.framework.operatelog.core.annotations.OperateLog; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -29,10 +29,10 @@ import javax.validation.Valid; import java.io.IOException; import java.util.*; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.convertList; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.convertSet; +import static cn.fuxiaoaio.ygg.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 用户") @RestController diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserProfileController.http b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/UserProfileController.http similarity index 100% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserProfileController.http rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/UserProfileController.http diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserProfileController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/UserProfileController.java similarity index 70% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserProfileController.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/UserProfileController.java index e31c30aa9..369e7a493 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserProfileController.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/UserProfileController.java @@ -1,25 +1,25 @@ -package cn.iocoder.yudao.module.system.controller.admin.user; +package cn.fuxiaoaio.ygg.module.system.controller.admin.user; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileRespVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO; -import cn.iocoder.yudao.module.system.convert.user.UserConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; -import cn.iocoder.yudao.module.system.dal.dataobject.social.SocialUserDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; -import cn.iocoder.yudao.module.system.service.dept.DeptService; -import cn.iocoder.yudao.module.system.service.dept.PostService; -import cn.iocoder.yudao.module.system.service.permission.PermissionService; -import cn.iocoder.yudao.module.system.service.permission.RoleService; -import cn.iocoder.yudao.module.system.service.social.SocialUserService; -import cn.iocoder.yudao.module.system.service.user.AdminUserService; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.datapermission.core.annotation.DataPermission; +import cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.profile.UserProfileRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.convert.user.UserConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.DeptDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.PostDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.RoleDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.social.SocialUserDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.module.system.service.dept.DeptService; +import cn.fuxiaoaio.ygg.module.system.service.dept.PostService; +import cn.fuxiaoaio.ygg.module.system.service.permission.PermissionService; +import cn.fuxiaoaio.ygg.module.system.service.permission.RoleService; +import cn.fuxiaoaio.ygg.module.system.service.social.SocialUserService; +import cn.fuxiaoaio.ygg.module.system.service.user.AdminUserService; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import lombok.extern.slf4j.Slf4j; @@ -31,10 +31,10 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; -import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.FILE_IS_EMPTY; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult.success; +import static cn.fuxiaoaio.ygg.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; +import static cn.fuxiaoaio.ygg.module.infra.enums.ErrorCodeConstants.FILE_IS_EMPTY; @Tag(name = "管理后台 - 用户个人中心") @RestController diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java similarity index 95% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java index 2b4c40c4b..8e272682b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.controller.admin.user.vo.profile; +package cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.profile; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserBaseVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.user.UserBaseVO; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/profile/UserProfileUpdatePasswordReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/profile/UserProfileUpdatePasswordReqVO.java similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/profile/UserProfileUpdatePasswordReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/profile/UserProfileUpdatePasswordReqVO.java index ed6b2ca35..841823c91 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/profile/UserProfileUpdatePasswordReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/profile/UserProfileUpdatePasswordReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.user.vo.profile; +package cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.profile; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java index 4aea0d877..f4379866f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.user.vo.profile; +package cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.profile; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -16,7 +16,7 @@ public class UserProfileUpdateReqVO { @Size(max = 30, message = "用户昵称长度不能超过 30 个字符") private String nickname; - @Schema(description = "用户邮箱", example = "yudao@iocoder.cn") + @Schema(description = "用户邮箱", example = "fuxiaoaio@iocoder.cn") @Email(message = "邮箱格式不正确") @Size(max = 50, message = "邮箱长度不能超过 50 个字符") private String email; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserBaseVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserBaseVO.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserBaseVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserBaseVO.java index 7b862e50b..cedac6038 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserBaseVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserBaseVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.controller.admin.user.vo.user; +package cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.user; -import cn.iocoder.yudao.framework.common.validation.Mobile; +import cn.fuxiaoaio.ygg.framework.common.validation.Mobile; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -17,7 +17,7 @@ import java.util.Set; @Data public class UserBaseVO { - @Schema(description = "用户账号", required = true, example = "yudao") + @Schema(description = "用户账号", required = true, example = "fuxiaoaio") @NotBlank(message = "用户账号不能为空") @Pattern(regexp = "^[a-zA-Z0-9]{4,30}$", message = "用户账号由 数字、字母 组成") @Size(min = 4, max = 30, message = "用户账号长度为 4-30 个字符") @@ -36,7 +36,7 @@ public class UserBaseVO { @Schema(description = "岗位编号数组", example = "1") private Set postIds; - @Schema(description = "用户邮箱", example = "yudao@iocoder.cn") + @Schema(description = "用户邮箱", example = "fuxiaoaio@iocoder.cn") @Email(message = "邮箱格式不正确") @Size(max = 50, message = "邮箱长度不能超过 50 个字符") private String email; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserCreateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserCreateReqVO.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserCreateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserCreateReqVO.java index 680410129..a9a1ab57f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserCreateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.user.vo.user; +package cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.user; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserExcelVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserExcelVO.java similarity index 80% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserExcelVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserExcelVO.java index 16899c263..19e8ee3b5 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserExcelVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserExcelVO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.controller.admin.user.vo.user; +package cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.user; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; -import cn.iocoder.yudao.module.system.enums.DictTypeConstants; +import cn.fuxiaoaio.ygg.framework.excel.core.annotations.DictFormat; +import cn.fuxiaoaio.ygg.framework.excel.core.convert.DictConvert; +import cn.fuxiaoaio.ygg.module.system.enums.DictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserExportReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserExportReqVO.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserExportReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserExportReqVO.java index a2433c6df..17899a87b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserExportReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserExportReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.user.vo.user; +package cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.user; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; @@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 用户导出 Request VO，参数和 UserPageReqVO 是一致的") @Data @@ -17,10 +17,10 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_ @AllArgsConstructor public class UserExportReqVO { - @Schema(description = "用户账号，模糊匹配", example = "yudao") + @Schema(description = "用户账号，模糊匹配", example = "fuxiaoaio") private String username; - @Schema(description = "手机号码，模糊匹配", example = "yudao") + @Schema(description = "手机号码，模糊匹配", example = "fuxiaoaio") private String mobile; @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportExcelVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserImportExcelVO.java similarity index 80% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportExcelVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserImportExcelVO.java index a360f1af2..fb399fd30 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportExcelVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserImportExcelVO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.controller.admin.user.vo.user; +package cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.user; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; -import cn.iocoder.yudao.module.system.enums.DictTypeConstants; +import cn.fuxiaoaio.ygg.framework.excel.core.annotations.DictFormat; +import cn.fuxiaoaio.ygg.framework.excel.core.convert.DictConvert; +import cn.fuxiaoaio.ygg.module.system.enums.DictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserImportRespVO.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserImportRespVO.java index ecb619bc8..38b9cd9eb 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserImportRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.user.vo.user; +package cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.user; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserPageItemRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserPageItemRespVO.java similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserPageItemRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserPageItemRespVO.java index 28e13bed3..89f4a6ac9 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserPageItemRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserPageItemRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.user.vo.user; +package cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.user; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserPageReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserPageReqVO.java similarity index 84% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserPageReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserPageReqVO.java index 85d62825e..77155bb20 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserPageReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserPageReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.controller.admin.user.vo.user; +package cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.user; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -11,7 +11,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 用户分页 Request VO") @Data @@ -20,10 +20,10 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_ @EqualsAndHashCode(callSuper = true) public class UserPageReqVO extends PageParam { - @Schema(description = "用户账号，模糊匹配", example = "yudao") + @Schema(description = "用户账号，模糊匹配", example = "fuxiaoaio") private String username; - @Schema(description = "手机号码， 模糊匹配", example = "yudao") + @Schema(description = "手机号码， 模糊匹配", example = "fuxiaoaio") private String mobile; @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserRespVO.java similarity index 93% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserRespVO.java index 88287d065..93af6cb45 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.user.vo.user; +package cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.user; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java index 25e10a6d9..bde53a06f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.user.vo.user; +package cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.user; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserUpdatePasswordReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserUpdatePasswordReqVO.java similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserUpdatePasswordReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserUpdatePasswordReqVO.java index a1df8376e..2d676de2e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserUpdatePasswordReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserUpdatePasswordReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.user.vo.user; +package cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.user; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserUpdateReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserUpdateReqVO.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserUpdateReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserUpdateReqVO.java index 40761cf99..b027f048c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserUpdateReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.user.vo.user; +package cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.user; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserUpdateStatusReqVO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserUpdateStatusReqVO.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserUpdateStatusReqVO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserUpdateStatusReqVO.java index 780ea8c1c..b73ff1749 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserUpdateStatusReqVO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/admin/user/vo/user/UserUpdateStatusReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.user.vo.user; +package cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.user; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/app/dict/AppDictDataController.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/app/dict/AppDictDataController.java new file mode 100644 index 000000000..fc11ba5eb --- /dev/null +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/app/dict/AppDictDataController.java @@ -0,0 +1,4 @@ +package cn.fuxiaoaio.ygg.module.system.controller.app.dict; + +public class AppDictDataController { +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/package-info.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/app/package-info.java similarity index 52% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/package-info.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/app/package-info.java index 9e4739f4c..0a3455aaa 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/package-info.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/app/package-info.java @@ -1,4 +1,4 @@ /** * 占位，避免 package 无法提交到 Git 仓库 */ -package cn.iocoder.yudao.module.system.controller.app; +package cn.fuxiaoaio.ygg.module.system.controller.app; diff --git a/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/package-info.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/package-info.java new file mode 100644 index 000000000..5467225b8 --- /dev/null +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/controller/package-info.java @@ -0,0 +1,6 @@ +/** + * 提供 RESTful API 给前端： + * 1. admin 包：提供给管理后台 fuxiaoaio-ui-admin 前端项目 + * 2. app 包：提供给用户 APP fuxiaoaio-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分 + */ +package cn.fuxiaoaio.ygg.module.system.controller; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/auth/AuthConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/auth/AuthConvert.java similarity index 77% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/auth/AuthConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/auth/AuthConvert.java index aaa21a05d..3bdb3bc91 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/auth/AuthConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/auth/AuthConvert.java @@ -1,22 +1,22 @@ -package cn.iocoder.yudao.module.system.convert.auth; +package cn.fuxiaoaio.ygg.module.system.convert.auth; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeSendReqDTO; -import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeUseReqDTO; -import cn.iocoder.yudao.module.system.api.social.dto.SocialUserBindReqDTO; -import cn.iocoder.yudao.module.system.controller.admin.auth.vo.*; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.module.system.api.sms.dto.code.SmsCodeSendReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.sms.dto.code.SmsCodeUseReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.social.dto.SocialUserBindReqDTO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.auth.vo.*; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.MenuDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.RoleDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; import org.slf4j.LoggerFactory; import java.util.*; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*; -import static cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO.ID_ROOT; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.*; +import static cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.MenuDO.ID_ROOT; @Mapper public interface AuthConvert { diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/auth/OAuth2ClientConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/auth/OAuth2ClientConvert.java old mode 100755 new mode 100644 similarity index 66% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/auth/OAuth2ClientConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/auth/OAuth2ClientConvert.java index 87f408aac..b46ac781e --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/auth/OAuth2ClientConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/auth/OAuth2ClientConvert.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.convert.auth; +package cn.fuxiaoaio.ygg.module.system.convert.auth; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.client.OAuth2ClientCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.client.OAuth2ClientRespVO; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.client.OAuth2ClientUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ClientDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.client.OAuth2ClientCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.client.OAuth2ClientRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.client.OAuth2ClientUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2ClientDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/auth/OAuth2TokenConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/auth/OAuth2TokenConvert.java similarity index 57% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/auth/OAuth2TokenConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/auth/OAuth2TokenConvert.java index 17c62f0dd..8eec16b3e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/auth/OAuth2TokenConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/auth/OAuth2TokenConvert.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.convert.auth; +package cn.fuxiaoaio.ygg.module.system.convert.auth; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.api.oauth2.dto.OAuth2AccessTokenCheckRespDTO; -import cn.iocoder.yudao.module.system.api.oauth2.dto.OAuth2AccessTokenRespDTO; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.token.OAuth2AccessTokenRespVO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.api.oauth2.dto.OAuth2AccessTokenCheckRespDTO; +import cn.fuxiaoaio.ygg.module.system.api.oauth2.dto.OAuth2AccessTokenRespDTO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.token.OAuth2AccessTokenRespVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dept/DeptConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/dept/DeptConvert.java similarity index 59% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dept/DeptConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/dept/DeptConvert.java index e8ee7cee7..80be27aa6 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dept/DeptConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/dept/DeptConvert.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.convert.dept; +package cn.fuxiaoaio.ygg.module.system.convert.dept; -import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptRespVO; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptSimpleRespVO; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; +import cn.fuxiaoaio.ygg.module.system.api.dept.dto.DeptRespDTO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.dept.DeptCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.dept.DeptRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.dept.DeptSimpleRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.dept.DeptUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.DeptDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dept/PostConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/dept/PostConvert.java similarity index 68% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dept/PostConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/dept/PostConvert.java index 86a548edb..d7d34b0f6 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dept/PostConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/dept/PostConvert.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.convert.dept; +package cn.fuxiaoaio.ygg.module.system.convert.dept; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.*; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.post.*; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.PostDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dict/DictDataConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/dict/DictDataConvert.java similarity index 67% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dict/DictDataConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/dict/DictDataConvert.java index 3955e4566..a09d9555b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dict/DictDataConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/dict/DictDataConvert.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.system.convert.dict; +package cn.fuxiaoaio.ygg.module.system.convert.dict; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.*; -import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.api.dict.dto.DictDataRespDTO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.data.*; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dict.DictDataDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dict/DictTypeConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/dict/DictTypeConvert.java similarity index 70% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dict/DictTypeConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/dict/DictTypeConvert.java index 392e3082e..6ff84268e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dict/DictTypeConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/dict/DictTypeConvert.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.convert.dict; +package cn.fuxiaoaio.ygg.module.system.convert.dict; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.*; -import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictTypeDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.type.*; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dict.DictTypeDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/errorcode/ErrorCodeConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/errorcode/ErrorCodeConvert.java similarity index 61% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/errorcode/ErrorCodeConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/errorcode/ErrorCodeConvert.java index 3e1abd86b..f47d2001b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/errorcode/ErrorCodeConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/errorcode/ErrorCodeConvert.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.module.system.convert.errorcode; +package cn.fuxiaoaio.ygg.module.system.convert.errorcode; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeAutoGenerateReqDTO; -import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeRespDTO; -import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeExcelVO; -import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeRespVO; -import cn.iocoder.yudao.module.system.dal.dataobject.errorcode.ErrorCodeDO; -import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeUpdateReqVO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.api.errorcode.dto.ErrorCodeAutoGenerateReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.errorcode.dto.ErrorCodeRespDTO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode.vo.ErrorCodeCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode.vo.ErrorCodeExcelVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode.vo.ErrorCodeRespVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.errorcode.ErrorCodeDO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode.vo.ErrorCodeUpdateReqVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/ip/AreaConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/ip/AreaConvert.java similarity index 62% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/ip/AreaConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/ip/AreaConvert.java index 0cedf8785..b8671611f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/ip/AreaConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/ip/AreaConvert.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.convert.ip; +package cn.fuxiaoaio.ygg.module.system.convert.ip; -import cn.iocoder.yudao.framework.ip.core.Area; -import cn.iocoder.yudao.module.system.controller.admin.ip.vo.AreaNodeRespVO; +import cn.fuxiaoaio.ygg.framework.ip.core.Area; +import cn.fuxiaoaio.ygg.module.system.controller.admin.ip.vo.AreaNodeRespVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/logger/LoginLogConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/logger/LoginLogConvert.java similarity index 56% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/logger/LoginLogConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/logger/LoginLogConvert.java index ea50d4b09..e8ab1171f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/logger/LoginLogConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/logger/LoginLogConvert.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.convert.logger; +package cn.fuxiaoaio.ygg.module.system.convert.logger; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.api.logger.dto.LoginLogCreateReqDTO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog.LoginLogExcelVO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog.LoginLogRespVO; -import cn.iocoder.yudao.module.system.dal.dataobject.logger.LoginLogDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.api.logger.dto.LoginLogCreateReqDTO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.loginlog.LoginLogExcelVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.loginlog.LoginLogRespVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.logger.LoginLogDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/logger/OperateLogConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/logger/OperateLogConvert.java similarity index 67% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/logger/OperateLogConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/logger/OperateLogConvert.java index b79ca3f72..cc3769fc8 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/logger/OperateLogConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/logger/OperateLogConvert.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.system.convert.logger; +package cn.fuxiaoaio.ygg.module.system.convert.logger; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.MapUtils; -import cn.iocoder.yudao.module.system.api.logger.dto.OperateLogCreateReqDTO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogExcelVO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogRespVO; -import cn.iocoder.yudao.module.system.dal.dataobject.logger.OperateLogDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.MapUtils; +import cn.fuxiaoaio.ygg.module.system.api.logger.dto.OperateLogCreateReqDTO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.operatelog.OperateLogExcelVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.operatelog.OperateLogRespVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.logger.OperateLogDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; @@ -14,7 +14,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.SUCCESS; +import static cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants.SUCCESS; @Mapper public interface OperateLogConvert { diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/mail/MailAccountConvert.java similarity index 82% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/mail/MailAccountConvert.java index ffd150135..1fa791950 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/mail/MailAccountConvert.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.convert.mail; +package cn.fuxiaoaio.ygg.module.system.convert.mail; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.mail.MailAccount; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.*; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.account.*; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailAccountDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailLogConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/mail/MailLogConvert.java similarity index 58% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailLogConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/mail/MailLogConvert.java index c5599e355..66716bc94 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailLogConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/mail/MailLogConvert.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.convert.mail; +package cn.fuxiaoaio.ygg.module.system.convert.mail; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogRespVO; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.log.MailLogRespVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailLogDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailTemplateConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/mail/MailTemplateConvert.java similarity index 61% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailTemplateConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/mail/MailTemplateConvert.java index c130ffc74..289d5e6f0 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailTemplateConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/mail/MailTemplateConvert.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.convert.mail; +package cn.fuxiaoaio.ygg.module.system.convert.mail; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateRespVO; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateSimpleRespVO; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.template.MailTemplateRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.template.MailTemplateSimpleRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.template.MailTemplateUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailTemplateDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notice/NoticeConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/notice/NoticeConvert.java similarity index 54% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notice/NoticeConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/notice/NoticeConvert.java index ad2bedec7..f1421b46b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notice/NoticeConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/notice/NoticeConvert.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.convert.notice; +package cn.fuxiaoaio.ygg.module.system.convert.notice; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticeCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticeRespVO; -import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticeUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.notice.NoticeDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notice.vo.NoticeCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notice.vo.NoticeRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notice.vo.NoticeUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.notice.NoticeDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyMessageConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/notify/NotifyMessageConvert.java similarity index 68% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyMessageConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/notify/NotifyMessageConvert.java index 4a393d30c..d7046d791 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyMessageConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/notify/NotifyMessageConvert.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.convert.notify; +package cn.fuxiaoaio.ygg.module.system.convert.notify; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageRespVO; -import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.message.NotifyMessageRespVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.notify.NotifyMessageDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyTemplateConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/notify/NotifyTemplateConvert.java similarity index 67% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyTemplateConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/notify/NotifyTemplateConvert.java index e83d51d5b..9a0fc328f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyTemplateConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/notify/NotifyTemplateConvert.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.convert.notify; +package cn.fuxiaoaio.ygg.module.system.convert.notify; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateRespVO; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.template.NotifyTemplateCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.template.NotifyTemplateRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.template.NotifyTemplateUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.notify.NotifyTemplateDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/oauth2/OAuth2OpenConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/oauth2/OAuth2OpenConvert.java similarity index 73% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/oauth2/OAuth2OpenConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/oauth2/OAuth2OpenConvert.java index 3426e5c8f..a0a4f34d7 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/oauth2/OAuth2OpenConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/oauth2/OAuth2OpenConvert.java @@ -1,17 +1,17 @@ -package cn.iocoder.yudao.module.system.convert.oauth2; +package cn.fuxiaoaio.ygg.module.system.convert.oauth2; import cn.hutool.core.date.LocalDateTimeUtil; -import cn.iocoder.yudao.framework.common.core.KeyValue; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.open.OAuth2OpenAccessTokenRespVO; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.open.OAuth2OpenAuthorizeInfoRespVO; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.open.OAuth2OpenCheckTokenRespVO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ApproveDO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ClientDO; -import cn.iocoder.yudao.module.system.util.oauth2.OAuth2Utils; +import cn.fuxiaoaio.ygg.framework.common.core.KeyValue; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.framework.security.core.util.SecurityFrameworkUtils; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.open.OAuth2OpenAccessTokenRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.open.OAuth2OpenAuthorizeInfoRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.open.OAuth2OpenCheckTokenRespVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2ApproveDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2ClientDO; +import cn.fuxiaoaio.ygg.module.system.util.oauth2.OAuth2Utils; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/oauth2/OAuth2UserConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/oauth2/OAuth2UserConvert.java similarity index 55% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/oauth2/OAuth2UserConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/oauth2/OAuth2UserConvert.java index b2610565a..3fce36f6b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/oauth2/OAuth2UserConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/oauth2/OAuth2UserConvert.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.convert.oauth2; +package cn.fuxiaoaio.ygg.module.system.convert.oauth2; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.user.OAuth2UserInfoRespVO; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.user.OAuth2UserUpdateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.user.OAuth2UserInfoRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.user.OAuth2UserUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.DeptDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.PostDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/package-info.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/package-info.java similarity index 61% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/package-info.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/package-info.java index b1ce8e379..e8fba2736 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/package-info.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/package-info.java @@ -3,4 +3,4 @@ * * 目前使用 MapStruct 框架 */ -package cn.iocoder.yudao.module.system.convert; +package cn.fuxiaoaio.ygg.module.system.convert; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/permission/MenuConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/permission/MenuConvert.java similarity index 59% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/permission/MenuConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/permission/MenuConvert.java index 0fb3505cc..4af7fff9d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/permission/MenuConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/permission/MenuConvert.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.convert.permission; +package cn.fuxiaoaio.ygg.module.system.convert.permission; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuRespVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuSimpleRespVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.menu.MenuCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.menu.MenuRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.menu.MenuSimpleRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.menu.MenuUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.MenuDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/permission/RoleConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/permission/RoleConvert.java similarity index 67% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/permission/RoleConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/permission/RoleConvert.java index 73475ee4d..5c26b6221 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/permission/RoleConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/permission/RoleConvert.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.convert.permission; +package cn.fuxiaoaio.ygg.module.system.convert.permission; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.*; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; -import cn.iocoder.yudao.module.system.service.permission.bo.RoleCreateReqBO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role.*; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.RoleDO; +import cn.fuxiaoaio.ygg.module.system.service.permission.bo.RoleCreateReqBO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/sensitiveword/SensitiveWordConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/sensitiveword/SensitiveWordConvert.java similarity index 65% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/sensitiveword/SensitiveWordConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/sensitiveword/SensitiveWordConvert.java index fde03dbf3..0a66967ca 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/sensitiveword/SensitiveWordConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/sensitiveword/SensitiveWordConvert.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.convert.sensitiveword; +package cn.fuxiaoaio.ygg.module.system.convert.sensitiveword; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.SensitiveWordCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.SensitiveWordExcelVO; -import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.SensitiveWordRespVO; -import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.SensitiveWordUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.sensitiveword.SensitiveWordDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword.vo.SensitiveWordCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword.vo.SensitiveWordExcelVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword.vo.SensitiveWordRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword.vo.SensitiveWordUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sensitiveword.SensitiveWordDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/sms/SmsChannelConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/sms/SmsChannelConvert.java similarity index 63% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/sms/SmsChannelConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/sms/SmsChannelConvert.java index 0776c58f6..73d7a4d3f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/sms/SmsChannelConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/sms/SmsChannelConvert.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.system.convert.sms; +package cn.fuxiaoaio.ygg.module.system.convert.sms; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelRespVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelSimpleRespVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsChannelDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.channel.SmsChannelCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.channel.SmsChannelRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.channel.SmsChannelSimpleRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.channel.SmsChannelUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsChannelDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.sms.core.property.SmsChannelProperties; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/sms/SmsLogConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/sms/SmsLogConvert.java similarity index 63% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/sms/SmsLogConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/sms/SmsLogConvert.java index 40efe60a1..2569640e7 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/sms/SmsLogConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/sms/SmsLogConvert.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.system.convert.sms; +package cn.fuxiaoaio.ygg.module.system.convert.sms; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.log.SmsLogExcelVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.log.SmsLogRespVO; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsLogDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.log.SmsLogExcelVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.log.SmsLogRespVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsLogDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/sms/SmsTemplateConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/sms/SmsTemplateConvert.java similarity index 62% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/sms/SmsTemplateConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/sms/SmsTemplateConvert.java index b0fb02b8f..fb2115939 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/sms/SmsTemplateConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/sms/SmsTemplateConvert.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.convert.sms; +package cn.fuxiaoaio.ygg.module.system.convert.sms; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplateCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplateExcelVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplateRespVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplateUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template.SmsTemplateCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template.SmsTemplateExcelVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template.SmsTemplateRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template.SmsTemplateUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsTemplateDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/social/SocialUserConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/social/SocialUserConvert.java similarity index 59% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/social/SocialUserConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/social/SocialUserConvert.java index 7cc8066d7..9fd20675a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/social/SocialUserConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/social/SocialUserConvert.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.system.convert.social; +package cn.fuxiaoaio.ygg.module.system.convert.social; -import cn.iocoder.yudao.module.system.api.social.dto.SocialUserBindReqDTO; -import cn.iocoder.yudao.module.system.api.social.dto.SocialUserUnbindReqDTO; -import cn.iocoder.yudao.module.system.controller.admin.socail.vo.SocialUserBindReqVO; -import cn.iocoder.yudao.module.system.controller.admin.socail.vo.SocialUserUnbindReqVO; +import cn.fuxiaoaio.ygg.module.system.api.social.dto.SocialUserBindReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.social.dto.SocialUserUnbindReqDTO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.socail.vo.SocialUserBindReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.socail.vo.SocialUserUnbindReqVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/tenant/TenantConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/tenant/TenantConvert.java old mode 100755 new mode 100644 similarity index 67% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/tenant/TenantConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/tenant/TenantConvert.java index d40e481d8..71aa77e20 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/tenant/TenantConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/tenant/TenantConvert.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.system.convert.tenant; +package cn.fuxiaoaio.ygg.module.system.convert.tenant; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantExcelVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantRespVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantUpdateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserCreateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.tenant.TenantCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.tenant.TenantExcelVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.tenant.TenantRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.tenant.TenantUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.user.UserCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.tenant.TenantDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/tenant/TenantPackageConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/tenant/TenantPackageConvert.java old mode 100755 new mode 100644 similarity index 63% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/tenant/TenantPackageConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/tenant/TenantPackageConvert.java index ff8c7e4ae..e0f42fae0 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/tenant/TenantPackageConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/tenant/TenantPackageConvert.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.system.convert.tenant; +package cn.fuxiaoaio.ygg.module.system.convert.tenant; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleSimpleRespVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages.TenantPackageCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages.TenantPackageRespVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages.TenantPackageSimpleRespVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages.TenantPackageUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantPackageDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role.RoleSimpleRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.packages.TenantPackageCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.packages.TenantPackageRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.packages.TenantPackageSimpleRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.packages.TenantPackageUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.tenant.TenantPackageDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/user/UserConvert.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/user/UserConvert.java similarity index 64% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/user/UserConvert.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/user/UserConvert.java index 0c5639c51..15fffdef3 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/user/UserConvert.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/user/UserConvert.java @@ -1,15 +1,15 @@ -package cn.iocoder.yudao.module.system.convert.user; +package cn.fuxiaoaio.ygg.module.system.convert.user; -import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileRespVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.*; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; -import cn.iocoder.yudao.module.system.dal.dataobject.social.SocialUserDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.module.system.api.user.dto.AdminUserRespDTO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.profile.UserProfileRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.user.*; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.DeptDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.PostDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.RoleDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.social.SocialUserDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md new file mode 100644 index 000000000..8c7cde516 --- /dev/null +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md @@ -0,0 +1 @@ + diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dept/DeptDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/dept/DeptDO.java similarity index 82% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dept/DeptDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/dept/DeptDO.java index 31f90cfc4..b953fa13d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dept/DeptDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/dept/DeptDO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.dept; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.tenant.core.db.TenantBaseDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dept/PostDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/dept/PostDO.java similarity index 83% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dept/PostDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/dept/PostDO.java index 3c97a9c8b..af6fbd4ba 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dept/PostDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/dept/PostDO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.dept; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dept/UserPostDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/dept/UserPostDO.java similarity index 81% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dept/UserPostDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/dept/UserPostDO.java index b2a4f5271..c6e0760b4 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dept/UserPostDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/dept/UserPostDO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.dept; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dict/DictDataDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/dict/DictDataDO.java similarity index 86% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dict/DictDataDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/dict/DictDataDO.java index 9223c18a4..9b10e6358 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dict/DictDataDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/dict/DictDataDO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.dict; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.dict; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dict/DictTypeDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/dict/DictTypeDO.java similarity index 84% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dict/DictTypeDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/dict/DictTypeDO.java index 4f4476fb1..5ea2c6ed9 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dict/DictTypeDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/dict/DictTypeDO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.dict; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.dict; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/errorcode/ErrorCodeDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/errorcode/ErrorCodeDO.java similarity index 84% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/errorcode/ErrorCodeDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/errorcode/ErrorCodeDO.java index 9ad563395..305080919 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/errorcode/ErrorCodeDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/errorcode/ErrorCodeDO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.errorcode; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.errorcode; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.system.enums.errorcode.ErrorCodeTypeEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.module.system.enums.errorcode.ErrorCodeTypeEnum; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/logger/LoginLogDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/logger/LoginLogDO.java similarity index 81% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/logger/LoginLogDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/logger/LoginLogDO.java index d2fbcb9c0..07551004a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/logger/LoginLogDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/logger/LoginLogDO.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.logger; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.logger; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.system.enums.logger.LoginLogTypeEnum; -import cn.iocoder.yudao.module.system.enums.logger.LoginResultEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.module.system.enums.logger.LoginLogTypeEnum; +import cn.fuxiaoaio.ygg.module.system.enums.logger.LoginResultEnum; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/logger/OperateLogDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/logger/OperateLogDO.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/logger/OperateLogDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/logger/OperateLogDO.java index d4d4df497..93f4b16fb 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/logger/OperateLogDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/logger/OperateLogDO.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.logger; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.logger; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.operatelog.core.enums.OperateTypeEnum; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/mail/MailAccountDO.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/mail/MailAccountDO.java index 275fc8570..faa0dfaf2 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/mail/MailAccountDO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.mail; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/mail/MailLogDO.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/mail/MailLogDO.java index 8a9121de1..8ff918da6 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/mail/MailLogDO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.mail; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.system.enums.mail.MailSendStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.module.system.enums.mail.MailSendStatusEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/mail/MailTemplateDO.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/mail/MailTemplateDO.java index f669b455f..3eeb16f46 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailTemplateDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/mail/MailTemplateDO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.mail; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notice/NoticeDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/notice/NoticeDO.java similarity index 77% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notice/NoticeDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/notice/NoticeDO.java index e7149d160..6ab4d358c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notice/NoticeDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/notice/NoticeDO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.notice; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.notice; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.system.enums.notice.NoticeTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.module.system.enums.notice.NoticeTypeEnum; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/notify/NotifyMessageDO.java similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/notify/NotifyMessageDO.java index 501a77cb5..1315c2db3 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/notify/NotifyMessageDO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.notify; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.notify; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyTemplateDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/notify/NotifyTemplateDO.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyTemplateDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/notify/NotifyTemplateDO.java index 1bce809a1..12ea5e251 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyTemplateDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/notify/NotifyTemplateDO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.notify; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.notify; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/oauth2/OAuth2AccessTokenDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/oauth2/OAuth2AccessTokenDO.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/oauth2/OAuth2AccessTokenDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/oauth2/OAuth2AccessTokenDO.java index e09551dfc..0fea31110 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/oauth2/OAuth2AccessTokenDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/oauth2/OAuth2AccessTokenDO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.oauth2; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.tenant.core.db.TenantBaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/oauth2/OAuth2ApproveDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/oauth2/OAuth2ApproveDO.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/oauth2/OAuth2ApproveDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/oauth2/OAuth2ApproveDO.java index e07b0a017..9d2af26e1 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/oauth2/OAuth2ApproveDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/oauth2/OAuth2ApproveDO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.oauth2; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/oauth2/OAuth2ClientDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/oauth2/OAuth2ClientDO.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/oauth2/OAuth2ClientDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/oauth2/OAuth2ClientDO.java index 721a42e91..80176bca5 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/oauth2/OAuth2ClientDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/oauth2/OAuth2ClientDO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.oauth2; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.system.enums.oauth2.OAuth2GrantTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.module.system.enums.oauth2.OAuth2GrantTypeEnum; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/oauth2/OAuth2CodeDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/oauth2/OAuth2CodeDO.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/oauth2/OAuth2CodeDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/oauth2/OAuth2CodeDO.java index fad9c16e9..6f81ffe46 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/oauth2/OAuth2CodeDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/oauth2/OAuth2CodeDO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.oauth2; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/oauth2/OAuth2RefreshTokenDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/oauth2/OAuth2RefreshTokenDO.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/oauth2/OAuth2RefreshTokenDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/oauth2/OAuth2RefreshTokenDO.java index 70ddea20e..4fe4a904d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/oauth2/OAuth2RefreshTokenDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/oauth2/OAuth2RefreshTokenDO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.oauth2; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/permission/MenuDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/permission/MenuDO.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/permission/MenuDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/permission/MenuDO.java index 90d583329..5bcef9810 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/permission/MenuDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/permission/MenuDO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.permission; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.system.enums.permission.MenuTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.module.system.enums.permission.MenuTypeEnum; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/permission/RoleDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/permission/RoleDO.java similarity index 80% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/permission/RoleDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/permission/RoleDO.java index ab0ec912a..c27d23518 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/permission/RoleDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/permission/RoleDO.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.permission; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.mybatis.core.type.JsonLongSetTypeHandler; -import cn.iocoder.yudao.module.system.enums.permission.DataScopeEnum; -import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; -import cn.iocoder.yudao.module.system.enums.permission.RoleTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.type.JsonLongSetTypeHandler; +import cn.fuxiaoaio.ygg.module.system.enums.permission.DataScopeEnum; +import cn.fuxiaoaio.ygg.framework.tenant.core.db.TenantBaseDO; +import cn.fuxiaoaio.ygg.module.system.enums.permission.RoleTypeEnum; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/permission/RoleMenuDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/permission/RoleMenuDO.java similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/permission/RoleMenuDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/permission/RoleMenuDO.java index 4978b0e4d..a1478a866 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/permission/RoleMenuDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/permission/RoleMenuDO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.permission; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission; -import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; +import cn.fuxiaoaio.ygg.framework.tenant.core.db.TenantBaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/permission/UserRoleDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/permission/UserRoleDO.java similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/permission/UserRoleDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/permission/UserRoleDO.java index 010184066..bf6767a54 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/permission/UserRoleDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/permission/UserRoleDO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.permission; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/sensitiveword/SensitiveWordDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/sensitiveword/SensitiveWordDO.java similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/sensitiveword/SensitiveWordDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/sensitiveword/SensitiveWordDO.java index 37dc57968..dceb4054c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/sensitiveword/SensitiveWordDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/sensitiveword/SensitiveWordDO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.sensitiveword; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.sensitiveword; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.framework.mybatis.core.type.StringListTypeHandler; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.type.StringListTypeHandler; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/sms/SmsChannelDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/sms/SmsChannelDO.java similarity index 82% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/sms/SmsChannelDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/sms/SmsChannelDO.java index c57ea5b59..6a08bd3d0 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/sms/SmsChannelDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/sms/SmsChannelDO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.sms; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.framework.sms.core.enums.SmsChannelEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.sms.core.enums.SmsChannelEnum; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/sms/SmsCodeDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/sms/SmsCodeDO.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/sms/SmsCodeDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/sms/SmsCodeDO.java index 00aea3a4a..63acd5f26 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/sms/SmsCodeDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/sms/SmsCodeDO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.sms; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/sms/SmsLogDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/sms/SmsLogDO.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/sms/SmsLogDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/sms/SmsLogDO.java index 173c21c4d..90b0907b0 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/sms/SmsLogDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/sms/SmsLogDO.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.sms; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms; -import cn.iocoder.yudao.module.system.enums.sms.SmsReceiveStatusEnum; -import cn.iocoder.yudao.module.system.enums.sms.SmsSendStatusEnum; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; +import cn.fuxiaoaio.ygg.module.system.enums.sms.SmsReceiveStatusEnum; +import cn.fuxiaoaio.ygg.module.system.enums.sms.SmsSendStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/sms/SmsTemplateDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/sms/SmsTemplateDO.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/sms/SmsTemplateDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/sms/SmsTemplateDO.java index e7f02c191..862619334 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/sms/SmsTemplateDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/sms/SmsTemplateDO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.sms; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms; -import cn.iocoder.yudao.module.system.enums.sms.SmsTemplateTypeEnum; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.module.system.enums.sms.SmsTemplateTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/social/SocialUserBindDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/social/SocialUserBindDO.java similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/social/SocialUserBindDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/social/SocialUserBindDO.java index c5dd5f4ac..34479c80a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/social/SocialUserBindDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/social/SocialUserBindDO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.social; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.social; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/social/SocialUserDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/social/SocialUserDO.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/social/SocialUserDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/social/SocialUserDO.java index f6f358b4a..4ad23df98 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/social/SocialUserDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/social/SocialUserDO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.social; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.social; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.system.enums.social.SocialTypeEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.module.system.enums.social.SocialTypeEnum; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/tenant/TenantDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/tenant/TenantDO.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/tenant/TenantDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/tenant/TenantDO.java index 17b42efa3..74f34deca 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/tenant/TenantDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/tenant/TenantDO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.tenant; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.tenant; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/tenant/TenantPackageDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/tenant/TenantPackageDO.java similarity index 81% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/tenant/TenantPackageDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/tenant/TenantPackageDO.java index 430c3a080..d868de7f2 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/tenant/TenantPackageDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/tenant/TenantPackageDO.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.tenant; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.tenant; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.framework.mybatis.core.type.JsonLongSetTypeHandler; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.type.JsonLongSetTypeHandler; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/user/AdminUserDO.java similarity index 86% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/user/AdminUserDO.java index fa05f0d0d..0310cc137 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/dataobject/user/AdminUserDO.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.user; +package cn.fuxiaoaio.ygg.module.system.dal.dataobject.user; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.mybatis.core.type.JsonLongSetTypeHandler; -import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; -import cn.iocoder.yudao.module.system.enums.common.SexEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.mybatis.core.type.JsonLongSetTypeHandler; +import cn.fuxiaoaio.ygg.framework.tenant.core.db.TenantBaseDO; +import cn.fuxiaoaio.ygg.module.system.enums.common.SexEnum; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/dept/DeptMapper.java similarity index 69% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/dept/DeptMapper.java index def79df69..fa3a6789c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/dept/DeptMapper.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.system.dal.mysql.dept; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.dept; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.dept.DeptListReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.DeptDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/PostMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/dept/PostMapper.java similarity index 76% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/PostMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/dept/PostMapper.java index ba062a2c0..e1506243e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/PostMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/dept/PostMapper.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.dal.mysql.dept; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.dept; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.post.PostExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.post.PostPageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.PostDO; import org.apache.ibatis.annotations.Mapper; import java.util.Collection; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/UserPostMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/dept/UserPostMapper.java similarity index 78% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/UserPostMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/dept/UserPostMapper.java index addc67d43..0b9e32783 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/UserPostMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/dept/UserPostMapper.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.dal.mysql.dept; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.dept; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.UserPostDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.UserPostDO; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictDataMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/dict/DictDataMapper.java similarity index 81% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictDataMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/dict/DictDataMapper.java index 244825093..aa5125d39 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictDataMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/dict/DictDataMapper.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.dal.mysql.dict; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.dict; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.data.DictDataExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.data.DictDataPageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dict.DictDataDO; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictTypeMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/dict/DictTypeMapper.java similarity index 80% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictTypeMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/dict/DictTypeMapper.java index 261f18cc4..26519bf69 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictTypeMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/dict/DictTypeMapper.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.dal.mysql.dict; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.dict; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypeExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypePageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictTypeDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.type.DictTypeExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.type.DictTypePageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dict.DictTypeDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/errorcode/ErrorCodeMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/errorcode/ErrorCodeMapper.java similarity index 82% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/errorcode/ErrorCodeMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/errorcode/ErrorCodeMapper.java index 93baced06..948cfaa03 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/errorcode/ErrorCodeMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/errorcode/ErrorCodeMapper.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.dal.mysql.errorcode; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.errorcode; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodePageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.errorcode.ErrorCodeDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode.vo.ErrorCodeExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode.vo.ErrorCodePageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.errorcode.ErrorCodeDO; import org.apache.ibatis.annotations.Mapper; import java.time.LocalDateTime; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/logger/LoginLogMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/logger/LoginLogMapper.java similarity index 78% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/logger/LoginLogMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/logger/LoginLogMapper.java index 1617fe075..2f3b56b0d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/logger/LoginLogMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/logger/LoginLogMapper.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.system.dal.mysql.logger; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.logger; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog.LoginLogExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog.LoginLogPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.logger.LoginLogDO; -import cn.iocoder.yudao.module.system.enums.logger.LoginResultEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.loginlog.LoginLogExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.loginlog.LoginLogPageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.logger.LoginLogDO; +import cn.fuxiaoaio.ygg.module.system.enums.logger.LoginResultEnum; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/logger/OperateLogMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/logger/OperateLogMapper.java similarity index 80% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/logger/OperateLogMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/logger/OperateLogMapper.java index 86e53a510..dff774c20 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/logger/OperateLogMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/logger/OperateLogMapper.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.system.dal.mysql.logger; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.logger; -import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.logger.OperateLogDO; +import cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.operatelog.OperateLogExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.logger.OperateLogDO; import org.apache.ibatis.annotations.Mapper; import java.util.Collection; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/mail/MailAccountMapper.java similarity index 58% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/mail/MailAccountMapper.java index 579123860..4e954eef2 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/mail/MailAccountMapper.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.dal.mysql.mail; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.mail; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailAccountDO; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailLogMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/mail/MailLogMapper.java similarity index 70% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailLogMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/mail/MailLogMapper.java index 6b147cff6..19ce30946 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailLogMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/mail/MailLogMapper.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.dal.mysql.mail; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.mail; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.log.MailLogPageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailLogDO; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/mail/MailTemplateMapper.java similarity index 73% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/mail/MailTemplateMapper.java index 193e436d9..dd9aea28e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailTemplateMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/mail/MailTemplateMapper.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.dal.mysql.mail; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.mail; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailTemplateDO; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notice/NoticeMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/notice/NoticeMapper.java similarity index 56% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notice/NoticeMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/notice/NoticeMapper.java index 67ff8db09..c8534a88f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notice/NoticeMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/notice/NoticeMapper.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.dal.mysql.notice; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.notice; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticePageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.notice.NoticeDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notice.vo.NoticePageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.notice.NoticeDO; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/notify/NotifyMessageMapper.java similarity index 86% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/notify/NotifyMessageMapper.java index e9ce6d719..0bab495f2 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/notify/NotifyMessageMapper.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.system.dal.mysql.notify; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.notify; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageMyPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.QueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.message.NotifyMessageMyPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.notify.NotifyMessageDO; import org.apache.ibatis.annotations.Mapper; import java.time.LocalDateTime; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyTemplateMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/notify/NotifyTemplateMapper.java similarity index 69% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyTemplateMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/notify/NotifyTemplateMapper.java index 1fcb8ee0d..b4fb61337 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyTemplateMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/notify/NotifyTemplateMapper.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.dal.mysql.notify; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.notify; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplatePageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.template.NotifyTemplatePageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.notify.NotifyTemplateDO; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/oauth2/OAuth2AccessTokenMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/oauth2/OAuth2AccessTokenMapper.java similarity index 75% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/oauth2/OAuth2AccessTokenMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/oauth2/OAuth2AccessTokenMapper.java index 8a1e2876d..ffdf9bd53 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/oauth2/OAuth2AccessTokenMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/oauth2/OAuth2AccessTokenMapper.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.dal.mysql.oauth2; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.oauth2; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.token.OAuth2AccessTokenPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.token.OAuth2AccessTokenPageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; import org.apache.ibatis.annotations.Mapper; import java.time.LocalDateTime; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/oauth2/OAuth2ApproveMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/oauth2/OAuth2ApproveMapper.java similarity index 79% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/oauth2/OAuth2ApproveMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/oauth2/OAuth2ApproveMapper.java index 61a976ff9..3849f89b3 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/oauth2/OAuth2ApproveMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/oauth2/OAuth2ApproveMapper.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.dal.mysql.oauth2; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.oauth2; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ApproveDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2ApproveDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/oauth2/OAuth2ClientMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/oauth2/OAuth2ClientMapper.java old mode 100755 new mode 100644 similarity index 66% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/oauth2/OAuth2ClientMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/oauth2/OAuth2ClientMapper.java index e6012b0f0..d0e354dab --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/oauth2/OAuth2ClientMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/oauth2/OAuth2ClientMapper.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.dal.mysql.oauth2; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.oauth2; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.client.OAuth2ClientPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ClientDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.client.OAuth2ClientPageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2ClientDO; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/oauth2/OAuth2CodeMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/oauth2/OAuth2CodeMapper.java similarity index 58% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/oauth2/OAuth2CodeMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/oauth2/OAuth2CodeMapper.java index c85581c61..0da051dc0 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/oauth2/OAuth2CodeMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/oauth2/OAuth2CodeMapper.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.dal.mysql.oauth2; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.oauth2; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2CodeDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2CodeDO; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/oauth2/OAuth2RefreshTokenMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/oauth2/OAuth2RefreshTokenMapper.java similarity index 68% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/oauth2/OAuth2RefreshTokenMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/oauth2/OAuth2RefreshTokenMapper.java index 713be89cf..942800ad9 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/oauth2/OAuth2RefreshTokenMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/oauth2/OAuth2RefreshTokenMapper.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.dal.mysql.oauth2; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.oauth2; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2RefreshTokenDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2RefreshTokenDO; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/package-info.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/package-info.java similarity index 80% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/package-info.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/package-info.java index 6ad304f58..9e0b153df 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/package-info.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/package-info.java @@ -6,4 +6,4 @@ * * 其中，MySQL 的表以 system_ 作为前缀 */ -package cn.iocoder.yudao.module.system.dal.mysql; +package cn.fuxiaoaio.ygg.module.system.dal.mysql; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/MenuMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/permission/MenuMapper.java similarity index 72% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/MenuMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/permission/MenuMapper.java index cdab84b53..c140743c8 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/MenuMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/permission/MenuMapper.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.system.dal.mysql.permission; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.permission; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuListReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.menu.MenuListReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.MenuDO; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/permission/RoleMapper.java similarity index 75% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/permission/RoleMapper.java index 55e853273..bfec691a0 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/permission/RoleMapper.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.system.dal.mysql.permission; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.permission; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RolePageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.dataobject.BaseDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role.RoleExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role.RolePageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.RoleDO; import org.apache.ibatis.annotations.Mapper; import org.springframework.lang.Nullable; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMenuMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/permission/RoleMenuMapper.java similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMenuMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/permission/RoleMenuMapper.java index 20f418676..ec059be4e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMenuMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/permission/RoleMenuMapper.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.dal.mysql.permission; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.permission; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleMenuDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.RoleMenuDO; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/UserRoleMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/permission/UserRoleMapper.java similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/UserRoleMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/permission/UserRoleMapper.java index 12ff88a0f..2d34b7cb5 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/UserRoleMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/permission/UserRoleMapper.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.dal.mysql.permission; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.permission; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.UserRoleDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.UserRoleDO; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sensitiveword/SensitiveWordMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/sensitiveword/SensitiveWordMapper.java similarity index 77% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sensitiveword/SensitiveWordMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/sensitiveword/SensitiveWordMapper.java index 831188761..3003b9f85 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sensitiveword/SensitiveWordMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/sensitiveword/SensitiveWordMapper.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.dal.mysql.sensitiveword; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.sensitiveword; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.SensitiveWordExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.SensitiveWordPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.sensitiveword.SensitiveWordDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword.vo.SensitiveWordExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword.vo.SensitiveWordPageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sensitiveword.SensitiveWordDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsChannelMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/sms/SmsChannelMapper.java similarity index 62% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsChannelMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/sms/SmsChannelMapper.java index 4af731fc6..fdf7d73f8 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsChannelMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/sms/SmsChannelMapper.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.dal.mysql.sms; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.sms; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsChannelDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.channel.SmsChannelPageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsChannelDO; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsCodeMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/sms/SmsCodeMapper.java similarity index 73% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsCodeMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/sms/SmsCodeMapper.java index 599c1abef..ae6d1430f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsCodeMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/sms/SmsCodeMapper.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.dal.mysql.sms; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.sms; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsCodeDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.QueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsCodeDO; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsLogMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/sms/SmsLogMapper.java similarity index 79% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsLogMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/sms/SmsLogMapper.java index 8ebd34fcf..c36f85883 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsLogMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/sms/SmsLogMapper.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.dal.mysql.sms; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.sms; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.log.SmsLogExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.log.SmsLogPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsLogDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.log.SmsLogExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.log.SmsLogPageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsLogDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsTemplateMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/sms/SmsTemplateMapper.java similarity index 82% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsTemplateMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/sms/SmsTemplateMapper.java index ee6f54fef..cfe6c363c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsTemplateMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/sms/SmsTemplateMapper.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.dal.mysql.sms; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.sms; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplateExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplatePageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template.SmsTemplateExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template.SmsTemplatePageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsTemplateDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/social/SocialUserBindMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/social/SocialUserBindMapper.java similarity index 84% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/social/SocialUserBindMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/social/SocialUserBindMapper.java index 28619ca51..c432f64b0 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/social/SocialUserBindMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/social/SocialUserBindMapper.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.dal.mysql.social; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.social; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.dal.dataobject.social.SocialUserBindDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.social.SocialUserBindDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/social/SocialUserMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/social/SocialUserMapper.java similarity index 83% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/social/SocialUserMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/social/SocialUserMapper.java index 442cc4576..f9851befb 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/social/SocialUserMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/social/SocialUserMapper.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.dal.mysql.social; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.social; -import cn.iocoder.yudao.module.system.dal.dataobject.social.SocialUserDO; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.social.SocialUserDO; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.apache.ibatis.annotations.Mapper; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/tenant/TenantMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/tenant/TenantMapper.java old mode 100755 new mode 100644 similarity index 80% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/tenant/TenantMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/tenant/TenantMapper.java index 8731e4628..297327911 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/tenant/TenantMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/tenant/TenantMapper.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.dal.mysql.tenant; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.tenant; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.tenant.TenantExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.tenant.TenantPageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.tenant.TenantDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/tenant/TenantPackageMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/tenant/TenantPackageMapper.java old mode 100755 new mode 100644 similarity index 72% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/tenant/TenantPackageMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/tenant/TenantPackageMapper.java index e8a41c770..03578b147 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/tenant/TenantPackageMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/tenant/TenantPackageMapper.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.dal.mysql.tenant; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.tenant; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages.TenantPackagePageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantPackageDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.packages.TenantPackagePageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.tenant.TenantPackageDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/user/AdminUserMapper.java similarity index 83% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/user/AdminUserMapper.java index 4e0827210..dfc3d8497 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/mysql/user/AdminUserMapper.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.dal.mysql.user; +package cn.fuxiaoaio.ygg.module.system.dal.mysql.user; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.mapper.BaseMapperX; +import cn.fuxiaoaio.ygg.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.user.UserExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.user.UserPageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; import org.apache.ibatis.annotations.Mapper; import java.util.Collection; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/redis/RedisKeyConstants.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/redis/RedisKeyConstants.java similarity index 74% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/redis/RedisKeyConstants.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/redis/RedisKeyConstants.java index fb63ce5ff..ada818f16 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/redis/RedisKeyConstants.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/redis/RedisKeyConstants.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.dal.redis; +package cn.fuxiaoaio.ygg.module.system.dal.redis; -import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; +import cn.fuxiaoaio.ygg.framework.redis.core.RedisKeyDefine; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; import java.time.Duration; -import static cn.iocoder.yudao.framework.redis.core.RedisKeyDefine.KeyTypeEnum.STRING; +import static cn.fuxiaoaio.ygg.framework.redis.core.RedisKeyDefine.KeyTypeEnum.STRING; /** * System Redis Key 枚举类 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/redis/oauth2/OAuth2AccessTokenRedisDAO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/redis/oauth2/OAuth2AccessTokenRedisDAO.java similarity index 86% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/redis/oauth2/OAuth2AccessTokenRedisDAO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/redis/oauth2/OAuth2AccessTokenRedisDAO.java index d57beb881..30f3db6f6 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/redis/oauth2/OAuth2AccessTokenRedisDAO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/dal/redis/oauth2/OAuth2AccessTokenRedisDAO.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.system.dal.redis.oauth2; +package cn.fuxiaoaio.ygg.module.system.dal.redis.oauth2; import cn.hutool.core.date.LocalDateTimeUtil; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Repository; @@ -14,7 +14,7 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.TimeUnit; -import static cn.iocoder.yudao.module.system.dal.redis.RedisKeyConstants.OAUTH2_ACCESS_TOKEN; +import static cn.fuxiaoaio.ygg.module.system.dal.redis.RedisKeyConstants.OAUTH2_ACCESS_TOKEN; /** * {@link OAuth2AccessTokenDO} 的 RedisDAO diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/datapermission/config/DataPermissionConfiguration.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/datapermission/config/DataPermissionConfiguration.java similarity index 72% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/datapermission/config/DataPermissionConfiguration.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/datapermission/config/DataPermissionConfiguration.java index 136866ca0..61e723bd1 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/datapermission/config/DataPermissionConfiguration.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/datapermission/config/DataPermissionConfiguration.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.framework.datapermission.config; +package cn.fuxiaoaio.ygg.module.system.framework.datapermission.config; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; -import cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissionRuleCustomizer; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.DeptDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.framework.datapermission.core.rule.dept.DeptDataPermissionRuleCustomizer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/datapermission/package-info.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/datapermission/package-info.java new file mode 100644 index 000000000..4f62ae5d1 --- /dev/null +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/datapermission/package-info.java @@ -0,0 +1,4 @@ +/** + * system 模块的数据权限配置 + */ +package cn.fuxiaoaio.ygg.module.system.framework.datapermission; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/package-info.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/package-info.java similarity index 61% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/package-info.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/package-info.java index 4b8440611..8209e33ee 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/package-info.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/package-info.java @@ -3,4 +3,4 @@ * * @author 芋道源码 */ -package cn.iocoder.yudao.module.system.framework; +package cn.fuxiaoaio.ygg.module.system.framework; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/rpc/config/RpcConfiguration.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/rpc/config/RpcConfiguration.java similarity index 67% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/rpc/config/RpcConfiguration.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/rpc/config/RpcConfiguration.java index 73b7f8ccd..9503d215c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/rpc/config/RpcConfiguration.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/rpc/config/RpcConfiguration.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.framework.rpc.config; +package cn.fuxiaoaio.ygg.module.system.framework.rpc.config; -import cn.iocoder.yudao.module.infra.api.file.FileApi; +import cn.fuxiaoaio.ygg.module.infra.api.file.FileApi; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Configuration; diff --git a/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/rpc/package-info.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/rpc/package-info.java new file mode 100644 index 000000000..4110dac11 --- /dev/null +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/rpc/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package cn.fuxiaoaio.ygg.module.system.framework.rpc; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/security/config/SecurityConfiguration.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/security/config/SecurityConfiguration.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/security/config/SecurityConfiguration.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/security/config/SecurityConfiguration.java index 3f0a7ac31..cea1b368b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/security/config/SecurityConfiguration.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/security/config/SecurityConfiguration.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.framework.security.config; +package cn.fuxiaoaio.ygg.module.system.framework.security.config; -import cn.iocoder.yudao.framework.security.config.AuthorizeRequestsCustomizer; -import cn.iocoder.yudao.module.system.enums.ApiConstants; +import cn.fuxiaoaio.ygg.framework.security.config.AuthorizeRequestsCustomizer; +import cn.fuxiaoaio.ygg.module.system.enums.ApiConstants; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; diff --git a/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/security/core/package-info.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/security/core/package-info.java new file mode 100644 index 000000000..1d70f2ad9 --- /dev/null +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/security/core/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package cn.fuxiaoaio.ygg.module.system.framework.security.core; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/SmsCodeConfiguration.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/sms/SmsCodeConfiguration.java similarity index 83% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/SmsCodeConfiguration.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/sms/SmsCodeConfiguration.java index ddc70a39e..475b966e1 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/SmsCodeConfiguration.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/sms/SmsCodeConfiguration.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.framework.sms; +package cn.fuxiaoaio.ygg.module.system.framework.sms; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/SmsCodeProperties.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/sms/SmsCodeProperties.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/SmsCodeProperties.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/sms/SmsCodeProperties.java index 5d246bad7..627c0cb2b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/SmsCodeProperties.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/framework/sms/SmsCodeProperties.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.framework.sms; +package cn.fuxiaoaio.ygg.module.system.framework.sms; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -7,7 +7,7 @@ import org.springframework.validation.annotation.Validated; import javax.validation.constraints.NotNull; import java.time.Duration; -@ConfigurationProperties(prefix = "yudao.sms-code") +@ConfigurationProperties(prefix = "fuxiaoaio.sms-code") @Validated @Data public class SmsCodeProperties { diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/demo/DemoJob.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/job/demo/DemoJob.java similarity index 69% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/demo/DemoJob.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/job/demo/DemoJob.java index 6fa4ad62d..db7d6c07f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/demo/DemoJob.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/job/demo/DemoJob.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.job.demo; +package cn.fuxiaoaio.ygg.module.system.job.demo; -import cn.iocoder.yudao.framework.tenant.core.job.TenantJob; +import cn.fuxiaoaio.ygg.framework.tenant.core.job.TenantJob; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; diff --git a/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/job/package-info.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/job/package-info.java new file mode 100644 index 000000000..0fa955f94 --- /dev/null +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/job/package-info.java @@ -0,0 +1 @@ +package cn.fuxiaoaio.ygg.module.system.job; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/auth/OAuth2ClientRefreshConsumer.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/auth/OAuth2ClientRefreshConsumer.java similarity index 77% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/auth/OAuth2ClientRefreshConsumer.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/auth/OAuth2ClientRefreshConsumer.java index 52763e96e..929bb33ee 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/auth/OAuth2ClientRefreshConsumer.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/auth/OAuth2ClientRefreshConsumer.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.mq.consumer.auth; +package cn.fuxiaoaio.ygg.module.system.mq.consumer.auth; -import cn.iocoder.yudao.module.system.mq.message.auth.OAuth2ClientRefreshMessage; -import cn.iocoder.yudao.module.system.service.oauth2.OAuth2ClientService; +import cn.fuxiaoaio.ygg.module.system.mq.message.auth.OAuth2ClientRefreshMessage; +import cn.fuxiaoaio.ygg.module.system.service.oauth2.OAuth2ClientService; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/dept/DeptRefreshConsumer.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/dept/DeptRefreshConsumer.java similarity index 74% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/dept/DeptRefreshConsumer.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/dept/DeptRefreshConsumer.java index 981a0b9f9..0e4e0ba90 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/dept/DeptRefreshConsumer.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/dept/DeptRefreshConsumer.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.mq.consumer.dept; +package cn.fuxiaoaio.ygg.module.system.mq.consumer.dept; -import cn.iocoder.yudao.module.system.mq.message.dept.DeptRefreshMessage; -import cn.iocoder.yudao.module.system.service.dept.DeptService; +import cn.fuxiaoaio.ygg.module.system.mq.message.dept.DeptRefreshMessage; +import cn.fuxiaoaio.ygg.module.system.service.dept.DeptService; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailAccountRefreshConsumer.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/mail/MailAccountRefreshConsumer.java similarity index 77% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailAccountRefreshConsumer.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/mail/MailAccountRefreshConsumer.java index 63a2e625e..9a91c4fb6 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailAccountRefreshConsumer.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/mail/MailAccountRefreshConsumer.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.mq.consumer.mail; +package cn.fuxiaoaio.ygg.module.system.mq.consumer.mail; -import cn.iocoder.yudao.module.system.mq.message.mail.MailAccountRefreshMessage; -import cn.iocoder.yudao.module.system.service.mail.MailAccountService; +import cn.fuxiaoaio.ygg.module.system.mq.message.mail.MailAccountRefreshMessage; +import cn.fuxiaoaio.ygg.module.system.service.mail.MailAccountService; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailSendConsumer.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/mail/MailSendConsumer.java similarity index 75% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailSendConsumer.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/mail/MailSendConsumer.java index 238fe9219..e8cc2b728 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailSendConsumer.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/mail/MailSendConsumer.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.mq.consumer.mail; +package cn.fuxiaoaio.ygg.module.system.mq.consumer.mail; -import cn.iocoder.yudao.module.system.mq.message.mail.MailSendMessage; -import cn.iocoder.yudao.module.system.service.mail.MailSendService; +import cn.fuxiaoaio.ygg.module.system.mq.message.mail.MailSendMessage; +import cn.fuxiaoaio.ygg.module.system.service.mail.MailSendService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailTemplateRefreshConsumer.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/mail/MailTemplateRefreshConsumer.java similarity index 77% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailTemplateRefreshConsumer.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/mail/MailTemplateRefreshConsumer.java index c6f823dd6..f2078951c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailTemplateRefreshConsumer.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/mail/MailTemplateRefreshConsumer.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.mq.consumer.mail; +package cn.fuxiaoaio.ygg.module.system.mq.consumer.mail; -import cn.iocoder.yudao.module.system.mq.message.mail.MailTemplateRefreshMessage; -import cn.iocoder.yudao.module.system.service.mail.MailTemplateService; +import cn.fuxiaoaio.ygg.module.system.mq.message.mail.MailTemplateRefreshMessage; +import cn.fuxiaoaio.ygg.module.system.service.mail.MailTemplateService; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/notify/NotifyTemplateRefreshConsumer.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/notify/NotifyTemplateRefreshConsumer.java similarity index 77% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/notify/NotifyTemplateRefreshConsumer.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/notify/NotifyTemplateRefreshConsumer.java index 757a6f251..bb904ce30 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/notify/NotifyTemplateRefreshConsumer.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/notify/NotifyTemplateRefreshConsumer.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.mq.consumer.notify; +package cn.fuxiaoaio.ygg.module.system.mq.consumer.notify; -import cn.iocoder.yudao.module.system.mq.message.notify.NotifyTemplateRefreshMessage; -import cn.iocoder.yudao.module.system.service.notify.NotifyTemplateService; +import cn.fuxiaoaio.ygg.module.system.mq.message.notify.NotifyTemplateRefreshMessage; +import cn.fuxiaoaio.ygg.module.system.service.notify.NotifyTemplateService; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/permission/MenuRefreshConsumer.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/permission/MenuRefreshConsumer.java similarity index 75% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/permission/MenuRefreshConsumer.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/permission/MenuRefreshConsumer.java index 6103022b4..6ab59d524 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/permission/MenuRefreshConsumer.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/permission/MenuRefreshConsumer.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.mq.consumer.permission; +package cn.fuxiaoaio.ygg.module.system.mq.consumer.permission; -import cn.iocoder.yudao.module.system.mq.message.permission.MenuRefreshMessage; -import cn.iocoder.yudao.module.system.service.permission.MenuService; +import cn.fuxiaoaio.ygg.module.system.mq.message.permission.MenuRefreshMessage; +import cn.fuxiaoaio.ygg.module.system.service.permission.MenuService; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/permission/RoleMenuRefreshConsumer.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/permission/RoleMenuRefreshConsumer.java similarity index 76% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/permission/RoleMenuRefreshConsumer.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/permission/RoleMenuRefreshConsumer.java index 52b53606c..8bc75559e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/permission/RoleMenuRefreshConsumer.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/permission/RoleMenuRefreshConsumer.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.mq.consumer.permission; +package cn.fuxiaoaio.ygg.module.system.mq.consumer.permission; -import cn.iocoder.yudao.module.system.mq.message.permission.RoleMenuRefreshMessage; -import cn.iocoder.yudao.module.system.service.permission.PermissionService; +import cn.fuxiaoaio.ygg.module.system.mq.message.permission.RoleMenuRefreshMessage; +import cn.fuxiaoaio.ygg.module.system.service.permission.PermissionService; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/permission/RoleRefreshConsumer.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/permission/RoleRefreshConsumer.java similarity index 74% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/permission/RoleRefreshConsumer.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/permission/RoleRefreshConsumer.java index fa8b48f5e..3ef8ea099 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/permission/RoleRefreshConsumer.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/permission/RoleRefreshConsumer.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.mq.consumer.permission; +package cn.fuxiaoaio.ygg.module.system.mq.consumer.permission; -import cn.iocoder.yudao.module.system.mq.message.permission.RoleRefreshMessage; -import cn.iocoder.yudao.module.system.service.permission.RoleService; +import cn.fuxiaoaio.ygg.module.system.mq.message.permission.RoleRefreshMessage; +import cn.fuxiaoaio.ygg.module.system.service.permission.RoleService; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/permission/UserRoleRefreshConsumer.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/permission/UserRoleRefreshConsumer.java similarity index 76% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/permission/UserRoleRefreshConsumer.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/permission/UserRoleRefreshConsumer.java index e1426797a..66370793c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/permission/UserRoleRefreshConsumer.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/permission/UserRoleRefreshConsumer.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.mq.consumer.permission; +package cn.fuxiaoaio.ygg.module.system.mq.consumer.permission; -import cn.iocoder.yudao.module.system.mq.message.permission.UserRoleRefreshMessage; -import cn.iocoder.yudao.module.system.service.permission.PermissionService; +import cn.fuxiaoaio.ygg.module.system.mq.message.permission.UserRoleRefreshMessage; +import cn.fuxiaoaio.ygg.module.system.service.permission.PermissionService; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/sensitiveword/SensitiveWordRefreshConsumer.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/sensitiveword/SensitiveWordRefreshConsumer.java similarity index 77% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/sensitiveword/SensitiveWordRefreshConsumer.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/sensitiveword/SensitiveWordRefreshConsumer.java index 9b5310b98..19ac45b43 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/sensitiveword/SensitiveWordRefreshConsumer.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/sensitiveword/SensitiveWordRefreshConsumer.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.mq.consumer.sensitiveword; +package cn.fuxiaoaio.ygg.module.system.mq.consumer.sensitiveword; -import cn.iocoder.yudao.module.system.mq.message.sensitiveword.SensitiveWordRefreshMessage; -import cn.iocoder.yudao.module.system.service.sensitiveword.SensitiveWordService; +import cn.fuxiaoaio.ygg.module.system.mq.message.sensitiveword.SensitiveWordRefreshMessage; +import cn.fuxiaoaio.ygg.module.system.service.sensitiveword.SensitiveWordService; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/sms/SmsChannelRefreshConsumer.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/sms/SmsChannelRefreshConsumer.java similarity index 76% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/sms/SmsChannelRefreshConsumer.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/sms/SmsChannelRefreshConsumer.java index 1bc38f19e..c8714da44 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/sms/SmsChannelRefreshConsumer.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/sms/SmsChannelRefreshConsumer.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.mq.consumer.sms; +package cn.fuxiaoaio.ygg.module.system.mq.consumer.sms; -import cn.iocoder.yudao.module.system.mq.message.sms.SmsChannelRefreshMessage; -import cn.iocoder.yudao.module.system.service.sms.SmsChannelService; +import cn.fuxiaoaio.ygg.module.system.mq.message.sms.SmsChannelRefreshMessage; +import cn.fuxiaoaio.ygg.module.system.service.sms.SmsChannelService; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/sms/SmsSendConsumer.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/sms/SmsSendConsumer.java similarity index 74% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/sms/SmsSendConsumer.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/sms/SmsSendConsumer.java index 6e039f7b0..85db6b540 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/sms/SmsSendConsumer.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/sms/SmsSendConsumer.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.mq.consumer.sms; +package cn.fuxiaoaio.ygg.module.system.mq.consumer.sms; -import cn.iocoder.yudao.module.system.mq.message.sms.SmsSendMessage; -import cn.iocoder.yudao.module.system.service.sms.SmsSendService; +import cn.fuxiaoaio.ygg.module.system.mq.message.sms.SmsSendMessage; +import cn.fuxiaoaio.ygg.module.system.service.sms.SmsSendService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/sms/SmsTemplateRefreshConsumer.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/sms/SmsTemplateRefreshConsumer.java similarity index 76% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/sms/SmsTemplateRefreshConsumer.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/sms/SmsTemplateRefreshConsumer.java index 737654d31..a5c083436 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/sms/SmsTemplateRefreshConsumer.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/consumer/sms/SmsTemplateRefreshConsumer.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.mq.consumer.sms; +package cn.fuxiaoaio.ygg.module.system.mq.consumer.sms; -import cn.iocoder.yudao.module.system.mq.message.sms.SmsTemplateRefreshMessage; -import cn.iocoder.yudao.module.system.service.sms.SmsTemplateService; +import cn.fuxiaoaio.ygg.module.system.mq.message.sms.SmsTemplateRefreshMessage; +import cn.fuxiaoaio.ygg.module.system.service.sms.SmsTemplateService; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/auth/OAuth2ClientRefreshMessage.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/auth/OAuth2ClientRefreshMessage.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/auth/OAuth2ClientRefreshMessage.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/auth/OAuth2ClientRefreshMessage.java index c0f858d9b..e340e9216 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/auth/OAuth2ClientRefreshMessage.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/auth/OAuth2ClientRefreshMessage.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.mq.message.auth; +package cn.fuxiaoaio.ygg.module.system.mq.message.auth; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/dept/DeptRefreshMessage.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/dept/DeptRefreshMessage.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/dept/DeptRefreshMessage.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/dept/DeptRefreshMessage.java index 5c6ab596f..0213e4919 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/dept/DeptRefreshMessage.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/dept/DeptRefreshMessage.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.mq.message.dept; +package cn.fuxiaoaio.ygg.module.system.mq.message.dept; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailAccountRefreshMessage.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/mail/MailAccountRefreshMessage.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailAccountRefreshMessage.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/mail/MailAccountRefreshMessage.java index 9a0db2fcc..4daec521b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailAccountRefreshMessage.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/mail/MailAccountRefreshMessage.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.mq.message.mail; +package cn.fuxiaoaio.ygg.module.system.mq.message.mail; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/mail/MailSendMessage.java similarity index 94% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/mail/MailSendMessage.java index 943d69b09..215331a96 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/mail/MailSendMessage.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.mq.message.mail; +package cn.fuxiaoaio.ygg.module.system.mq.message.mail; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailTemplateRefreshMessage.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/mail/MailTemplateRefreshMessage.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailTemplateRefreshMessage.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/mail/MailTemplateRefreshMessage.java index 0dd0fa5bd..807bbf042 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailTemplateRefreshMessage.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/mail/MailTemplateRefreshMessage.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.mq.message.mail; +package cn.fuxiaoaio.ygg.module.system.mq.message.mail; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/notify/NotifyTemplateRefreshMessage.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/notify/NotifyTemplateRefreshMessage.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/notify/NotifyTemplateRefreshMessage.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/notify/NotifyTemplateRefreshMessage.java index e220708cb..ec9b519cd 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/notify/NotifyTemplateRefreshMessage.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/notify/NotifyTemplateRefreshMessage.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.mq.message.notify; +package cn.fuxiaoaio.ygg.module.system.mq.message.notify; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/permission/MenuRefreshMessage.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/permission/MenuRefreshMessage.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/permission/MenuRefreshMessage.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/permission/MenuRefreshMessage.java index c569107d9..1eccfd960 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/permission/MenuRefreshMessage.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/permission/MenuRefreshMessage.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.mq.message.permission; +package cn.fuxiaoaio.ygg.module.system.mq.message.permission; import org.springframework.cloud.bus.event.RemoteApplicationEvent; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/permission/RoleMenuRefreshMessage.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/permission/RoleMenuRefreshMessage.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/permission/RoleMenuRefreshMessage.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/permission/RoleMenuRefreshMessage.java index 7b073b407..0bb80dbea 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/permission/RoleMenuRefreshMessage.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/permission/RoleMenuRefreshMessage.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.mq.message.permission; +package cn.fuxiaoaio.ygg.module.system.mq.message.permission; import lombok.Data; import org.springframework.cloud.bus.event.RemoteApplicationEvent; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/permission/RoleRefreshMessage.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/permission/RoleRefreshMessage.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/permission/RoleRefreshMessage.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/permission/RoleRefreshMessage.java index fee07b6c0..e014dd20b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/permission/RoleRefreshMessage.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/permission/RoleRefreshMessage.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.mq.message.permission; +package cn.fuxiaoaio.ygg.module.system.mq.message.permission; import lombok.Data; import org.springframework.cloud.bus.event.RemoteApplicationEvent; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/permission/UserRoleRefreshMessage.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/permission/UserRoleRefreshMessage.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/permission/UserRoleRefreshMessage.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/permission/UserRoleRefreshMessage.java index bb94c8369..1de58b276 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/permission/UserRoleRefreshMessage.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/permission/UserRoleRefreshMessage.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.mq.message.permission; +package cn.fuxiaoaio.ygg.module.system.mq.message.permission; import lombok.Data; import org.springframework.cloud.bus.event.RemoteApplicationEvent; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/sensitiveword/SensitiveWordRefreshMessage.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/sensitiveword/SensitiveWordRefreshMessage.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/sensitiveword/SensitiveWordRefreshMessage.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/sensitiveword/SensitiveWordRefreshMessage.java index d34aac2a8..7cff55fae 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/sensitiveword/SensitiveWordRefreshMessage.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/sensitiveword/SensitiveWordRefreshMessage.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.mq.message.sensitiveword; +package cn.fuxiaoaio.ygg.module.system.mq.message.sensitiveword; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/sms/SmsChannelRefreshMessage.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/sms/SmsChannelRefreshMessage.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/sms/SmsChannelRefreshMessage.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/sms/SmsChannelRefreshMessage.java index 2dc2983e7..3d5d00907 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/sms/SmsChannelRefreshMessage.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/sms/SmsChannelRefreshMessage.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.mq.message.sms; +package cn.fuxiaoaio.ygg.module.system.mq.message.sms; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/sms/SmsSendMessage.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/sms/SmsSendMessage.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/sms/SmsSendMessage.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/sms/SmsSendMessage.java index e4baefcec..0c4e8b5a2 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/sms/SmsSendMessage.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/sms/SmsSendMessage.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.mq.message.sms; +package cn.fuxiaoaio.ygg.module.system.mq.message.sms; -import cn.iocoder.yudao.framework.common.core.KeyValue; +import cn.fuxiaoaio.ygg.framework.common.core.KeyValue; import lombok.Data; import javax.validation.constraints.NotNull; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/sms/SmsTemplateRefreshMessage.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/sms/SmsTemplateRefreshMessage.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/sms/SmsTemplateRefreshMessage.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/sms/SmsTemplateRefreshMessage.java index b1ae750d9..12a29d14d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/sms/SmsTemplateRefreshMessage.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/message/sms/SmsTemplateRefreshMessage.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.mq.message.sms; +package cn.fuxiaoaio.ygg.module.system.mq.message.sms; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/auth/OAuth2ClientProducer.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/auth/OAuth2ClientProducer.java similarity index 70% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/auth/OAuth2ClientProducer.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/auth/OAuth2ClientProducer.java index 6d45d43e2..c0da08f68 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/auth/OAuth2ClientProducer.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/auth/OAuth2ClientProducer.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.mq.producer.auth; +package cn.fuxiaoaio.ygg.module.system.mq.producer.auth; -import cn.iocoder.yudao.framework.mq.core.bus.AbstractBusProducer; -import cn.iocoder.yudao.module.system.mq.message.auth.OAuth2ClientRefreshMessage; +import cn.fuxiaoaio.ygg.framework.mq.core.bus.AbstractBusProducer; +import cn.fuxiaoaio.ygg.module.system.mq.message.auth.OAuth2ClientRefreshMessage; import org.springframework.stereotype.Component; /** diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/dept/DeptProducer.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/dept/DeptProducer.java similarity index 67% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/dept/DeptProducer.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/dept/DeptProducer.java index 4b7c1493e..57ecc2b9d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/dept/DeptProducer.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/dept/DeptProducer.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.mq.producer.dept; +package cn.fuxiaoaio.ygg.module.system.mq.producer.dept; -import cn.iocoder.yudao.framework.mq.core.bus.AbstractBusProducer; -import cn.iocoder.yudao.module.system.mq.message.dept.DeptRefreshMessage; +import cn.fuxiaoaio.ygg.framework.mq.core.bus.AbstractBusProducer; +import cn.fuxiaoaio.ygg.module.system.mq.message.dept.DeptRefreshMessage; import org.springframework.stereotype.Component; /** diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/mail/MailProducer.java similarity index 83% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/mail/MailProducer.java index 3916bcb27..3913e3981 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/mail/MailProducer.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.system.mq.producer.mail; +package cn.fuxiaoaio.ygg.module.system.mq.producer.mail; -import cn.iocoder.yudao.framework.mq.core.bus.AbstractBusProducer; -import cn.iocoder.yudao.module.system.mq.message.mail.MailAccountRefreshMessage; -import cn.iocoder.yudao.module.system.mq.message.mail.MailSendMessage; -import cn.iocoder.yudao.module.system.mq.message.mail.MailTemplateRefreshMessage; +import cn.fuxiaoaio.ygg.framework.mq.core.bus.AbstractBusProducer; +import cn.fuxiaoaio.ygg.module.system.mq.message.mail.MailAccountRefreshMessage; +import cn.fuxiaoaio.ygg.module.system.mq.message.mail.MailSendMessage; +import cn.fuxiaoaio.ygg.module.system.mq.message.mail.MailTemplateRefreshMessage; import lombok.extern.slf4j.Slf4j; import org.springframework.cloud.stream.function.StreamBridge; import org.springframework.stereotype.Component; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/notify/NotifyProducer.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/notify/NotifyProducer.java similarity index 73% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/notify/NotifyProducer.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/notify/NotifyProducer.java index c8c2f6f86..999541389 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/notify/NotifyProducer.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/notify/NotifyProducer.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.mq.producer.notify; +package cn.fuxiaoaio.ygg.module.system.mq.producer.notify; -import cn.iocoder.yudao.framework.mq.core.bus.AbstractBusProducer; -import cn.iocoder.yudao.module.system.mq.message.notify.NotifyTemplateRefreshMessage; +import cn.fuxiaoaio.ygg.framework.mq.core.bus.AbstractBusProducer; +import cn.fuxiaoaio.ygg.module.system.mq.message.notify.NotifyTemplateRefreshMessage; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/package-info.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/package-info.java new file mode 100644 index 000000000..b4c1727ae --- /dev/null +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package cn.fuxiaoaio.ygg.module.system.mq.producer; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/permission/MenuProducer.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/permission/MenuProducer.java similarity index 67% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/permission/MenuProducer.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/permission/MenuProducer.java index 598a656b1..ebaef25a4 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/permission/MenuProducer.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/permission/MenuProducer.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.mq.producer.permission; +package cn.fuxiaoaio.ygg.module.system.mq.producer.permission; -import cn.iocoder.yudao.framework.mq.core.bus.AbstractBusProducer; -import cn.iocoder.yudao.module.system.mq.message.permission.MenuRefreshMessage; +import cn.fuxiaoaio.ygg.framework.mq.core.bus.AbstractBusProducer; +import cn.fuxiaoaio.ygg.module.system.mq.message.permission.MenuRefreshMessage; import org.springframework.stereotype.Component; /** diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/permission/PermissionProducer.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/permission/PermissionProducer.java similarity index 71% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/permission/PermissionProducer.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/permission/PermissionProducer.java index 5b726a968..3dd51ead3 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/permission/PermissionProducer.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/permission/PermissionProducer.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.mq.producer.permission; +package cn.fuxiaoaio.ygg.module.system.mq.producer.permission; -import cn.iocoder.yudao.framework.mq.core.bus.AbstractBusProducer; -import cn.iocoder.yudao.module.system.mq.message.permission.RoleMenuRefreshMessage; -import cn.iocoder.yudao.module.system.mq.message.permission.UserRoleRefreshMessage; +import cn.fuxiaoaio.ygg.framework.mq.core.bus.AbstractBusProducer; +import cn.fuxiaoaio.ygg.module.system.mq.message.permission.RoleMenuRefreshMessage; +import cn.fuxiaoaio.ygg.module.system.mq.message.permission.UserRoleRefreshMessage; import org.springframework.stereotype.Component; /** diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/permission/RoleProducer.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/permission/RoleProducer.java similarity index 68% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/permission/RoleProducer.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/permission/RoleProducer.java index e157ef625..610112eb2 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/permission/RoleProducer.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/permission/RoleProducer.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.mq.producer.permission; +package cn.fuxiaoaio.ygg.module.system.mq.producer.permission; -import cn.iocoder.yudao.framework.mq.core.bus.AbstractBusProducer; -import cn.iocoder.yudao.module.system.mq.message.permission.RoleRefreshMessage; +import cn.fuxiaoaio.ygg.framework.mq.core.bus.AbstractBusProducer; +import cn.fuxiaoaio.ygg.module.system.mq.message.permission.RoleRefreshMessage; import org.springframework.stereotype.Component; /** diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/sensitiveword/SensitiveWordProducer.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/sensitiveword/SensitiveWordProducer.java similarity index 69% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/sensitiveword/SensitiveWordProducer.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/sensitiveword/SensitiveWordProducer.java index c148865da..008d1cbe5 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/sensitiveword/SensitiveWordProducer.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/sensitiveword/SensitiveWordProducer.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.mq.producer.sensitiveword; +package cn.fuxiaoaio.ygg.module.system.mq.producer.sensitiveword; -import cn.iocoder.yudao.framework.mq.core.bus.AbstractBusProducer; -import cn.iocoder.yudao.module.system.mq.message.sensitiveword.SensitiveWordRefreshMessage; +import cn.fuxiaoaio.ygg.framework.mq.core.bus.AbstractBusProducer; +import cn.fuxiaoaio.ygg.module.system.mq.message.sensitiveword.SensitiveWordRefreshMessage; import org.springframework.stereotype.Component; /** diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/sms/SmsProducer.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/sms/SmsProducer.java similarity index 81% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/sms/SmsProducer.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/sms/SmsProducer.java index 1242e2dcb..70b2f4405 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/sms/SmsProducer.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/mq/producer/sms/SmsProducer.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.mq.producer.sms; +package cn.fuxiaoaio.ygg.module.system.mq.producer.sms; -import cn.iocoder.yudao.framework.common.core.KeyValue; -import cn.iocoder.yudao.framework.mq.core.bus.AbstractBusProducer; -import cn.iocoder.yudao.module.system.mq.message.sms.SmsChannelRefreshMessage; -import cn.iocoder.yudao.module.system.mq.message.sms.SmsSendMessage; -import cn.iocoder.yudao.module.system.mq.message.sms.SmsTemplateRefreshMessage; +import cn.fuxiaoaio.ygg.framework.common.core.KeyValue; +import cn.fuxiaoaio.ygg.framework.mq.core.bus.AbstractBusProducer; +import cn.fuxiaoaio.ygg.module.system.mq.message.sms.SmsChannelRefreshMessage; +import cn.fuxiaoaio.ygg.module.system.mq.message.sms.SmsSendMessage; +import cn.fuxiaoaio.ygg.module.system.mq.message.sms.SmsTemplateRefreshMessage; import lombok.extern.slf4j.Slf4j; import org.springframework.cloud.stream.function.StreamBridge; import org.springframework.stereotype.Component; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/package-info.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/package-info.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/package-info.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/package-info.java index df82ac713..e640a3b02 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/package-info.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/package-info.java @@ -5,4 +5,4 @@ * 1. Controller URL：以 /system/ 开头，避免和其它 Module 冲突 * 2. DataObject 表名：以 system_ 开头，方便在数据库中区分 */ -package cn.iocoder.yudao.module.system; +package cn.fuxiaoaio.ygg.module.system; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/auth/AdminAuthService.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/auth/AdminAuthService.java index 52796ec2f..569a62028 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/auth/AdminAuthService.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.service.auth; +package cn.fuxiaoaio.ygg.module.system.service.auth; -import cn.iocoder.yudao.module.system.controller.admin.auth.vo.*; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.auth.vo.*; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; import javax.validation.Valid; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/auth/AdminAuthServiceImpl.java similarity index 84% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/auth/AdminAuthServiceImpl.java index ca34156eb..e4d093e21 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/auth/AdminAuthServiceImpl.java @@ -1,27 +1,27 @@ -package cn.iocoder.yudao.module.system.service.auth; +package cn.fuxiaoaio.ygg.module.system.service.auth; import cn.hutool.core.util.ObjectUtil; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils; -import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; -import cn.iocoder.yudao.framework.common.util.validation.ValidationUtils; -import cn.iocoder.yudao.module.system.api.logger.dto.LoginLogCreateReqDTO; -import cn.iocoder.yudao.module.system.api.sms.SmsCodeApi; -import cn.iocoder.yudao.module.system.api.social.dto.SocialUserBindReqDTO; -import cn.iocoder.yudao.module.system.controller.admin.auth.vo.*; -import cn.iocoder.yudao.module.system.convert.auth.AuthConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; -import cn.iocoder.yudao.module.system.enums.logger.LoginLogTypeEnum; -import cn.iocoder.yudao.module.system.enums.logger.LoginResultEnum; -import cn.iocoder.yudao.module.system.enums.oauth2.OAuth2ClientConstants; -import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum; -import cn.iocoder.yudao.module.system.service.logger.LoginLogService; -import cn.iocoder.yudao.module.system.service.member.MemberService; -import cn.iocoder.yudao.module.system.service.oauth2.OAuth2TokenService; -import cn.iocoder.yudao.module.system.service.social.SocialUserService; -import cn.iocoder.yudao.module.system.service.user.AdminUserService; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.util.monitor.TracerUtils; +import cn.fuxiaoaio.ygg.framework.common.util.servlet.ServletUtils; +import cn.fuxiaoaio.ygg.framework.common.util.validation.ValidationUtils; +import cn.fuxiaoaio.ygg.module.system.api.logger.dto.LoginLogCreateReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.sms.SmsCodeApi; +import cn.fuxiaoaio.ygg.module.system.api.social.dto.SocialUserBindReqDTO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.auth.vo.*; +import cn.fuxiaoaio.ygg.module.system.convert.auth.AuthConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.module.system.enums.logger.LoginLogTypeEnum; +import cn.fuxiaoaio.ygg.module.system.enums.logger.LoginResultEnum; +import cn.fuxiaoaio.ygg.module.system.enums.oauth2.OAuth2ClientConstants; +import cn.fuxiaoaio.ygg.module.system.enums.sms.SmsSceneEnum; +import cn.fuxiaoaio.ygg.module.system.service.logger.LoginLogService; +import cn.fuxiaoaio.ygg.module.system.service.member.MemberService; +import cn.fuxiaoaio.ygg.module.system.service.oauth2.OAuth2TokenService; +import cn.fuxiaoaio.ygg.module.system.service.social.SocialUserService; +import cn.fuxiaoaio.ygg.module.system.service.user.AdminUserService; import com.xingyuv.captcha.model.common.ResponseModel; import com.xingyuv.captcha.model.vo.CaptchaVO; import com.xingyuv.captcha.service.CaptchaService; @@ -34,9 +34,9 @@ import javax.annotation.Resource; import javax.validation.Validator; import java.util.Objects; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getClientIP; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.framework.common.util.servlet.ServletUtils.getClientIP; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; /** * Auth Service 实现类 @@ -67,7 +67,7 @@ public class AdminAuthServiceImpl implements AdminAuthService { /** * 验证码的开关，默认为 true */ - @Value("${yudao.captcha.enable:true}") + @Value("${fuxiaoaio.captcha.enable:true}") private Boolean captchaEnable; @Override diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/dept/DeptService.java similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/dept/DeptService.java index 87033d4b3..df9f86b94 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/dept/DeptService.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.service.dept; +package cn.fuxiaoaio.ygg.module.system.service.dept; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.dept.DeptCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.dept.DeptListReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.dept.DeptUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.DeptDO; import java.util.Collection; import java.util.Collections; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/dept/DeptServiceImpl.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/dept/DeptServiceImpl.java index 93b7840d7..71366650e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/dept/DeptServiceImpl.java @@ -1,17 +1,17 @@ -package cn.iocoder.yudao.module.system.service.dept; +package cn.fuxiaoaio.ygg.module.system.service.dept; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; -import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptUpdateReqVO; -import cn.iocoder.yudao.module.system.convert.dept.DeptConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; -import cn.iocoder.yudao.module.system.dal.mysql.dept.DeptMapper; -import cn.iocoder.yudao.module.system.enums.dept.DeptIdEnum; -import cn.iocoder.yudao.module.system.mq.producer.dept.DeptProducer; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.tenant.core.context.TenantContextHolder; +import cn.fuxiaoaio.ygg.framework.tenant.core.util.TenantUtils; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.dept.DeptCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.dept.DeptListReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.dept.DeptUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.convert.dept.DeptConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.DeptDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.dept.DeptMapper; +import cn.fuxiaoaio.ygg.module.system.enums.dept.DeptIdEnum; +import cn.fuxiaoaio.ygg.module.system.mq.producer.dept.DeptProducer; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; @@ -24,8 +24,8 @@ import javax.annotation.PostConstruct; import javax.annotation.Resource; import java.util.*; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; /** * 部门 Service 实现类 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/dept/PostService.java similarity index 78% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/dept/PostService.java index c1b84c011..79ffd1c67 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/dept/PostService.java @@ -1,18 +1,18 @@ -package cn.iocoder.yudao.module.system.service.dept; +package cn.fuxiaoaio.ygg.module.system.service.dept; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.post.PostCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.post.PostExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.post.PostPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.post.PostUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.PostDO; import org.springframework.lang.Nullable; import java.util.Collection; import java.util.List; -import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.SetUtils.asSet; /** * 岗位 Service 接口 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/dept/PostServiceImpl.java similarity index 83% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/dept/PostServiceImpl.java index 3266a0c92..fb28239e3 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/dept/PostServiceImpl.java @@ -1,15 +1,15 @@ -package cn.iocoder.yudao.module.system.service.dept; +package cn.fuxiaoaio.ygg.module.system.service.dept; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostUpdateReqVO; -import cn.iocoder.yudao.module.system.convert.dept.PostConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO; -import cn.iocoder.yudao.module.system.dal.mysql.dept.PostMapper; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.post.PostCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.post.PostExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.post.PostPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.post.PostUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.convert.dept.PostConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.PostDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.dept.PostMapper; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -18,9 +18,9 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.convertMap; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; /** * 岗位 Service 实现类 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/dict/DictDataService.java similarity index 84% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/dict/DictDataService.java index d2eb8c519..a3e64353b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/dict/DictDataService.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.service.dict; +package cn.fuxiaoaio.ygg.module.system.service.dict; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.data.DictDataCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.data.DictDataExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.data.DictDataPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.data.DictDataUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dict.DictDataDO; import java.util.Collection; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/dict/DictDataServiceImpl.java similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/dict/DictDataServiceImpl.java index eccd2c219..070d7494a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/dict/DictDataServiceImpl.java @@ -1,17 +1,17 @@ -package cn.iocoder.yudao.module.system.service.dict; +package cn.fuxiaoaio.ygg.module.system.service.dict; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataUpdateReqVO; -import cn.iocoder.yudao.module.system.convert.dict.DictDataConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO; -import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictTypeDO; -import cn.iocoder.yudao.module.system.dal.mysql.dict.DictDataMapper; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.data.DictDataCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.data.DictDataExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.data.DictDataPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.data.DictDataUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.convert.dict.DictDataConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dict.DictDataDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dict.DictTypeDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.dict.DictDataMapper; import com.google.common.annotations.VisibleForTesting; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -22,8 +22,8 @@ import java.util.Comparator; import java.util.List; import java.util.Map; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; /** * 字典数据 Service 实现类 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictTypeService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/dict/DictTypeService.java similarity index 77% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictTypeService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/dict/DictTypeService.java index 4b334b08b..a2f79503f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictTypeService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/dict/DictTypeService.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.service.dict; +package cn.fuxiaoaio.ygg.module.system.service.dict; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypeCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypeExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypePageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypeUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictTypeDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.type.DictTypeCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.type.DictTypeExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.type.DictTypePageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.type.DictTypeUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dict.DictTypeDO; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictTypeServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/dict/DictTypeServiceImpl.java similarity index 84% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictTypeServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/dict/DictTypeServiceImpl.java index cc731affe..0d6576eaa 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictTypeServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/dict/DictTypeServiceImpl.java @@ -1,15 +1,15 @@ -package cn.iocoder.yudao.module.system.service.dict; +package cn.fuxiaoaio.ygg.module.system.service.dict; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypeCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypeExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypePageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypeUpdateReqVO; -import cn.iocoder.yudao.module.system.convert.dict.DictTypeConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictTypeDO; -import cn.iocoder.yudao.module.system.dal.mysql.dict.DictTypeMapper; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.type.DictTypeCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.type.DictTypeExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.type.DictTypePageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.type.DictTypeUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.convert.dict.DictTypeConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dict.DictTypeDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.dict.DictTypeMapper; import com.google.common.annotations.VisibleForTesting; import org.springframework.stereotype.Service; @@ -17,8 +17,8 @@ import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.List; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; /** * 字典类型 Service 实现类 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/errorcode/ErrorCodeService.java similarity index 76% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/errorcode/ErrorCodeService.java index 869784e36..be5624f05 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/errorcode/ErrorCodeService.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.module.system.service.errorcode; +package cn.fuxiaoaio.ygg.module.system.service.errorcode; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeAutoGenerateReqDTO; -import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeRespDTO; -import cn.iocoder.yudao.module.system.dal.dataobject.errorcode.ErrorCodeDO; -import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodePageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeUpdateReqVO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.api.errorcode.dto.ErrorCodeAutoGenerateReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.errorcode.dto.ErrorCodeRespDTO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.errorcode.ErrorCodeDO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode.vo.ErrorCodeCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode.vo.ErrorCodeExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode.vo.ErrorCodePageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode.vo.ErrorCodeUpdateReqVO; import javax.validation.Valid; import java.time.LocalDateTime; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/errorcode/ErrorCodeServiceImpl.java similarity index 84% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/errorcode/ErrorCodeServiceImpl.java index 5732b0fc1..4551bbdb8 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/errorcode/ErrorCodeServiceImpl.java @@ -1,17 +1,17 @@ -package cn.iocoder.yudao.module.system.service.errorcode; +package cn.fuxiaoaio.ygg.module.system.service.errorcode; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeAutoGenerateReqDTO; -import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeRespDTO; -import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodePageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeUpdateReqVO; -import cn.iocoder.yudao.module.system.convert.errorcode.ErrorCodeConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.errorcode.ErrorCodeDO; -import cn.iocoder.yudao.module.system.dal.mysql.errorcode.ErrorCodeMapper; -import cn.iocoder.yudao.module.system.enums.errorcode.ErrorCodeTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.api.errorcode.dto.ErrorCodeAutoGenerateReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.errorcode.dto.ErrorCodeRespDTO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode.vo.ErrorCodeCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode.vo.ErrorCodeExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode.vo.ErrorCodePageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode.vo.ErrorCodeUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.convert.errorcode.ErrorCodeConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.errorcode.ErrorCodeDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.errorcode.ErrorCodeMapper; +import cn.fuxiaoaio.ygg.module.system.enums.errorcode.ErrorCodeTypeEnum; import com.google.common.annotations.VisibleForTesting; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -23,11 +23,11 @@ import java.time.LocalDateTime; import java.util.List; import java.util.Map; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.ERROR_CODE_DUPLICATE; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.ERROR_CODE_NOT_EXISTS; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.convertMap; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.convertSet; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.ERROR_CODE_DUPLICATE; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.ERROR_CODE_NOT_EXISTS; /** * 错误码 Service 实现类 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/LoginLogService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/logger/LoginLogService.java similarity index 66% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/LoginLogService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/logger/LoginLogService.java index 38b4fe78e..f6485fca2 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/LoginLogService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/logger/LoginLogService.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.service.logger; +package cn.fuxiaoaio.ygg.module.system.service.logger; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog.LoginLogExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog.LoginLogPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.logger.LoginLogDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.api.logger.dto.LoginLogCreateReqDTO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.loginlog.LoginLogExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.loginlog.LoginLogPageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.logger.LoginLogDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.api.logger.dto.LoginLogCreateReqDTO; import javax.validation.Valid; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/LoginLogServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/logger/LoginLogServiceImpl.java similarity index 65% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/LoginLogServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/logger/LoginLogServiceImpl.java index 0b806f6da..367479ec5 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/LoginLogServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/logger/LoginLogServiceImpl.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.system.service.logger; +package cn.fuxiaoaio.ygg.module.system.service.logger; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.api.logger.dto.LoginLogCreateReqDTO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog.LoginLogExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog.LoginLogPageReqVO; -import cn.iocoder.yudao.module.system.convert.logger.LoginLogConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.logger.LoginLogDO; -import cn.iocoder.yudao.module.system.dal.mysql.logger.LoginLogMapper; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.api.logger.dto.LoginLogCreateReqDTO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.loginlog.LoginLogExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.loginlog.LoginLogPageReqVO; +import cn.fuxiaoaio.ygg.module.system.convert.logger.LoginLogConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.logger.LoginLogDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.logger.LoginLogMapper; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/OperateLogService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/logger/OperateLogService.java similarity index 67% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/OperateLogService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/logger/OperateLogService.java index 434ecbc46..cbd7995c1 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/OperateLogService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/logger/OperateLogService.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.service.logger; +package cn.fuxiaoaio.ygg.module.system.service.logger; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.api.logger.dto.OperateLogCreateReqDTO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.logger.OperateLogDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.api.logger.dto.OperateLogCreateReqDTO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.operatelog.OperateLogExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.logger.OperateLogDO; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/logger/OperateLogServiceImpl.java similarity index 72% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/logger/OperateLogServiceImpl.java index c899696ac..bec69a6c1 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/logger/OperateLogServiceImpl.java @@ -1,17 +1,17 @@ -package cn.iocoder.yudao.module.system.service.logger; +package cn.fuxiaoaio.ygg.module.system.service.logger; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.string.StrUtils; -import cn.iocoder.yudao.module.system.api.logger.dto.OperateLogCreateReqDTO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO; -import cn.iocoder.yudao.module.system.convert.logger.OperateLogConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.logger.OperateLogDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; -import cn.iocoder.yudao.module.system.dal.mysql.logger.OperateLogMapper; -import cn.iocoder.yudao.module.system.service.user.AdminUserService; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.string.StrUtils; +import cn.fuxiaoaio.ygg.module.system.api.logger.dto.OperateLogCreateReqDTO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.operatelog.OperateLogExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO; +import cn.fuxiaoaio.ygg.module.system.convert.logger.OperateLogConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.logger.OperateLogDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.logger.OperateLogMapper; +import cn.fuxiaoaio.ygg.module.system.service.user.AdminUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -21,9 +21,9 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; -import static cn.iocoder.yudao.module.system.dal.dataobject.logger.OperateLogDO.JAVA_METHOD_ARGS_MAX_LENGTH; -import static cn.iocoder.yudao.module.system.dal.dataobject.logger.OperateLogDO.RESULT_MAX_LENGTH; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.convertSet; +import static cn.fuxiaoaio.ygg.module.system.dal.dataobject.logger.OperateLogDO.JAVA_METHOD_ARGS_MAX_LENGTH; +import static cn.fuxiaoaio.ygg.module.system.dal.dataobject.logger.OperateLogDO.RESULT_MAX_LENGTH; @Service @Validated diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailAccountService.java similarity index 80% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailAccountService.java index b0e02cb4b..958bf107e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailAccountService.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.service.mail; +package cn.fuxiaoaio.ygg.module.system.service.mail; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.account.MailAccountCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.account.MailAccountUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailAccountDO; import javax.validation.Valid; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailAccountServiceImpl.java similarity index 82% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailAccountServiceImpl.java index 4da029e47..9d0e82361 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailAccountServiceImpl.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.module.system.service.mail; +package cn.fuxiaoaio.ygg.module.system.service.mail; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountUpdateReqVO; -import cn.iocoder.yudao.module.system.convert.mail.MailAccountConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO; -import cn.iocoder.yudao.module.system.dal.mysql.mail.MailAccountMapper; -import cn.iocoder.yudao.module.system.mq.producer.mail.MailProducer; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.account.MailAccountCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.account.MailAccountUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.convert.mail.MailAccountConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailAccountDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.mail.MailAccountMapper; +import cn.fuxiaoaio.ygg.module.system.mq.producer.mail.MailProducer; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -18,9 +18,9 @@ import javax.annotation.Resource; import java.util.List; import java.util.Map; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.convertMap; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; /** * 邮箱账号 Service 实现类 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailLogService.java similarity index 79% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailLogService.java index 703467141..b7ea7e3c3 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailLogService.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.service.mail; +package cn.fuxiaoaio.ygg.module.system.service.mail; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.log.MailLogPageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailAccountDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailLogDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailTemplateDO; import java.util.Map; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailLogServiceImpl.java similarity index 84% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailLogServiceImpl.java index 3e7cdc48b..aae8216fb 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailLogServiceImpl.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.system.service.mail; +package cn.fuxiaoaio.ygg.module.system.service.mail; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO; -import cn.iocoder.yudao.module.system.dal.mysql.mail.MailLogMapper; -import cn.iocoder.yudao.module.system.enums.mail.MailSendStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.log.MailLogPageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailAccountDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailLogDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailTemplateDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.mail.MailLogMapper; +import cn.fuxiaoaio.ygg.module.system.enums.mail.MailSendStatusEnum; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailSendService.java similarity index 93% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailSendService.java index 898816868..ad856f28f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailSendService.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.service.mail; +package cn.fuxiaoaio.ygg.module.system.service.mail; -import cn.iocoder.yudao.module.system.mq.message.mail.MailSendMessage; +import cn.fuxiaoaio.ygg.module.system.mq.message.mail.MailSendMessage; import java.util.Map; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailSendServiceImpl.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailSendServiceImpl.java index aa93f101a..5de2077fd 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailSendServiceImpl.java @@ -1,18 +1,18 @@ -package cn.iocoder.yudao.module.system.service.mail; +package cn.fuxiaoaio.ygg.module.system.service.mail; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.mail.MailAccount; import cn.hutool.extra.mail.MailUtil; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.module.system.convert.mail.MailAccountConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; -import cn.iocoder.yudao.module.system.mq.message.mail.MailSendMessage; -import cn.iocoder.yudao.module.system.mq.producer.mail.MailProducer; -import cn.iocoder.yudao.module.system.service.member.MemberService; -import cn.iocoder.yudao.module.system.service.user.AdminUserService; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.module.system.convert.mail.MailAccountConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailAccountDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailTemplateDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.module.system.mq.message.mail.MailSendMessage; +import cn.fuxiaoaio.ygg.module.system.mq.producer.mail.MailProducer; +import cn.fuxiaoaio.ygg.module.system.service.member.MemberService; +import cn.fuxiaoaio.ygg.module.system.service.user.AdminUserService; import com.google.common.annotations.VisibleForTesting; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -21,8 +21,8 @@ import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import java.util.Map; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; /** * 邮箱发送 Service 实现类 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailTemplateService.java similarity index 84% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailTemplateService.java index cb9dc61ef..46a8e4555 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailTemplateService.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.service.mail; +package cn.fuxiaoaio.ygg.module.system.service.mail; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.template.MailTemplateUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailTemplateDO; import javax.validation.Valid; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailTemplateServiceImpl.java similarity index 86% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailTemplateServiceImpl.java index 62baa7e83..aabaaef82 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailTemplateServiceImpl.java @@ -1,16 +1,16 @@ -package cn.iocoder.yudao.module.system.service.mail; +package cn.fuxiaoaio.ygg.module.system.service.mail; import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.ReUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateUpdateReqVO; -import cn.iocoder.yudao.module.system.convert.mail.MailTemplateConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO; -import cn.iocoder.yudao.module.system.dal.mysql.mail.MailTemplateMapper; -import cn.iocoder.yudao.module.system.mq.producer.mail.MailProducer; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.template.MailTemplateUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.convert.mail.MailTemplateConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailTemplateDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.mail.MailTemplateMapper; +import cn.fuxiaoaio.ygg.module.system.mq.producer.mail.MailProducer; import com.google.common.annotations.VisibleForTesting; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -24,9 +24,9 @@ import java.util.List; import java.util.Map; import java.util.regex.Pattern; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.convertMap; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; /** * 邮箱模版 Service 实现类 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/member/MemberService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/member/MemberService.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/member/MemberService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/member/MemberService.java index 933e5bfc0..19e456d47 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/member/MemberService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/member/MemberService.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.service.member; +package cn.fuxiaoaio.ygg.module.system.service.member; /** * Member Service 接口 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/member/MemberServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/member/MemberServiceImpl.java similarity index 93% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/member/MemberServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/member/MemberServiceImpl.java index 7b31e0456..e1152aeae 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/member/MemberServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/member/MemberServiceImpl.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.service.member; +package cn.fuxiaoaio.ygg.module.system.service.member; import cn.hutool.core.util.ClassUtil; import cn.hutool.core.util.ReflectUtil; @@ -14,7 +14,7 @@ import org.springframework.stereotype.Service; @Service public class MemberServiceImpl implements MemberService { - @Value("${yudao.info.base-package}") + @Value("${fuxiaoaio.info.base-package}") private String basePackage; private volatile Object memberUserApi; diff --git a/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/member/package-info.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/member/package-info.java new file mode 100644 index 000000000..54c1e0286 --- /dev/null +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/member/package-info.java @@ -0,0 +1,4 @@ +/** + * fuxiaoaio-module-member 模块的适配，解除 fuxiaoaio-module-system 对它们的依赖 + */ +package cn.fuxiaoaio.ygg.module.system.service.member; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notice/NoticeService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/notice/NoticeService.java similarity index 72% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notice/NoticeService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/notice/NoticeService.java index 432fe876e..dee98ca4b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notice/NoticeService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/notice/NoticeService.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.service.notice; +package cn.fuxiaoaio.ygg.module.system.service.notice; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticeCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticePageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticeUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.notice.NoticeDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notice.vo.NoticeCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notice.vo.NoticePageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notice.vo.NoticeUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.notice.NoticeDO; /** * 通知公告 Service 接口 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notice/NoticeServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/notice/NoticeServiceImpl.java similarity index 72% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notice/NoticeServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/notice/NoticeServiceImpl.java index 1930e64c1..a390bc2f9 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notice/NoticeServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/notice/NoticeServiceImpl.java @@ -1,19 +1,19 @@ -package cn.iocoder.yudao.module.system.service.notice; +package cn.fuxiaoaio.ygg.module.system.service.notice; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticeCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticePageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticeUpdateReqVO; -import cn.iocoder.yudao.module.system.convert.notice.NoticeConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.notice.NoticeDO; -import cn.iocoder.yudao.module.system.dal.mysql.notice.NoticeMapper; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notice.vo.NoticeCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notice.vo.NoticePageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notice.vo.NoticeUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.convert.notice.NoticeConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.notice.NoticeDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.notice.NoticeMapper; import com.google.common.annotations.VisibleForTesting; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.NOTICE_NOT_FOUND; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.NOTICE_NOT_FOUND; /** * 通知公告 Service 实现类 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifyMessageService.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifyMessageService.java index b06aef322..66f0c8b04 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifyMessageService.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.service.notify; +package cn.fuxiaoaio.ygg.module.system.service.notify; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageMyPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO; -import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.message.NotifyMessageMyPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.notify.NotifyMessageDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.notify.NotifyTemplateDO; import java.util.Collection; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifyMessageServiceImpl.java similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifyMessageServiceImpl.java index 1ac4c0488..6a5f77195 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifyMessageServiceImpl.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.service.notify; +package cn.fuxiaoaio.ygg.module.system.service.notify; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageMyPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO; -import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO; -import cn.iocoder.yudao.module.system.dal.mysql.notify.NotifyMessageMapper; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.message.NotifyMessageMyPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.notify.NotifyMessageDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.notify.NotifyTemplateDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.notify.NotifyMessageMapper; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifySendService.java similarity index 97% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifySendService.java index f4a8d4f4c..766d42f86 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifySendService.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.service.notify; +package cn.fuxiaoaio.ygg.module.system.service.notify; import java.util.List; import java.util.Map; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifySendServiceImpl.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifySendServiceImpl.java index 8d360dead..b0aac6505 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifySendServiceImpl.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.service.notify; +package cn.fuxiaoaio.ygg.module.system.service.notify; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.notify.NotifyTemplateDO; import com.google.common.annotations.VisibleForTesting; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -12,9 +12,9 @@ import javax.annotation.Resource; import java.util.Map; import java.util.Objects; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.NOTICE_NOT_FOUND; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.NOTIFY_SEND_TEMPLATE_PARAM_MISS; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.NOTICE_NOT_FOUND; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.NOTIFY_SEND_TEMPLATE_PARAM_MISS; /** * 站内信发送 Service 实现类 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifyTemplateService.java similarity index 82% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifyTemplateService.java index 260159b79..d0492522f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifyTemplateService.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.service.notify; +package cn.fuxiaoaio.ygg.module.system.service.notify; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplatePageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.template.NotifyTemplateCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.template.NotifyTemplatePageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.template.NotifyTemplateUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.notify.NotifyTemplateDO; import javax.validation.Valid; import java.util.Map; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifyTemplateServiceImpl.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifyTemplateServiceImpl.java index 5b63ac720..ae1e71942 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifyTemplateServiceImpl.java @@ -1,16 +1,16 @@ -package cn.iocoder.yudao.module.system.service.notify; +package cn.fuxiaoaio.ygg.module.system.service.notify; import cn.hutool.core.util.ReUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplatePageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateUpdateReqVO; -import cn.iocoder.yudao.module.system.convert.notify.NotifyTemplateConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO; -import cn.iocoder.yudao.module.system.dal.mysql.notify.NotifyTemplateMapper; -import cn.iocoder.yudao.module.system.mq.producer.notify.NotifyProducer; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.template.NotifyTemplateCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.template.NotifyTemplatePageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.template.NotifyTemplateUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.convert.notify.NotifyTemplateConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.notify.NotifyTemplateDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.notify.NotifyTemplateMapper; +import cn.fuxiaoaio.ygg.module.system.mq.producer.notify.NotifyProducer; import com.google.common.annotations.VisibleForTesting; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -22,8 +22,8 @@ import java.util.List; import java.util.Map; import java.util.regex.Pattern; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; /** * 站内信模版 Service 实现类 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ApproveService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2ApproveService.java similarity index 93% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ApproveService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2ApproveService.java index def3e5e2c..0aa6a0007 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ApproveService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2ApproveService.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.service.oauth2; +package cn.fuxiaoaio.ygg.module.system.service.oauth2; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ApproveDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2ApproveDO; import java.util.Collection; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ApproveServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2ApproveServiceImpl.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ApproveServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2ApproveServiceImpl.java index 29f0f11b0..93a2c0e0f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ApproveServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2ApproveServiceImpl.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.service.oauth2; +package cn.fuxiaoaio.ygg.module.system.service.oauth2; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ApproveDO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ClientDO; -import cn.iocoder.yudao.module.system.dal.mysql.oauth2.OAuth2ApproveMapper; +import cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2ApproveDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2ClientDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.oauth2.OAuth2ApproveMapper; import com.google.common.annotations.VisibleForTesting; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -15,7 +15,7 @@ import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.*; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.convertSet; /** * OAuth2 批准 Service 实现类 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2ClientService.java similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2ClientService.java index 60e9f2298..2c86e78b6 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2ClientService.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.service.oauth2; +package cn.fuxiaoaio.ygg.module.system.service.oauth2; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.client.OAuth2ClientCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.client.OAuth2ClientPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.client.OAuth2ClientUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ClientDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.client.OAuth2ClientCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.client.OAuth2ClientPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.client.OAuth2ClientUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2ClientDO; import javax.validation.Valid; import java.util.Collection; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2ClientServiceImpl.java similarity index 86% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2ClientServiceImpl.java index 970387bbb..59b969888 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2ClientServiceImpl.java @@ -1,18 +1,18 @@ -package cn.iocoder.yudao.module.system.service.oauth2; +package cn.fuxiaoaio.ygg.module.system.service.oauth2; 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.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.string.StrUtils; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.client.OAuth2ClientCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.client.OAuth2ClientPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.client.OAuth2ClientUpdateReqVO; -import cn.iocoder.yudao.module.system.convert.auth.OAuth2ClientConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ClientDO; -import cn.iocoder.yudao.module.system.dal.mysql.oauth2.OAuth2ClientMapper; -import cn.iocoder.yudao.module.system.mq.producer.auth.OAuth2ClientProducer; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.string.StrUtils; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.client.OAuth2ClientCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.client.OAuth2ClientPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.client.OAuth2ClientUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.convert.auth.OAuth2ClientConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2ClientDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.oauth2.OAuth2ClientMapper; +import cn.fuxiaoaio.ygg.module.system.mq.producer.auth.OAuth2ClientProducer; import com.google.common.annotations.VisibleForTesting; import lombok.Getter; import lombok.Setter; @@ -26,9 +26,9 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.convertMap; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; /** * OAuth2.0 Client Service 实现类 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2CodeService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2CodeService.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2CodeService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2CodeService.java index 5ace87eb7..f5d2357d9 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2CodeService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2CodeService.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.service.oauth2; +package cn.fuxiaoaio.ygg.module.system.service.oauth2; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2CodeDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2CodeDO; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2CodeServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2CodeServiceImpl.java similarity index 80% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2CodeServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2CodeServiceImpl.java index df6d4c88f..820650eba 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2CodeServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2CodeServiceImpl.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.system.service.oauth2; +package cn.fuxiaoaio.ygg.module.system.service.oauth2; import cn.hutool.core.util.IdUtil; -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2CodeDO; -import cn.iocoder.yudao.module.system.dal.mysql.oauth2.OAuth2CodeMapper; +import cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2CodeDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.oauth2.OAuth2CodeMapper; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -11,9 +11,9 @@ import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.List; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.OAUTH2_CODE_EXPIRE; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.OAUTH2_CODE_NOT_EXISTS; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.OAUTH2_CODE_EXPIRE; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.OAUTH2_CODE_NOT_EXISTS; /** * OAuth2.0 授权码 Service 实现类 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2GrantService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2GrantService.java similarity index 96% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2GrantService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2GrantService.java index 6b7a8f56a..43e0519f9 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2GrantService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2GrantService.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.service.oauth2; +package cn.fuxiaoaio.ygg.module.system.service.oauth2; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2GrantServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2GrantServiceImpl.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2GrantServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2GrantServiceImpl.java index adb07f9b5..1a380023e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2GrantServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2GrantServiceImpl.java @@ -1,20 +1,20 @@ -package cn.iocoder.yudao.module.system.service.oauth2; +package cn.fuxiaoaio.ygg.module.system.service.oauth2; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2CodeDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; -import cn.iocoder.yudao.module.system.enums.ErrorCodeConstants; -import cn.iocoder.yudao.module.system.service.auth.AdminAuthService; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2CodeDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants; +import cn.fuxiaoaio.ygg.module.system.service.auth.AdminAuthService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; /** * OAuth2 授予 Service 实现类 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2TokenService.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2TokenService.java index 977d93539..3785025ec 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2TokenService.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.system.service.oauth2; +package cn.fuxiaoaio.ygg.module.system.service.oauth2; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.token.OAuth2AccessTokenPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.token.OAuth2AccessTokenPageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2TokenServiceImpl.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2TokenServiceImpl.java index bde7d2fd3..53f72a58f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2TokenServiceImpl.java @@ -1,19 +1,19 @@ -package cn.iocoder.yudao.module.system.service.oauth2; +package cn.fuxiaoaio.ygg.module.system.service.oauth2; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; -import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.token.OAuth2AccessTokenPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ClientDO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2RefreshTokenDO; -import cn.iocoder.yudao.module.system.dal.mysql.oauth2.OAuth2AccessTokenMapper; -import cn.iocoder.yudao.module.system.dal.mysql.oauth2.OAuth2RefreshTokenMapper; -import cn.iocoder.yudao.module.system.dal.redis.oauth2.OAuth2AccessTokenRedisDAO; +import cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils; +import cn.fuxiaoaio.ygg.framework.tenant.core.context.TenantContextHolder; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.token.OAuth2AccessTokenPageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2ClientDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2RefreshTokenDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.oauth2.OAuth2AccessTokenMapper; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.oauth2.OAuth2RefreshTokenMapper; +import cn.fuxiaoaio.ygg.module.system.dal.redis.oauth2.OAuth2AccessTokenRedisDAO; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -22,8 +22,8 @@ import java.time.LocalDateTime; import java.util.Calendar; import java.util.List; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception0; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception0; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.convertSet; /** * OAuth2.0 Token Service 实现类 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/permission/MenuService.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/permission/MenuService.java index 02418c077..82e6f5c52 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/permission/MenuService.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.system.service.permission; +package cn.fuxiaoaio.ygg.module.system.service.permission; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuListReqVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.menu.MenuCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.menu.MenuListReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.menu.MenuUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.MenuDO; import java.util.Collection; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/permission/MenuServiceImpl.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/permission/MenuServiceImpl.java index ba56dc41e..a0150ef7d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/permission/MenuServiceImpl.java @@ -1,18 +1,18 @@ -package cn.iocoder.yudao.module.system.service.permission; +package cn.fuxiaoaio.ygg.module.system.service.permission; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuListReqVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuUpdateReqVO; -import cn.iocoder.yudao.module.system.convert.permission.MenuConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO; -import cn.iocoder.yudao.module.system.dal.mysql.permission.MenuMapper; -import cn.iocoder.yudao.module.system.enums.permission.MenuTypeEnum; -import cn.iocoder.yudao.module.system.mq.producer.permission.MenuProducer; -import cn.iocoder.yudao.module.system.service.tenant.TenantService; +import cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.menu.MenuCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.menu.MenuListReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.menu.MenuUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.convert.permission.MenuConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.MenuDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.permission.MenuMapper; +import cn.fuxiaoaio.ygg.module.system.enums.permission.MenuTypeEnum; +import cn.fuxiaoaio.ygg.module.system.mq.producer.permission.MenuProducer; +import cn.fuxiaoaio.ygg.module.system.service.tenant.TenantService; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; @@ -31,9 +31,9 @@ import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO.ID_ROOT; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.MenuDO.ID_ROOT; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; /** * 菜单 Service 实现 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/permission/PermissionService.java similarity index 94% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/permission/PermissionService.java index 97174d629..891a44da2 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/permission/PermissionService.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.service.permission; +package cn.fuxiaoaio.ygg.module.system.service.permission; -import cn.iocoder.yudao.module.system.api.permission.dto.DeptDataPermissionRespDTO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO; +import cn.fuxiaoaio.ygg.module.system.api.permission.dto.DeptDataPermissionRespDTO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.MenuDO; import org.springframework.lang.Nullable; import java.util.Collection; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/permission/PermissionServiceImpl.java similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/permission/PermissionServiceImpl.java index 43365cf46..990601e4e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/permission/PermissionServiceImpl.java @@ -1,27 +1,27 @@ -package cn.iocoder.yudao.module.system.service.permission; +package cn.fuxiaoaio.ygg.module.system.service.permission; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ArrayUtil; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.framework.common.util.collection.MapUtils; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; -import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission; -import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; -import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils; -import cn.iocoder.yudao.module.system.api.permission.dto.DeptDataPermissionRespDTO; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleMenuDO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.UserRoleDO; -import cn.iocoder.yudao.module.system.dal.mysql.permission.RoleMenuMapper; -import cn.iocoder.yudao.module.system.dal.mysql.permission.UserRoleMapper; -import cn.iocoder.yudao.module.system.enums.permission.DataScopeEnum; -import cn.iocoder.yudao.module.system.mq.producer.permission.PermissionProducer; -import cn.iocoder.yudao.module.system.service.dept.DeptService; -import cn.iocoder.yudao.module.system.service.user.AdminUserService; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.framework.common.util.collection.MapUtils; +import cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils; +import cn.fuxiaoaio.ygg.framework.datapermission.core.annotation.DataPermission; +import cn.fuxiaoaio.ygg.framework.tenant.core.aop.TenantIgnore; +import cn.fuxiaoaio.ygg.framework.tenant.core.util.TenantUtils; +import cn.fuxiaoaio.ygg.module.system.api.permission.dto.DeptDataPermissionRespDTO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.DeptDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.MenuDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.RoleDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.RoleMenuDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.UserRoleDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.permission.RoleMenuMapper; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.permission.UserRoleMapper; +import cn.fuxiaoaio.ygg.module.system.enums.permission.DataScopeEnum; +import cn.fuxiaoaio.ygg.module.system.mq.producer.permission.PermissionProducer; +import cn.fuxiaoaio.ygg.module.system.service.dept.DeptService; +import cn.fuxiaoaio.ygg.module.system.service.user.AdminUserService; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableMultimap; @@ -40,7 +40,7 @@ import javax.annotation.Resource; import java.util.*; import java.util.function.Supplier; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.convertSet; import static java.util.Collections.singleton; /** diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/permission/RoleService.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/permission/RoleService.java index 70acbdcb7..948acf79b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/permission/RoleService.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.service.permission; +package cn.fuxiaoaio.ygg.module.system.service.permission; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RolePageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role.RoleCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role.RoleExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role.RolePageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role.RoleUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.RoleDO; import org.springframework.lang.Nullable; import javax.validation.Valid; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/permission/RoleServiceImpl.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/permission/RoleServiceImpl.java index a3f2c70a3..083decae8 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/permission/RoleServiceImpl.java @@ -1,22 +1,22 @@ -package cn.iocoder.yudao.module.system.service.permission; +package cn.fuxiaoaio.ygg.module.system.service.permission; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RolePageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleUpdateReqVO; -import cn.iocoder.yudao.module.system.convert.permission.RoleConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; -import cn.iocoder.yudao.module.system.dal.mysql.permission.RoleMapper; -import cn.iocoder.yudao.module.system.enums.permission.DataScopeEnum; -import cn.iocoder.yudao.module.system.enums.permission.RoleCodeEnum; -import cn.iocoder.yudao.module.system.enums.permission.RoleTypeEnum; -import cn.iocoder.yudao.module.system.mq.producer.permission.RoleProducer; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.tenant.core.util.TenantUtils; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role.RoleCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role.RoleExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role.RolePageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role.RoleUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.convert.permission.RoleConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.RoleDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.permission.RoleMapper; +import cn.fuxiaoaio.ygg.module.system.enums.permission.DataScopeEnum; +import cn.fuxiaoaio.ygg.module.system.enums.permission.RoleCodeEnum; +import cn.fuxiaoaio.ygg.module.system.enums.permission.RoleTypeEnum; +import cn.fuxiaoaio.ygg.module.system.mq.producer.permission.RoleProducer; import com.google.common.annotations.VisibleForTesting; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -32,9 +32,9 @@ import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.convertMap; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; /** * 角色 Service 实现类 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/bo/RoleCreateReqBO.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/permission/bo/RoleCreateReqBO.java similarity index 94% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/bo/RoleCreateReqBO.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/permission/bo/RoleCreateReqBO.java index d570436d1..e87b9f015 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/bo/RoleCreateReqBO.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/permission/bo/RoleCreateReqBO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.service.permission.bo; +package cn.fuxiaoaio.ygg.module.system.service.permission.bo; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sensitiveword/SensitiveWordService.java similarity index 83% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sensitiveword/SensitiveWordService.java index a852ec9cf..c80b4700b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sensitiveword/SensitiveWordService.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.service.sensitiveword; +package cn.fuxiaoaio.ygg.module.system.service.sensitiveword; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.SensitiveWordCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.SensitiveWordExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.SensitiveWordPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.SensitiveWordUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.sensitiveword.SensitiveWordDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword.vo.SensitiveWordCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword.vo.SensitiveWordExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword.vo.SensitiveWordPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword.vo.SensitiveWordUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sensitiveword.SensitiveWordDO; import javax.validation.Valid; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sensitiveword/SensitiveWordServiceImpl.java similarity index 86% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sensitiveword/SensitiveWordServiceImpl.java index b82807855..fab1080ab 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sensitiveword/SensitiveWordServiceImpl.java @@ -1,18 +1,18 @@ -package cn.iocoder.yudao.module.system.service.sensitiveword; +package cn.fuxiaoaio.ygg.module.system.service.sensitiveword; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.SensitiveWordCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.SensitiveWordExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.SensitiveWordPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.SensitiveWordUpdateReqVO; -import cn.iocoder.yudao.module.system.convert.sensitiveword.SensitiveWordConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.sensitiveword.SensitiveWordDO; -import cn.iocoder.yudao.module.system.dal.mysql.sensitiveword.SensitiveWordMapper; -import cn.iocoder.yudao.module.system.mq.producer.sensitiveword.SensitiveWordProducer; -import cn.iocoder.yudao.module.system.util.collection.SimpleTrie; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword.vo.SensitiveWordCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword.vo.SensitiveWordExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword.vo.SensitiveWordPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword.vo.SensitiveWordUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.convert.sensitiveword.SensitiveWordConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sensitiveword.SensitiveWordDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.sensitiveword.SensitiveWordMapper; +import cn.fuxiaoaio.ygg.module.system.mq.producer.sensitiveword.SensitiveWordProducer; +import cn.fuxiaoaio.ygg.module.system.util.collection.SimpleTrie; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import lombok.Getter; @@ -24,10 +24,10 @@ import javax.annotation.PostConstruct; import javax.annotation.Resource; import java.util.*; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.filterList; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.SENSITIVE_WORD_EXISTS; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.SENSITIVE_WORD_NOT_EXISTS; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.filterList; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.SENSITIVE_WORD_EXISTS; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.SENSITIVE_WORD_NOT_EXISTS; /** * 敏感词 Service 实现类 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsChannelService.java similarity index 77% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsChannelService.java index c0bb3f8cd..edbb3a998 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsChannelService.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.service.sms; +package cn.fuxiaoaio.ygg.module.system.service.sms; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsChannelDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.channel.SmsChannelCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.channel.SmsChannelPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.channel.SmsChannelUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsChannelDO; import javax.validation.Valid; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsChannelServiceImpl.java similarity index 78% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsChannelServiceImpl.java index d6f8aa004..6f778be60 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsChannelServiceImpl.java @@ -1,15 +1,15 @@ -package cn.iocoder.yudao.module.system.service.sms; +package cn.fuxiaoaio.ygg.module.system.service.sms; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.sms.core.client.SmsClientFactory; -import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelUpdateReqVO; -import cn.iocoder.yudao.module.system.convert.sms.SmsChannelConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsChannelDO; -import cn.iocoder.yudao.module.system.dal.mysql.sms.SmsChannelMapper; -import cn.iocoder.yudao.module.system.mq.producer.sms.SmsProducer; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsClientFactory; +import cn.fuxiaoaio.ygg.framework.sms.core.property.SmsChannelProperties; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.channel.SmsChannelCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.channel.SmsChannelPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.channel.SmsChannelUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.convert.sms.SmsChannelConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsChannelDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.sms.SmsChannelMapper; +import cn.fuxiaoaio.ygg.module.system.mq.producer.sms.SmsProducer; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -17,9 +17,9 @@ import javax.annotation.PostConstruct; import javax.annotation.Resource; import java.util.List; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.SMS_CHANNEL_HAS_CHILDREN; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.SMS_CHANNEL_NOT_EXISTS; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.SMS_CHANNEL_HAS_CHILDREN; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.SMS_CHANNEL_NOT_EXISTS; /** * 短信渠道 Service 实现类 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsCodeService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsCodeService.java similarity index 71% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsCodeService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsCodeService.java index 70cdb2f4c..3be49268c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsCodeService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsCodeService.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.system.service.sms; +package cn.fuxiaoaio.ygg.module.system.service.sms; -import cn.iocoder.yudao.framework.common.exception.ServiceException; -import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeSendReqDTO; -import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeUseReqDTO; -import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeValidateReqDTO; +import cn.fuxiaoaio.ygg.framework.common.exception.ServiceException; +import cn.fuxiaoaio.ygg.module.system.api.sms.dto.code.SmsCodeSendReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.sms.dto.code.SmsCodeUseReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.sms.dto.code.SmsCodeValidateReqDTO; import javax.validation.Valid; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsCodeServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsCodeServiceImpl.java similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsCodeServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsCodeServiceImpl.java index 682b89eff..1a6ed7063 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsCodeServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsCodeServiceImpl.java @@ -1,15 +1,15 @@ -package cn.iocoder.yudao.module.system.service.sms; +package cn.fuxiaoaio.ygg.module.system.service.sms; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.map.MapUtil; -import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeSendReqDTO; -import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeUseReqDTO; -import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeValidateReqDTO; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsCodeDO; -import cn.iocoder.yudao.module.system.dal.mysql.sms.SmsCodeMapper; -import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum; -import cn.iocoder.yudao.module.system.framework.sms.SmsCodeProperties; +import cn.fuxiaoaio.ygg.module.system.api.sms.dto.code.SmsCodeSendReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.sms.dto.code.SmsCodeUseReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.sms.dto.code.SmsCodeValidateReqDTO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsCodeDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.sms.SmsCodeMapper; +import cn.fuxiaoaio.ygg.module.system.enums.sms.SmsSceneEnum; +import cn.fuxiaoaio.ygg.module.system.framework.sms.SmsCodeProperties; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -17,9 +17,9 @@ import javax.annotation.Resource; import java.time.LocalDateTime; import static cn.hutool.core.util.RandomUtil.randomInt; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.isToday; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.isToday; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; /** * 短信验证码 Service 实现类 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsLogService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsLogService.java similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsLogService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsLogService.java index e9c668ccd..304e7ad55 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsLogService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsLogService.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.service.sms; +package cn.fuxiaoaio.ygg.module.system.service.sms; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.log.SmsLogExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.log.SmsLogPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsLogDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.log.SmsLogExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.log.SmsLogPageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsLogDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsTemplateDO; import java.time.LocalDateTime; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsLogServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsLogServiceImpl.java similarity index 84% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsLogServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsLogServiceImpl.java index 40e7d1c0a..3c46f11a2 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsLogServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsLogServiceImpl.java @@ -1,14 +1,14 @@ -package cn.iocoder.yudao.module.system.service.sms; +package cn.fuxiaoaio.ygg.module.system.service.sms; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.log.SmsLogExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.log.SmsLogPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsLogDO; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO; -import cn.iocoder.yudao.module.system.dal.mysql.sms.SmsLogMapper; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.enums.sms.SmsReceiveStatusEnum; -import cn.iocoder.yudao.module.system.enums.sms.SmsSendStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.log.SmsLogExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.log.SmsLogPageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsLogDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsTemplateDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.sms.SmsLogMapper; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.enums.sms.SmsReceiveStatusEnum; +import cn.fuxiaoaio.ygg.module.system.enums.sms.SmsSendStatusEnum; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsSendService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsSendService.java similarity index 95% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsSendService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsSendService.java index 3c42cf58e..6679e66cb 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsSendService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsSendService.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.service.sms; +package cn.fuxiaoaio.ygg.module.system.service.sms; -import cn.iocoder.yudao.module.system.mq.message.sms.SmsSendMessage; +import cn.fuxiaoaio.ygg.module.system.mq.message.sms.SmsSendMessage; import java.util.List; import java.util.Map; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsSendServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsSendServiceImpl.java similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsSendServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsSendServiceImpl.java index af4aa32fc..0a5d194af 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsSendServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsSendServiceImpl.java @@ -1,24 +1,24 @@ -package cn.iocoder.yudao.module.system.service.sms; +package cn.fuxiaoaio.ygg.module.system.service.sms; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.core.KeyValue; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission; -import cn.iocoder.yudao.framework.sms.core.client.SmsClient; -import cn.iocoder.yudao.framework.sms.core.client.SmsClientFactory; -import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsReceiveRespDTO; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsChannelDO; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; -import cn.iocoder.yudao.module.system.mq.message.sms.SmsSendMessage; -import cn.iocoder.yudao.module.system.mq.producer.sms.SmsProducer; -import cn.iocoder.yudao.module.system.service.member.MemberService; -import cn.iocoder.yudao.module.system.service.user.AdminUserService; +import cn.fuxiaoaio.ygg.framework.common.core.KeyValue; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.datapermission.core.annotation.DataPermission; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsClient; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsClientFactory; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsCommonResult; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsReceiveRespDTO; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsSendRespDTO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsChannelDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsTemplateDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.module.system.mq.message.sms.SmsSendMessage; +import cn.fuxiaoaio.ygg.module.system.mq.producer.sms.SmsProducer; +import cn.fuxiaoaio.ygg.module.system.service.member.MemberService; +import cn.fuxiaoaio.ygg.module.system.service.user.AdminUserService; import com.google.common.annotations.VisibleForTesting; import org.springframework.stereotype.Service; @@ -27,8 +27,8 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; /** * 短信发送 Service 发送的实现 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsTemplateService.java similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsTemplateService.java index 997586c73..278b97b3a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsTemplateService.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.service.sms; +package cn.fuxiaoaio.ygg.module.system.service.sms; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplateCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplateExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplatePageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplateUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template.SmsTemplateCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template.SmsTemplateExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template.SmsTemplatePageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template.SmsTemplateUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsTemplateDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; import javax.validation.Valid; import java.util.Collection; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsTemplateServiceImpl.java similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsTemplateServiceImpl.java index c9edac2f8..053ae900d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsTemplateServiceImpl.java @@ -1,23 +1,23 @@ -package cn.iocoder.yudao.module.system.service.sms; +package cn.fuxiaoaio.ygg.module.system.service.sms; import cn.hutool.core.util.ReUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.framework.sms.core.client.SmsClient; -import cn.iocoder.yudao.framework.sms.core.client.SmsClientFactory; -import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplateCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplateExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplatePageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplateUpdateReqVO; -import cn.iocoder.yudao.module.system.convert.sms.SmsTemplateConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsChannelDO; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO; -import cn.iocoder.yudao.module.system.dal.mysql.sms.SmsTemplateMapper; -import cn.iocoder.yudao.module.system.mq.producer.sms.SmsProducer; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsClient; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsClientFactory; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsCommonResult; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsTemplateRespDTO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template.SmsTemplateCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template.SmsTemplateExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template.SmsTemplatePageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template.SmsTemplateUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.convert.sms.SmsTemplateConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsChannelDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsTemplateDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.sms.SmsTemplateMapper; +import cn.fuxiaoaio.ygg.module.system.mq.producer.sms.SmsProducer; import com.google.common.annotations.VisibleForTesting; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -32,8 +32,8 @@ import java.util.Map; import java.util.Objects; import java.util.regex.Pattern; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; /** * 短信模板 Service 实现类 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/social/SocialUserService.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/social/SocialUserService.java index 6d89897bb..f273c03fd 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/social/SocialUserService.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.system.service.social; +package cn.fuxiaoaio.ygg.module.system.service.social; -import cn.iocoder.yudao.framework.common.exception.ServiceException; -import cn.iocoder.yudao.module.system.api.social.dto.SocialUserBindReqDTO; -import cn.iocoder.yudao.module.system.dal.dataobject.social.SocialUserDO; -import cn.iocoder.yudao.module.system.enums.social.SocialTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.exception.ServiceException; +import cn.fuxiaoaio.ygg.module.system.api.social.dto.SocialUserBindReqDTO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.social.SocialUserDO; +import cn.fuxiaoaio.ygg.module.system.enums.social.SocialTypeEnum; import javax.validation.Valid; import javax.validation.constraints.NotNull; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/social/SocialUserServiceImpl.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/social/SocialUserServiceImpl.java index 723e507c4..a04e47147 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/social/SocialUserServiceImpl.java @@ -1,14 +1,14 @@ -package cn.iocoder.yudao.module.system.service.social; +package cn.fuxiaoaio.ygg.module.system.service.social; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; -import cn.iocoder.yudao.framework.common.util.http.HttpUtils; -import cn.iocoder.yudao.module.system.api.social.dto.SocialUserBindReqDTO; -import cn.iocoder.yudao.module.system.dal.dataobject.social.SocialUserBindDO; -import cn.iocoder.yudao.module.system.dal.dataobject.social.SocialUserDO; -import cn.iocoder.yudao.module.system.dal.mysql.social.SocialUserBindMapper; -import cn.iocoder.yudao.module.system.dal.mysql.social.SocialUserMapper; -import cn.iocoder.yudao.module.system.enums.social.SocialTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.util.http.HttpUtils; +import cn.fuxiaoaio.ygg.module.system.api.social.dto.SocialUserBindReqDTO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.social.SocialUserBindDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.social.SocialUserDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.social.SocialUserBindMapper; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.social.SocialUserMapper; +import cn.fuxiaoaio.ygg.module.system.enums.social.SocialTypeEnum; import com.xkcoding.justauth.AuthRequestFactory; import lombok.extern.slf4j.Slf4j; import me.zhyd.oauth.model.AuthCallback; @@ -24,10 +24,10 @@ import javax.annotation.Resource; import java.util.Collections; import java.util.List; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; -import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.convertSet; +import static cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils.toJsonString; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; /** * 社交用户 Service 实现类 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/tenant/TenantPackageService.java old mode 100755 new mode 100644 similarity index 79% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/tenant/TenantPackageService.java index c58426a2b..70ddf9787 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/tenant/TenantPackageService.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.service.tenant; +package cn.fuxiaoaio.ygg.module.system.service.tenant; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages.TenantPackageCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages.TenantPackagePageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages.TenantPackageUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantPackageDO; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.packages.TenantPackageCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.packages.TenantPackagePageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.packages.TenantPackageUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.tenant.TenantPackageDO; import javax.validation.Valid; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/tenant/TenantPackageServiceImpl.java old mode 100755 new mode 100644 similarity index 82% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/tenant/TenantPackageServiceImpl.java index 4e6e60198..83df66152 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/tenant/TenantPackageServiceImpl.java @@ -1,15 +1,15 @@ -package cn.iocoder.yudao.module.system.service.tenant; +package cn.fuxiaoaio.ygg.module.system.service.tenant; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages.TenantPackageCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages.TenantPackagePageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages.TenantPackageUpdateReqVO; -import cn.iocoder.yudao.module.system.convert.tenant.TenantPackageConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantDO; -import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantPackageDO; -import cn.iocoder.yudao.module.system.dal.mysql.tenant.TenantPackageMapper; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.packages.TenantPackageCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.packages.TenantPackagePageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.packages.TenantPackageUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.convert.tenant.TenantPackageConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.tenant.TenantDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.tenant.TenantPackageDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.tenant.TenantPackageMapper; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -18,8 +18,8 @@ import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import java.util.List; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; /** * 租户套餐 Service 实现类 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/tenant/TenantService.java old mode 100755 new mode 100644 similarity index 81% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/tenant/TenantService.java index 3dacfefe7..32992207a --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/tenant/TenantService.java @@ -1,14 +1,14 @@ -package cn.iocoder.yudao.module.system.service.tenant; +package cn.fuxiaoaio.ygg.module.system.service.tenant; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantDO; -import cn.iocoder.yudao.module.system.service.tenant.handler.TenantInfoHandler; -import cn.iocoder.yudao.module.system.service.tenant.handler.TenantMenuHandler; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.tenant.core.context.TenantContextHolder; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.tenant.TenantCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.tenant.TenantExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.tenant.TenantPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.tenant.TenantUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.tenant.TenantDO; +import cn.fuxiaoaio.ygg.module.system.service.tenant.handler.TenantInfoHandler; +import cn.fuxiaoaio.ygg.module.system.service.tenant.handler.TenantMenuHandler; import javax.validation.Valid; import java.util.List; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/tenant/TenantServiceImpl.java old mode 100755 new mode 100644 similarity index 82% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/tenant/TenantServiceImpl.java index 1664ff6e3..98f32b7f9 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/tenant/TenantServiceImpl.java @@ -1,34 +1,34 @@ -package cn.iocoder.yudao.module.system.service.tenant; +package cn.fuxiaoaio.ygg.module.system.service.tenant; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import cn.iocoder.yudao.framework.tenant.config.TenantProperties; -import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; -import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantUpdateReqVO; -import cn.iocoder.yudao.module.system.convert.tenant.TenantConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; -import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantDO; -import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantPackageDO; -import cn.iocoder.yudao.module.system.dal.mysql.tenant.TenantMapper; -import cn.iocoder.yudao.module.system.enums.permission.RoleCodeEnum; -import cn.iocoder.yudao.module.system.enums.permission.RoleTypeEnum; -import cn.iocoder.yudao.module.system.service.permission.MenuService; -import cn.iocoder.yudao.module.system.service.permission.PermissionService; -import cn.iocoder.yudao.module.system.service.permission.RoleService; -import cn.iocoder.yudao.module.system.service.tenant.handler.TenantInfoHandler; -import cn.iocoder.yudao.module.system.service.tenant.handler.TenantMenuHandler; -import cn.iocoder.yudao.module.system.service.user.AdminUserService; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils; +import cn.fuxiaoaio.ygg.framework.tenant.config.TenantProperties; +import cn.fuxiaoaio.ygg.framework.tenant.core.context.TenantContextHolder; +import cn.fuxiaoaio.ygg.framework.tenant.core.util.TenantUtils; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role.RoleCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.tenant.TenantCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.tenant.TenantExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.tenant.TenantPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.tenant.TenantUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.convert.tenant.TenantConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.MenuDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.RoleDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.tenant.TenantDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.tenant.TenantPackageDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.tenant.TenantMapper; +import cn.fuxiaoaio.ygg.module.system.enums.permission.RoleCodeEnum; +import cn.fuxiaoaio.ygg.module.system.enums.permission.RoleTypeEnum; +import cn.fuxiaoaio.ygg.module.system.service.permission.MenuService; +import cn.fuxiaoaio.ygg.module.system.service.permission.PermissionService; +import cn.fuxiaoaio.ygg.module.system.service.permission.RoleService; +import cn.fuxiaoaio.ygg.module.system.service.tenant.handler.TenantInfoHandler; +import cn.fuxiaoaio.ygg.module.system.service.tenant.handler.TenantMenuHandler; +import cn.fuxiaoaio.ygg.module.system.service.user.AdminUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; @@ -41,8 +41,8 @@ import java.util.List; import java.util.Objects; import java.util.Set; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; import static java.util.Collections.singleton; /** @@ -56,7 +56,7 @@ import static java.util.Collections.singleton; public class TenantServiceImpl implements TenantService { @SuppressWarnings("SpringJavaAutowiredFieldsWarningInspection") - @Autowired(required = false) // 由于 yudao.tenant.enable 配置项，可以关闭多租户的功能，所以这里只能不强制注入 + @Autowired(required = false) // 由于 fuxiaoaio.tenant.enable 配置项，可以关闭多租户的功能，所以这里只能不强制注入 private TenantProperties tenantProperties; @Resource diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/handler/TenantInfoHandler.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/tenant/handler/TenantInfoHandler.java similarity index 74% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/handler/TenantInfoHandler.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/tenant/handler/TenantInfoHandler.java index 5b5b9fe30..bb1bf875d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/handler/TenantInfoHandler.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/tenant/handler/TenantInfoHandler.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.service.tenant.handler; +package cn.fuxiaoaio.ygg.module.system.service.tenant.handler; -import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.tenant.TenantDO; /** * 租户信息处理 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/handler/TenantMenuHandler.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/tenant/handler/TenantMenuHandler.java similarity index 87% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/handler/TenantMenuHandler.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/tenant/handler/TenantMenuHandler.java index 2e1be43c5..87dc3a1b0 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/handler/TenantMenuHandler.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/tenant/handler/TenantMenuHandler.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.service.tenant.handler; +package cn.fuxiaoaio.ygg.module.system.service.tenant.handler; import java.util.Set; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/user/AdminUserService.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/user/AdminUserService.java index e10b9e997..6609ed758 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/user/AdminUserService.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.system.service.user; +package cn.fuxiaoaio.ygg.module.system.service.user; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.*; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.user.*; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; import javax.validation.Valid; import java.io.InputStream; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/user/AdminUserServiceImpl.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/user/AdminUserServiceImpl.java index 74948bbf0..81256993b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/service/user/AdminUserServiceImpl.java @@ -1,28 +1,28 @@ -package cn.iocoder.yudao.module.system.service.user; +package cn.fuxiaoaio.ygg.module.system.service.user; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.exception.ServiceException; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.framework.datapermission.core.util.DataPermissionUtils; -import cn.iocoder.yudao.module.infra.api.file.FileApi; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.*; -import cn.iocoder.yudao.module.system.convert.user.UserConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.UserPostDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; -import cn.iocoder.yudao.module.system.dal.mysql.dept.UserPostMapper; -import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper; -import cn.iocoder.yudao.module.system.service.dept.DeptService; -import cn.iocoder.yudao.module.system.service.dept.PostService; -import cn.iocoder.yudao.module.system.service.permission.PermissionService; -import cn.iocoder.yudao.module.system.service.tenant.TenantService; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.exception.ServiceException; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.framework.datapermission.core.util.DataPermissionUtils; +import cn.fuxiaoaio.ygg.module.infra.api.file.FileApi; +import cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.user.*; +import cn.fuxiaoaio.ygg.module.system.convert.user.UserConvert; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.DeptDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.UserPostDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.dept.UserPostMapper; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.user.AdminUserMapper; +import cn.fuxiaoaio.ygg.module.system.service.dept.DeptService; +import cn.fuxiaoaio.ygg.module.system.service.dept.PostService; +import cn.fuxiaoaio.ygg.module.system.service.permission.PermissionService; +import cn.fuxiaoaio.ygg.module.system.service.tenant.TenantService; import com.google.common.annotations.VisibleForTesting; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -36,10 +36,10 @@ import java.io.InputStream; import java.time.LocalDateTime; import java.util.*; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.convertList; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils.convertSet; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; /** * 后台用户 Service 实现类 @@ -50,7 +50,7 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; @Slf4j public class AdminUserServiceImpl implements AdminUserService { - @Value("${sys.user.init-password:yudaoyuanma}") + @Value("${sys.user.init-password:fuxiaoaioyuanma}") private String userInitPassword; @Resource diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/util/collection/SimpleTrie.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/util/collection/SimpleTrie.java similarity index 98% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/util/collection/SimpleTrie.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/util/collection/SimpleTrie.java index 817eee355..6988493fb 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/util/collection/SimpleTrie.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/util/collection/SimpleTrie.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.util.collection; +package cn.fuxiaoaio.ygg.module.system.util.collection; import cn.hutool.core.collection.CollUtil; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/util/oauth2/OAuth2Utils.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/util/oauth2/OAuth2Utils.java similarity index 95% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/util/oauth2/OAuth2Utils.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/util/oauth2/OAuth2Utils.java index 2a6a46ff3..c7a8f7f6c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/util/oauth2/OAuth2Utils.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/util/oauth2/OAuth2Utils.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.util.oauth2; +package cn.fuxiaoaio.ygg.module.system.util.oauth2; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.util.http.HttpUtils; -import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; +import cn.fuxiaoaio.ygg.framework.common.util.http.HttpUtils; +import cn.fuxiaoaio.ygg.framework.security.core.util.SecurityFrameworkUtils; import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/util/package-info.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/util/package-info.java similarity index 63% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/util/package-info.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/util/package-info.java index 97ca1f1a6..17507653b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/util/package-info.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/java/cn/fuxiaoaio/ygg/module/system/util/package-info.java @@ -1,4 +1,4 @@ /** * 每个模块的 util 包，放专属当前模块的 Utils 工具类 */ -package cn.iocoder.yudao.module.system.util; +package cn.fuxiaoaio.ygg.module.system.util; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/application-dev.yaml b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/application-dev.yaml similarity index 85% rename from yudao-module-system/yudao-module-system-biz/src/main/resources/application-dev.yaml rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/application-dev.yaml index 250bf69d0..c88a0b941 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/application-dev.yaml +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/application-dev.yaml @@ -39,21 +39,21 @@ spring: primary: master datasource: master: - name: ruoyi-vue-pro - url: jdbc:mysql://400-infra.server.iocoder.cn:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true - driver-class-name: com.mysql.jdbc.Driver + name: FUXIAOAIO-CLOUD + url: jdbc:mysql://101.43.138.73:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true + driver-class-name: com.mariadb.jdbc.Driver username: root - password: 3WLiVUBEwTbvAfsh - slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改 - name: ruoyi-vue-pro - url: jdbc:mysql://400-infra.server.iocoder.cn:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true - driver-class-name: com.mysql.jdbc.Driver - username: root - password: 3WLiVUBEwTbvAfsh + password: 1233Newobject +# slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改 +# name: FUXIAOAIO-CLOUD +# url: jdbc:mysql://101.43.138.73:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT&nullCatalogMeansCurrent=true +# driver-class-name: com.mariadb.jdbc.Driver +# username: root +# password: 1233Newobject # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 redis: - host: 400-infra.server.iocoder.cn # 地址 + host: 101.43.138.73 # 地址 port: 6379 # 端口 database: 1 # 数据库索引 # password: 123456 # 密码，建议生产环境开启 @@ -116,7 +116,7 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta --- #################### 芋道相关配置 #################### # 芋道配置项，设置当前项目所有自定义的配置 -yudao: +fuxiaoaio: xss: enable: false exclude-urls: # 如下两个 url，仅仅是为了演示，去掉配置也没关系 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/application-local.yaml b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/application-local.yaml similarity index 98% rename from yudao-module-system/yudao-module-system-biz/src/main/resources/application-local.yaml rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/application-local.yaml index bc7087215..4c7d50de1 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/application-local.yaml +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/application-local.yaml @@ -39,7 +39,7 @@ spring: primary: master datasource: master: - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 @@ -50,7 +50,7 @@ spring: # username: sa # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W slave: # 模拟从库，可根据自己需要修改 - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 @@ -116,7 +116,7 @@ spring: logging: level: # 配置自己写的 MyBatis Mapper 打印日志 - cn.iocoder.yudao.module.system.dal.mysql: debug + cn.fuxiaoaio.ygg.module.system.dal.mysql: debug --- #################### 微信公众号相关配置 #################### wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档 @@ -133,7 +133,7 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta --- #################### 芋道相关配置 #################### # 芋道配置项，设置当前项目所有自定义的配置 -yudao: +fuxiaoaio: env: # 多环境的配置项 tag: ${HOSTNAME} captcha: diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/application.yaml b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/application.yaml similarity index 93% rename from yudao-module-system/yudao-module-system-biz/src/main/resources/application.yaml rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/application.yaml index cac51c174..d8ce6b7bb 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/application.yaml +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/application.yaml @@ -48,19 +48,19 @@ mybatis-plus: map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。 global-config: db-config: - # 重要说明：如果将配置放到 Nacos 时，请注意将 id-type 设置为对应 DB 的类型，否则会报错；详细见 https://gitee.com/zhijiantianya/yudao-cloud/issues/I5W2N0 讨论 + # 重要说明：如果将配置放到 Nacos 时，请注意将 id-type 设置为对应 DB 的类型，否则会报错；详细见 https://gitee.com/zhijiantianya/fuxiaoaio-cloud/issues/I5W2N0 讨论 id-type: NONE # “智能”模式，基于 IdTypeEnvironmentPostProcessor + 数据源的类型，自动适配成 AUTO、INPUT 模式。 # id-type: AUTO # 自增 ID，适合 MySQL 等直接自增的数据库 # id-type: INPUT # 用户输入 ID，适合 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库 # id-type: ASSIGN_ID # 分配 ID，默认使用雪花算法。注意，Oracle、PostgreSQL、Kingbase、DB2、H2 数据库时，需要去除实体类上的 @KeySequence 注解 logic-delete-value: 1 # 逻辑已删除值(默认为 1) logic-not-delete-value: 0 # 逻辑未删除值(默认为 0) - type-aliases-package: ${yudao.info.base-package}.dal.dataobject + type-aliases-package: ${fuxiaoaio.info.base-package}.dal.dataobject --- #################### RPC 远程调用相关配置 #################### dubbo: scan: - base-packages: ${yudao.info.base-package}.api # 指定 Dubbo 服务实现类的扫描基准包 + base-packages: ${fuxiaoaio.info.base-package}.api # 指定 Dubbo 服务实现类的扫描基准包 protocol: name: dubbo # 协议名称 port: -1 # 协议端口，-1 表示自增端口，从 20880 开始 @@ -133,23 +133,23 @@ aj: --- #################### 芋道相关配置 #################### -yudao: +fuxiaoaio: info: version: 1.0.0 - base-package: cn.iocoder.yudao.module.system + base-package: cn.fuxiaoaio.ygg.module.system web: admin-ui: - url: http://dashboard.yudao.iocoder.cn # Admin 管理后台 UI 的地址 + url: http://dashboard.fuxiaoaio.iocoder.cn # Admin 管理后台 UI 的地址 swagger: title: 管理后台 description: 提供管理员管理的所有功能 - version: ${yudao.info.version} - base-package: ${yudao.info.base-package} + version: ${fuxiaoaio.info.version} + base-package: ${fuxiaoaio.info.base-package} captcha: enable: true # 验证码的开关，默认为 true； error-code: # 错误码相关配置项 constants-class-list: - - cn.iocoder.yudao.module.system.enums.ErrorCodeConstants + - cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants tenant: # 多租户相关配置项 enable: true ignore-urls: diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/bootstrap-local.yaml b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/bootstrap-local.yaml similarity index 100% rename from yudao-module-system/yudao-module-system-biz/src/main/resources/bootstrap-local.yaml rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/bootstrap-local.yaml diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/bootstrap.yaml b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/bootstrap.yaml similarity index 95% rename from yudao-module-system/yudao-module-system-biz/src/main/resources/bootstrap.yaml rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/bootstrap.yaml index 273749c70..b97443e6e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/bootstrap.yaml +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/bootstrap.yaml @@ -3,7 +3,7 @@ spring: name: system-server profiles: - active: local + active: dev server: port: 48081 diff --git a/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/logback-spring.xml b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/logback-spring.xml new file mode 100644 index 000000000..509b469f8 --- /dev/null +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/main/resources/logback-spring.xml @@ -0,0 +1,76 @@ + + + + + + + + + + 　　　　　 + + + ${PATTERN_DEFAULT} + + + + + + + + + + ${PATTERN_DEFAULT} + + + + ${LOG_FILE} + + + ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz} + + ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false} + + ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB} + + ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0} + + ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30} + + + + + + 0 + + 256 + + + + + + + + ${PATTERN_DEFAULT} + + + + + + + + + + + + + + + + + + + + + + diff --git a/yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/job/SchedulerManagerTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test-integration/java/cn/fuxiaoaio/ygg/module/system/job/SchedulerManagerTest.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/job/SchedulerManagerTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test-integration/java/cn/fuxiaoaio/ygg/module/system/job/SchedulerManagerTest.java index 2d1d6f4c8..187932448 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/job/SchedulerManagerTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test-integration/java/cn/fuxiaoaio/ygg/module/system/job/SchedulerManagerTest.java @@ -1,9 +1,9 @@ -package cn.iocoder.yudao.module.system.job; +package cn.fuxiaoaio.ygg.module.system.job; import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.quartz.core.scheduler.SchedulerManager; -import cn.iocoder.yudao.module.system.job.auth.UserSessionTimeoutJob; -import cn.iocoder.yudao.module.system.test.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.framework.quartz.core.scheduler.SchedulerManager; +import cn.fuxiaoaio.ygg.module.system.job.auth.UserSessionTimeoutJob; +import cn.fuxiaoaio.ygg.module.system.test.BaseDbUnitTest; import org.junit.jupiter.api.Test; import org.quartz.SchedulerException; diff --git a/yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/mq/RedisStreamTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test-integration/java/cn/fuxiaoaio/ygg/module/system/mq/RedisStreamTest.java similarity index 78% rename from yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/mq/RedisStreamTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test-integration/java/cn/fuxiaoaio/ygg/module/system/mq/RedisStreamTest.java index c94316a81..9e39afb20 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/mq/RedisStreamTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test-integration/java/cn/fuxiaoaio/ygg/module/system/mq/RedisStreamTest.java @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.system.mq; +package cn.fuxiaoaio.ygg.module.system.mq; import cn.hutool.core.thread.ThreadUtil; -import cn.iocoder.yudao.framework.mq.core.RedisMQTemplate; -import cn.iocoder.yudao.module.system.mq.consumer.mail.MailSendConsumer; -import cn.iocoder.yudao.module.system.mq.consumer.sms.SmsSendConsumer; -import cn.iocoder.yudao.module.system.mq.message.mail.MailSendMessage; -import cn.iocoder.yudao.module.system.mq.message.sms.SmsSendMessage; -import cn.iocoder.yudao.module.system.test.BaseRedisIntegrationTest; +import cn.fuxiaoaio.ygg.framework.mq.core.RedisMQTemplate; +import cn.fuxiaoaio.ygg.module.system.mq.consumer.mail.MailSendConsumer; +import cn.fuxiaoaio.ygg.module.system.mq.consumer.sms.SmsSendConsumer; +import cn.fuxiaoaio.ygg.module.system.mq.message.mail.MailSendMessage; +import cn.fuxiaoaio.ygg.module.system.mq.message.sms.SmsSendMessage; +import cn.fuxiaoaio.ygg.module.system.test.BaseRedisIntegrationTest; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; diff --git a/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test-integration/java/cn/fuxiaoaio/ygg/module/system/service/package-info.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test-integration/java/cn/fuxiaoaio/ygg/module/system/service/package-info.java new file mode 100644 index 000000000..bfaca770a --- /dev/null +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test-integration/java/cn/fuxiaoaio/ygg/module/system/service/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package cn.fuxiaoaio.ygg.module.system.service; diff --git a/yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/service/sms/SmsServiceIntegrationTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test-integration/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsServiceIntegrationTest.java similarity index 75% rename from yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/service/sms/SmsServiceIntegrationTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test-integration/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsServiceIntegrationTest.java index a8e57ccb5..dbfefe6be 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/service/sms/SmsServiceIntegrationTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test-integration/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsServiceIntegrationTest.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.module.system.service.sms; +package cn.fuxiaoaio.ygg.module.system.service.sms; import cn.hutool.core.map.MapUtil; import cn.hutool.core.thread.ThreadUtil; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.sms.config.YudaoSmsAutoConfiguration; -import cn.iocoder.yudao.module.system.test.BaseDbAndRedisIntegrationTest; -import cn.iocoder.yudao.module.system.mq.consumer.sms.SmsSendConsumer; -import cn.iocoder.yudao.module.system.mq.producer.sms.SmsProducer; -import cn.iocoder.yudao.module.system.service.user.AdminUserService; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.sms.config.FuxiaoaioSmsAutoConfiguration; +import cn.fuxiaoaio.ygg.module.system.test.BaseDbAndRedisIntegrationTest; +import cn.fuxiaoaio.ygg.module.system.mq.consumer.sms.SmsSendConsumer; +import cn.fuxiaoaio.ygg.module.system.mq.producer.sms.SmsProducer; +import cn.fuxiaoaio.ygg.module.system.service.user.AdminUserService; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; @@ -17,7 +17,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; // TODO @芋艿：需要迁移 -@Import({YudaoSmsAutoConfiguration.class, +@Import({FuxiaoaioSmsAutoConfiguration.class, SmsChannelServiceImpl.class, SmsSendServiceImpl.class, SmsTemplateServiceImpl.class, SmsLogServiceImpl.class, SmsProducer.class, SmsSendConsumer.class}) public class SmsServiceIntegrationTest extends BaseDbAndRedisIntegrationTest { diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test-integration/java/cn/iocoder/yudao/module/infra/test/BaseDbAndRedisIntegrationTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test-integration/java/cn/fuxiaoaio/ygg/module/system/test/BaseDbAndRedisIntegrationTest.java similarity index 75% rename from yudao-module-infra/yudao-module-infra-biz/src/test-integration/java/cn/iocoder/yudao/module/infra/test/BaseDbAndRedisIntegrationTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test-integration/java/cn/fuxiaoaio/ygg/module/system/test/BaseDbAndRedisIntegrationTest.java index 803e412c9..c1fb91a17 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test-integration/java/cn/iocoder/yudao/module/infra/test/BaseDbAndRedisIntegrationTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test-integration/java/cn/fuxiaoaio/ygg/module/system/test/BaseDbAndRedisIntegrationTest.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.infra.test; +package cn.fuxiaoaio.ygg.module.system.test; -import cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration; -import cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration; -import cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration; +import cn.fuxiaoaio.ygg.framework.datasource.config.FuxiaoaioDataSourceAutoConfiguration; +import cn.fuxiaoaio.ygg.framework.mybatis.config.FuxiaoaioMybatisAutoConfiguration; +import cn.fuxiaoaio.ygg.framework.redis.config.FuxiaoaioRedisAutoConfiguration; import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration; import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration; import org.redisson.spring.starter.RedissonAutoConfiguration; @@ -20,16 +20,16 @@ public class BaseDbAndRedisIntegrationTest { @Import({ // DB 配置类 DynamicDataSourceAutoConfiguration.class, // Dynamic Datasource 配置类 - YudaoDataSourceAutoConfiguration.class, // 自己的 DB 配置类 + FuxiaoaioDataSourceAutoConfiguration.class, // 自己的 DB 配置类 DataSourceAutoConfiguration.class, // Spring DB 自动配置类 DataSourceTransactionManagerAutoConfiguration.class, // Spring 事务自动配置类 // MyBatis 配置类 - YudaoMybatisAutoConfiguration.class, // 自己的 MyBatis 配置类 + FuxiaoaioMybatisAutoConfiguration.class, // 自己的 MyBatis 配置类 MybatisPlusAutoConfiguration.class, // MyBatis 的自动配置类 // Redis 配置类 RedisAutoConfiguration.class, // Spring Redis 自动配置类 - YudaoRedisAutoConfiguration.class, // 自己的 Redis 配置类 + FuxiaoaioRedisAutoConfiguration.class, // 自己的 Redis 配置类 RedissonAutoConfiguration.class, // Redisson 自动高配置类 }) public static class Application { diff --git a/yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/test/BaseRedisIntegrationTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test-integration/java/cn/fuxiaoaio/ygg/module/system/test/BaseRedisIntegrationTest.java similarity index 80% rename from yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/test/BaseRedisIntegrationTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test-integration/java/cn/fuxiaoaio/ygg/module/system/test/BaseRedisIntegrationTest.java index f48b2891d..9081f1b01 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/test/BaseRedisIntegrationTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test-integration/java/cn/fuxiaoaio/ygg/module/system/test/BaseRedisIntegrationTest.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.system.test; +package cn.fuxiaoaio.ygg.module.system.test; -import cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration; +import cn.fuxiaoaio.ygg.framework.redis.config.FuxiaoaioRedisAutoConfiguration; import org.redisson.spring.starter.RedissonAutoConfiguration; import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; @@ -14,7 +14,7 @@ public class BaseRedisIntegrationTest { @Import({ // Redis 配置类 RedisAutoConfiguration.class, // Spring Redis 自动配置类 - YudaoRedisAutoConfiguration.class, // 自己的 Redis 配置类 + FuxiaoaioRedisAutoConfiguration.class, // 自己的 Redis 配置类 RedissonAutoConfiguration.class, // Redisson 自动高配置类 }) public static class Application { diff --git a/yudao-module-system/yudao-module-system-biz/src/test-integration/resources/application-integration-test.yaml b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test-integration/resources/application-integration-test.yaml similarity index 93% rename from yudao-module-system/yudao-module-system-biz/src/test-integration/resources/application-integration-test.yaml rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test-integration/resources/application-integration-test.yaml index d9612eee7..d136837cd 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test-integration/resources/application-integration-test.yaml +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test-integration/resources/application-integration-test.yaml @@ -45,15 +45,15 @@ spring: primary: master datasource: master: - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mariadb.jdbc.Driver username: root password: 123456 slave: # 模拟从库，可根据自己需要修改 - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mariadb.jdbc.Driver username: root password: 123456 @@ -89,7 +89,7 @@ resilience4j: --- #################### 芋道相关配置 #################### # 芋道配置项，设置当前项目所有自定义的配置 -yudao: +fuxiaoaio: security: token-header: Authorization token-secret: abcdefghijklmnopqrstuvwxyz @@ -100,7 +100,7 @@ yudao: swagger: enable: false # 单元测试，禁用 Swagger file: - base-path: http://127.0.0.1:${server.port}/${yudao.web.api-prefix}/file/get/ + base-path: http://127.0.0.1:${server.port}/${fuxiaoaio.web.api-prefix}/file/get/ xss: enable: false exclude-urls: # 如下两个 url，仅仅是为了演示，去掉配置也没关系 diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenControllerTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/OAuth2OpenControllerTest.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenControllerTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/OAuth2OpenControllerTest.java index cfadfc747..dddfd376c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenControllerTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/controller/admin/oauth2/OAuth2OpenControllerTest.java @@ -1,26 +1,26 @@ -package cn.iocoder.yudao.module.system.controller.admin.oauth2; +package cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.map.MapUtil; -import cn.iocoder.yudao.framework.common.core.KeyValue; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.common.exception.ErrorCode; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.collection.SetUtils; -import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; -import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.open.OAuth2OpenAccessTokenRespVO; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.open.OAuth2OpenAuthorizeInfoRespVO; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.open.OAuth2OpenCheckTokenRespVO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ApproveDO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ClientDO; -import cn.iocoder.yudao.module.system.enums.oauth2.OAuth2GrantTypeEnum; -import cn.iocoder.yudao.module.system.service.oauth2.OAuth2ApproveService; -import cn.iocoder.yudao.module.system.service.oauth2.OAuth2ClientService; -import cn.iocoder.yudao.module.system.service.oauth2.OAuth2GrantService; -import cn.iocoder.yudao.module.system.service.oauth2.OAuth2TokenService; +import cn.fuxiaoaio.ygg.framework.common.core.KeyValue; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.exception.ErrorCode; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.SetUtils; +import cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseMockitoUnitTest; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.open.OAuth2OpenAccessTokenRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.open.OAuth2OpenAuthorizeInfoRespVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.open.OAuth2OpenCheckTokenRespVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2ApproveDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2ClientDO; +import cn.fuxiaoaio.ygg.module.system.enums.oauth2.OAuth2GrantTypeEnum; +import cn.fuxiaoaio.ygg.module.system.service.oauth2.OAuth2ApproveService; +import cn.fuxiaoaio.ygg.module.system.service.oauth2.OAuth2ClientService; +import cn.fuxiaoaio.ygg.module.system.service.oauth2.OAuth2GrantService; +import cn.fuxiaoaio.ygg.module.system.service.oauth2.OAuth2TokenService; import org.assertj.core.util.Lists; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; @@ -33,11 +33,11 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; -import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -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.util.collection.SetUtils.asSet; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.randomPojo; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.randomString; import static java.util.Arrays.asList; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.eq; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/auth/AdminAuthServiceImplTest.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/auth/AdminAuthServiceImplTest.java index 9861b912c..8f694418a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/auth/AdminAuthServiceImplTest.java @@ -1,23 +1,23 @@ -package cn.iocoder.yudao.module.system.service.auth; +package cn.fuxiaoaio.ygg.module.system.service.auth; import cn.hutool.core.util.ReflectUtil; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.system.api.sms.SmsCodeApi; -import cn.iocoder.yudao.module.system.api.social.dto.SocialUserBindReqDTO; -import cn.iocoder.yudao.module.system.controller.admin.auth.vo.*; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; -import cn.iocoder.yudao.module.system.enums.logger.LoginLogTypeEnum; -import cn.iocoder.yudao.module.system.enums.logger.LoginResultEnum; -import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum; -import cn.iocoder.yudao.module.system.enums.social.SocialTypeEnum; -import cn.iocoder.yudao.module.system.service.logger.LoginLogService; -import cn.iocoder.yudao.module.system.service.member.MemberService; -import cn.iocoder.yudao.module.system.service.oauth2.OAuth2TokenService; -import cn.iocoder.yudao.module.system.service.social.SocialUserService; -import cn.iocoder.yudao.module.system.service.user.AdminUserService; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.system.api.sms.SmsCodeApi; +import cn.fuxiaoaio.ygg.module.system.api.social.dto.SocialUserBindReqDTO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.auth.vo.*; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.module.system.enums.logger.LoginLogTypeEnum; +import cn.fuxiaoaio.ygg.module.system.enums.logger.LoginResultEnum; +import cn.fuxiaoaio.ygg.module.system.enums.sms.SmsSceneEnum; +import cn.fuxiaoaio.ygg.module.system.enums.social.SocialTypeEnum; +import cn.fuxiaoaio.ygg.module.system.service.logger.LoginLogService; +import cn.fuxiaoaio.ygg.module.system.service.member.MemberService; +import cn.fuxiaoaio.ygg.module.system.service.oauth2.OAuth2TokenService; +import cn.fuxiaoaio.ygg.module.system.service.social.SocialUserService; +import cn.fuxiaoaio.ygg.module.system.service.user.AdminUserService; import com.xingyuv.captcha.model.common.ResponseModel; import com.xingyuv.captcha.service.CaptchaService; import org.junit.jupiter.api.BeforeEach; @@ -31,11 +31,11 @@ import javax.validation.Validation; import javax.validation.Validator; import static cn.hutool.core.util.RandomUtil.randomEle; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -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.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.randomPojo; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.randomString; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.eq; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/dept/DeptServiceImplTest.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/dept/DeptServiceImplTest.java index 3771fc33e..57a2f069e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/dept/DeptServiceImplTest.java @@ -1,17 +1,17 @@ -package cn.iocoder.yudao.module.system.service.dept; +package cn.fuxiaoaio.ygg.module.system.service.dept; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils; -import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; -import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; -import cn.iocoder.yudao.module.system.dal.mysql.dept.DeptMapper; -import cn.iocoder.yudao.module.system.enums.dept.DeptIdEnum; -import cn.iocoder.yudao.module.system.mq.producer.dept.DeptProducer; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.util.collection.ArrayUtils; +import cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils; +import cn.fuxiaoaio.ygg.framework.tenant.core.context.TenantContextHolder; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.dept.DeptCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.dept.DeptListReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.dept.DeptUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.DeptDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.dept.DeptMapper; +import cn.fuxiaoaio.ygg.module.system.enums.dept.DeptIdEnum; +import cn.fuxiaoaio.ygg.module.system.mq.producer.dept.DeptProducer; import com.google.common.collect.Multimap; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -25,10 +25,10 @@ import java.util.Map; import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomEle; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; import static java.util.Collections.singletonList; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.verify; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/dept/PostServiceImplTest.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/dept/PostServiceImplTest.java index 87c44b346..b17842e56 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/dept/PostServiceImplTest.java @@ -1,15 +1,15 @@ -package cn.iocoder.yudao.module.system.service.dept; +package cn.fuxiaoaio.ygg.module.system.service.dept; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO; -import cn.iocoder.yudao.module.system.dal.mysql.dept.PostMapper; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.ArrayUtils; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.post.PostCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.post.PostExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.post.PostPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dept.vo.post.PostUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.PostDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.dept.PostMapper; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; @@ -19,11 +19,11 @@ import java.util.List; import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomEle; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils.cloneIgnoreId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; import static java.util.Collections.singletonList; import static org.junit.jupiter.api.Assertions.*; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/dict/DictDataServiceImplTest.java similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/dict/DictDataServiceImplTest.java index 1e4dc9f90..fd0853455 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/dict/DictDataServiceImplTest.java @@ -1,16 +1,16 @@ -package cn.iocoder.yudao.module.system.service.dict; +package cn.fuxiaoaio.ygg.module.system.service.dict; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO; -import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictTypeDO; -import cn.iocoder.yudao.module.system.dal.mysql.dict.DictDataMapper; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.ArrayUtils; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.data.DictDataCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.data.DictDataExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.data.DictDataPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.data.DictDataUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dict.DictDataDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dict.DictTypeDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.dict.DictDataMapper; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; @@ -19,11 +19,11 @@ import javax.annotation.Resource; import java.util.List; import java.util.function.Consumer; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils.cloneIgnoreId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; import static java.util.Collections.singletonList; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.eq; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictTypeServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/dict/DictTypeServiceImplTest.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictTypeServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/dict/DictTypeServiceImplTest.java index fc9387019..ded60a803 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictTypeServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/dict/DictTypeServiceImplTest.java @@ -1,15 +1,15 @@ -package cn.iocoder.yudao.module.system.service.dict; +package cn.fuxiaoaio.ygg.module.system.service.dict; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypeCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypeExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypePageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypeUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictTypeDO; -import cn.iocoder.yudao.module.system.dal.mysql.dict.DictTypeMapper; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.ArrayUtils; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.type.DictTypeCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.type.DictTypeExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.type.DictTypePageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.dict.vo.type.DictTypeUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dict.DictTypeDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.dict.DictTypeMapper; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; @@ -19,13 +19,13 @@ import java.util.List; import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomEle; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildTime; +import static cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils.cloneIgnoreId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/errorcode/ErrorCodeServiceTest.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/errorcode/ErrorCodeServiceTest.java index cd5e01307..2c03642e2 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/errorcode/ErrorCodeServiceTest.java @@ -1,17 +1,17 @@ -package cn.iocoder.yudao.module.system.service.errorcode; +package cn.fuxiaoaio.ygg.module.system.service.errorcode; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeAutoGenerateReqDTO; -import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeRespDTO; -import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodePageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.errorcode.ErrorCodeDO; -import cn.iocoder.yudao.module.system.dal.mysql.errorcode.ErrorCodeMapper; -import cn.iocoder.yudao.module.system.enums.errorcode.ErrorCodeTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.ArrayUtils; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.system.api.errorcode.dto.ErrorCodeAutoGenerateReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.errorcode.dto.ErrorCodeRespDTO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode.vo.ErrorCodeCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode.vo.ErrorCodeExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode.vo.ErrorCodePageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.errorcode.vo.ErrorCodeUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.errorcode.ErrorCodeDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.errorcode.ErrorCodeMapper; +import cn.fuxiaoaio.ygg.module.system.enums.errorcode.ErrorCodeTypeEnum; import org.assertj.core.util.Lists; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; @@ -22,14 +22,14 @@ import java.util.List; import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomEle; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.ERROR_CODE_DUPLICATE; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.ERROR_CODE_NOT_EXISTS; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildTime; +import static cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils.cloneIgnoreId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.ERROR_CODE_DUPLICATE; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.ERROR_CODE_NOT_EXISTS; import static org.junit.jupiter.api.Assertions.*; @Import(ErrorCodeServiceImpl.class) diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/logger/LoginLogServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/logger/LoginLogServiceImplTest.java similarity index 80% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/logger/LoginLogServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/logger/LoginLogServiceImplTest.java index 66eebc0bd..f972fefb2 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/logger/LoginLogServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/logger/LoginLogServiceImplTest.java @@ -1,25 +1,25 @@ -package cn.iocoder.yudao.module.system.service.logger; +package cn.fuxiaoaio.ygg.module.system.service.logger; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.system.api.logger.dto.LoginLogCreateReqDTO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog.LoginLogExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog.LoginLogPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.logger.LoginLogDO; -import cn.iocoder.yudao.module.system.dal.mysql.logger.LoginLogMapper; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.system.api.logger.dto.LoginLogCreateReqDTO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.loginlog.LoginLogExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.loginlog.LoginLogPageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.logger.LoginLogDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.logger.LoginLogMapper; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; import javax.annotation.Resource; import java.util.List; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; -import static cn.iocoder.yudao.module.system.enums.logger.LoginResultEnum.CAPTCHA_CODE_ERROR; -import static cn.iocoder.yudao.module.system.enums.logger.LoginResultEnum.SUCCESS; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildTime; +import static cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils.cloneIgnoreId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.randomPojo; +import static cn.fuxiaoaio.ygg.module.system.enums.logger.LoginResultEnum.CAPTCHA_CODE_ERROR; +import static cn.fuxiaoaio.ygg.module.system.enums.logger.LoginResultEnum.SUCCESS; import static org.junit.jupiter.api.Assertions.assertEquals; @Import(LoginLogServiceImpl.class) diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/logger/OperateLogServiceImplTest.java similarity index 82% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/logger/OperateLogServiceImplTest.java index 14b007e25..686264acc 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/logger/OperateLogServiceImplTest.java @@ -1,20 +1,20 @@ -package cn.iocoder.yudao.module.system.service.logger; +package cn.fuxiaoaio.ygg.module.system.service.logger; import cn.hutool.core.map.MapUtil; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.framework.test.core.util.RandomUtils; -import cn.iocoder.yudao.module.system.api.logger.dto.OperateLogCreateReqDTO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.logger.OperateLogDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; -import cn.iocoder.yudao.module.system.dal.mysql.logger.OperateLogMapper; -import cn.iocoder.yudao.module.system.service.user.AdminUserService; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.operatelog.core.enums.OperateTypeEnum; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils; +import cn.fuxiaoaio.ygg.module.system.api.logger.dto.OperateLogCreateReqDTO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.operatelog.OperateLogExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.logger.OperateLogDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.logger.OperateLogMapper; +import cn.fuxiaoaio.ygg.module.system.service.user.AdminUserService; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; @@ -24,12 +24,12 @@ import java.util.Collections; import java.util.List; import static cn.hutool.core.util.RandomUtil.randomEle; -import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId; +import static cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildTime; +import static cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils.cloneIgnoreId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.randomLongId; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.when; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailAccountServiceImplTest.java old mode 100755 new mode 100644 similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailAccountServiceImplTest.java index a0e41f75c..b24b849e6 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailAccountServiceImplTest.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.module.system.service.mail; +package cn.fuxiaoaio.ygg.module.system.service.mail; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.account.MailAccountUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO; -import cn.iocoder.yudao.module.system.dal.mysql.mail.MailAccountMapper; -import cn.iocoder.yudao.module.system.mq.producer.mail.MailProducer; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.account.MailAccountCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.account.MailAccountUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailAccountDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.mail.MailAccountMapper; +import cn.fuxiaoaio.ygg.module.system.mq.producer.mail.MailProducer; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; @@ -16,11 +16,11 @@ import javax.annotation.Resource; import java.util.List; import java.util.Map; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_ACCOUNT_NOT_EXISTS; +import static cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils.cloneIgnoreId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.MAIL_ACCOUNT_NOT_EXISTS; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailLogServiceImplTest.java old mode 100755 new mode 100644 similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailLogServiceImplTest.java index 921438576..ca260547f --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailLogServiceImplTest.java @@ -1,15 +1,15 @@ -package cn.iocoder.yudao.module.system.service.mail; +package cn.fuxiaoaio.ygg.module.system.service.mail; import cn.hutool.core.map.MapUtil; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.log.MailLogPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailLogDO; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO; -import cn.iocoder.yudao.module.system.dal.mysql.mail.MailLogMapper; -import cn.iocoder.yudao.module.system.enums.mail.MailSendStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.log.MailLogPageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailAccountDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailLogDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailTemplateDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.mail.MailLogMapper; +import cn.fuxiaoaio.ygg.module.system.enums.mail.MailSendStatusEnum; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; @@ -17,11 +17,11 @@ import javax.annotation.Resource; import java.util.Map; import static cn.hutool.core.util.RandomUtil.randomEle; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils.buildLocalDateTime; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; +import static cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils.cloneIgnoreId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; import static org.junit.jupiter.api.Assertions.*; /** diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailSendServiceImplTest.java similarity index 93% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailSendServiceImplTest.java index 911e91c89..3191c6b70 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailSendServiceImplTest.java @@ -1,19 +1,19 @@ -package cn.iocoder.yudao.module.system.service.mail; +package cn.fuxiaoaio.ygg.module.system.service.mail; import cn.hutool.core.map.MapUtil; import cn.hutool.extra.mail.MailAccount; import cn.hutool.extra.mail.MailUtil; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; -import cn.iocoder.yudao.framework.test.core.util.RandomUtils; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; -import cn.iocoder.yudao.module.system.mq.message.mail.MailSendMessage; -import cn.iocoder.yudao.module.system.mq.producer.mail.MailProducer; -import cn.iocoder.yudao.module.system.service.member.MemberService; -import cn.iocoder.yudao.module.system.service.user.AdminUserService; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseMockitoUnitTest; +import cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailAccountDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailTemplateDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.module.system.mq.message.mail.MailSendMessage; +import cn.fuxiaoaio.ygg.module.system.mq.producer.mail.MailProducer; +import cn.fuxiaoaio.ygg.module.system.service.member.MemberService; +import cn.fuxiaoaio.ygg.module.system.service.user.AdminUserService; import org.assertj.core.util.Lists; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -25,9 +25,9 @@ import java.util.HashMap; import java.util.Map; import static cn.hutool.core.util.RandomUtil.randomEle; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.eq; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailTemplateServiceImplTest.java old mode 100755 new mode 100644 similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailTemplateServiceImplTest.java index 83f23e92e..5177a0e52 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/mail/MailTemplateServiceImplTest.java @@ -1,14 +1,14 @@ -package cn.iocoder.yudao.module.system.service.mail; +package cn.fuxiaoaio.ygg.module.system.service.mail; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.MailTemplateUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO; -import cn.iocoder.yudao.module.system.dal.mysql.mail.MailTemplateMapper; -import cn.iocoder.yudao.module.system.mq.producer.mail.MailProducer; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.template.MailTemplateCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.template.MailTemplatePageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.mail.vo.template.MailTemplateUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.mail.MailTemplateDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.mail.MailTemplateMapper; +import cn.fuxiaoaio.ygg.module.system.mq.producer.mail.MailProducer; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; @@ -18,14 +18,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.MAIL_TEMPLATE_NOT_EXISTS; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildTime; +import static cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils.cloneIgnoreId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.randomLongId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.randomPojo; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.MAIL_TEMPLATE_NOT_EXISTS; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.verify; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notice/NoticeServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/notice/NoticeServiceImplTest.java similarity index 80% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notice/NoticeServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/notice/NoticeServiceImplTest.java index b4727096a..7c82265c6 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notice/NoticeServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/notice/NoticeServiceImplTest.java @@ -1,24 +1,24 @@ -package cn.iocoder.yudao.module.system.service.notice; +package cn.fuxiaoaio.ygg.module.system.service.notice; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticeCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticePageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticeUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.notice.NoticeDO; -import cn.iocoder.yudao.module.system.dal.mysql.notice.NoticeMapper; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notice.vo.NoticeCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notice.vo.NoticePageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notice.vo.NoticeUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.notice.NoticeDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.notice.NoticeMapper; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; import javax.annotation.Resource; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.NOTICE_NOT_FOUND; +import static cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils.cloneIgnoreId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.randomLongId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.randomPojo; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.NOTICE_NOT_FOUND; import static org.junit.jupiter.api.Assertions.*; @Import(NoticeServiceImpl.class) diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifyMessageServiceImplTest.java similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifyMessageServiceImplTest.java index 9e2158da1..86a886ff6 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifyMessageServiceImplTest.java @@ -1,15 +1,15 @@ -package cn.iocoder.yudao.module.system.service.notify; +package cn.fuxiaoaio.ygg.module.system.service.notify; import cn.hutool.core.map.MapUtil; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.enums.SqlConstants; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageMyPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO; -import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO; -import cn.iocoder.yudao.module.system.dal.mysql.notify.NotifyMessageMapper; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.mybatis.core.enums.SqlConstants; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.message.NotifyMessageMyPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.notify.NotifyMessageDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.notify.NotifyTemplateDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.notify.NotifyMessageMapper; import com.baomidou.mybatisplus.annotation.DbType; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; @@ -21,11 +21,11 @@ import java.util.List; import java.util.Map; import static cn.hutool.core.util.RandomUtil.randomEle; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildTime; +import static cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils.cloneIgnoreId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; import static org.junit.jupiter.api.Assertions.*; /** diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifySendServiceImplTest.java similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifySendServiceImplTest.java index 7c5078330..81510485b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifySendServiceImplTest.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.service.notify; +package cn.fuxiaoaio.ygg.module.system.service.notify; import cn.hutool.core.map.MapUtil; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; -import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseMockitoUnitTest; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.notify.NotifyTemplateDO; import org.assertj.core.util.Lists; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; @@ -14,10 +14,10 @@ import java.util.HashMap; import java.util.Map; import static cn.hutool.core.util.RandomUtil.randomEle; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.NOTICE_NOT_FOUND; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.NOTIFY_SEND_TEMPLATE_PARAM_MISS; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.NOTICE_NOT_FOUND; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.NOTIFY_SEND_TEMPLATE_PARAM_MISS; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.ArgumentMatchers.eq; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifyTemplateServiceImplTest.java similarity index 86% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifyTemplateServiceImplTest.java index 28f6f9a38..763c68c6b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/notify/NotifyTemplateServiceImplTest.java @@ -1,14 +1,14 @@ -package cn.iocoder.yudao.module.system.service.notify; +package cn.fuxiaoaio.ygg.module.system.service.notify; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplatePageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.notify.vo.template.NotifyTemplateUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO; -import cn.iocoder.yudao.module.system.dal.mysql.notify.NotifyTemplateMapper; -import cn.iocoder.yudao.module.system.mq.producer.notify.NotifyProducer; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.template.NotifyTemplateCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.template.NotifyTemplatePageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.notify.vo.template.NotifyTemplateUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.notify.NotifyTemplateDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.notify.NotifyTemplateMapper; +import cn.fuxiaoaio.ygg.module.system.mq.producer.notify.NotifyProducer; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; @@ -17,13 +17,13 @@ import javax.annotation.Resource; import java.util.HashMap; import java.util.Map; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.NOTIFY_TEMPLATE_NOT_EXISTS; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildTime; +import static cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils.cloneIgnoreId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.NOTIFY_TEMPLATE_NOT_EXISTS; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.verify; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java similarity index 94% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java index 1ca22a999..dbade872c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.module.system.service.oauth2; +package cn.fuxiaoaio.ygg.module.system.service.oauth2; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.util.ObjectUtil; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ApproveDO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ClientDO; -import cn.iocoder.yudao.module.system.dal.mysql.oauth2.OAuth2ApproveMapper; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2ApproveDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2ClientDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.oauth2.OAuth2ApproveMapper; import org.assertj.core.util.Lists; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; @@ -20,9 +20,9 @@ import java.time.temporal.ChronoUnit; import java.util.*; import static cn.hutool.core.util.RandomUtil.*; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.randomString; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2ClientServiceImplTest.java old mode 100755 new mode 100644 similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2ClientServiceImplTest.java index 3a671b0b9..0eda8b6f6 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2ClientServiceImplTest.java @@ -1,15 +1,15 @@ -package cn.iocoder.yudao.module.system.service.oauth2; +package cn.fuxiaoaio.ygg.module.system.service.oauth2; import cn.hutool.core.map.MapUtil; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.client.OAuth2ClientCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.client.OAuth2ClientPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.client.OAuth2ClientUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ClientDO; -import cn.iocoder.yudao.module.system.dal.mysql.oauth2.OAuth2ClientMapper; -import cn.iocoder.yudao.module.system.mq.producer.auth.OAuth2ClientProducer; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.client.OAuth2ClientCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.client.OAuth2ClientPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.client.OAuth2ClientUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2ClientDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.oauth2.OAuth2ClientMapper; +import cn.fuxiaoaio.ygg.module.system.mq.producer.auth.OAuth2ClientProducer; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; @@ -18,11 +18,11 @@ import javax.annotation.Resource; import java.util.Collections; import java.util.Map; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils.cloneIgnoreId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.verify; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2CodeServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2CodeServiceImplTest.java similarity index 82% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2CodeServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2CodeServiceImplTest.java index 2ed9c978f..4f459fcaa 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2CodeServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2CodeServiceImplTest.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.service.oauth2; +package cn.fuxiaoaio.ygg.module.system.service.oauth2; import cn.hutool.core.util.RandomUtil; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2CodeDO; -import cn.iocoder.yudao.module.system.dal.mysql.oauth2.OAuth2CodeMapper; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2CodeDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.oauth2.OAuth2CodeMapper; import org.assertj.core.util.Lists; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; @@ -14,11 +14,11 @@ import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.List; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.OAUTH2_CODE_EXPIRE; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.OAUTH2_CODE_NOT_EXISTS; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.OAUTH2_CODE_EXPIRE; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.OAUTH2_CODE_NOT_EXISTS; import static org.junit.jupiter.api.Assertions.*; /** diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2GrantServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2GrantServiceImplTest.java similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2GrantServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2GrantServiceImplTest.java index 52c722831..1238296bd 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2GrantServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2GrantServiceImplTest.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.system.service.oauth2; +package cn.fuxiaoaio.ygg.module.system.service.oauth2; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2CodeDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; -import cn.iocoder.yudao.module.system.service.auth.AdminAuthService; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseMockitoUnitTest; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2CodeDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.module.system.service.auth.AdminAuthService; import com.google.common.collect.Lists; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; @@ -14,8 +14,8 @@ import org.mockito.Mock; import java.util.List; import static cn.hutool.core.util.RandomUtil.randomEle; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; import static java.util.Collections.emptyList; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.eq; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2TokenServiceImplTest.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2TokenServiceImplTest.java index e4cc7a0ad..682038ad8 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/oauth2/OAuth2TokenServiceImplTest.java @@ -1,20 +1,20 @@ -package cn.iocoder.yudao.module.system.service.oauth2; +package cn.fuxiaoaio.ygg.module.system.service.oauth2; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.util.RandomUtil; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.common.exception.ErrorCode; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.date.DateUtils; -import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbAndRedisUnitTest; -import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.token.OAuth2AccessTokenPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ClientDO; -import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2RefreshTokenDO; -import cn.iocoder.yudao.module.system.dal.mysql.oauth2.OAuth2AccessTokenMapper; -import cn.iocoder.yudao.module.system.dal.mysql.oauth2.OAuth2RefreshTokenMapper; -import cn.iocoder.yudao.module.system.dal.redis.oauth2.OAuth2AccessTokenRedisDAO; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.exception.ErrorCode; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.date.DateUtils; +import cn.fuxiaoaio.ygg.framework.tenant.core.context.TenantContextHolder; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbAndRedisUnitTest; +import cn.fuxiaoaio.ygg.module.system.controller.admin.oauth2.vo.token.OAuth2AccessTokenPageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2ClientDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.oauth2.OAuth2RefreshTokenDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.oauth2.OAuth2AccessTokenMapper; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.oauth2.OAuth2RefreshTokenMapper; +import cn.fuxiaoaio.ygg.module.system.dal.redis.oauth2.OAuth2AccessTokenRedisDAO; import org.assertj.core.util.Lists; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; @@ -24,10 +24,10 @@ import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.List; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils.cloneIgnoreId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/permission/MenuServiceImplTest.java similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/permission/MenuServiceImplTest.java index d643c5501..998d89ac5 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/permission/MenuServiceImplTest.java @@ -1,15 +1,15 @@ -package cn.iocoder.yudao.module.system.service.permission; +package cn.fuxiaoaio.ygg.module.system.service.permission; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuListReqVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO; -import cn.iocoder.yudao.module.system.dal.mysql.permission.MenuMapper; -import cn.iocoder.yudao.module.system.enums.permission.MenuTypeEnum; -import cn.iocoder.yudao.module.system.mq.producer.permission.MenuProducer; -import cn.iocoder.yudao.module.system.service.tenant.TenantService; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.menu.MenuCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.menu.MenuListReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.menu.MenuUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.MenuDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.permission.MenuMapper; +import cn.fuxiaoaio.ygg.module.system.enums.permission.MenuTypeEnum; +import cn.fuxiaoaio.ygg.module.system.mq.producer.permission.MenuProducer; +import cn.fuxiaoaio.ygg.module.system.service.tenant.TenantService; import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.Multimap; import org.junit.jupiter.api.Test; @@ -19,13 +19,13 @@ import org.springframework.context.annotation.Import; import javax.annotation.Resource; import java.util.*; -import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; -import static cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO.ID_ROOT; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.SetUtils.asSet; +import static cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils.cloneIgnoreId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.MenuDO.ID_ROOT; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/permission/PermissionServiceTest.java similarity index 94% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/permission/PermissionServiceTest.java index 35b250208..6d7953c9d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/permission/PermissionServiceTest.java @@ -1,22 +1,22 @@ -package cn.iocoder.yudao.module.system.service.permission; +package cn.fuxiaoaio.ygg.module.system.service.permission; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.map.MapUtil; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.system.api.permission.dto.DeptDataPermissionRespDTO; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleMenuDO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.UserRoleDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; -import cn.iocoder.yudao.module.system.dal.mysql.permission.RoleMenuMapper; -import cn.iocoder.yudao.module.system.dal.mysql.permission.UserRoleMapper; -import cn.iocoder.yudao.module.system.enums.permission.DataScopeEnum; -import cn.iocoder.yudao.module.system.mq.producer.permission.PermissionProducer; -import cn.iocoder.yudao.module.system.service.dept.DeptService; -import cn.iocoder.yudao.module.system.service.user.AdminUserService; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.system.api.permission.dto.DeptDataPermissionRespDTO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.DeptDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.MenuDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.RoleDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.RoleMenuDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.UserRoleDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.permission.RoleMenuMapper; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.permission.UserRoleMapper; +import cn.fuxiaoaio.ygg.module.system.enums.permission.DataScopeEnum; +import cn.fuxiaoaio.ygg.module.system.mq.producer.permission.PermissionProducer; +import cn.fuxiaoaio.ygg.module.system.service.dept.DeptService; +import cn.fuxiaoaio.ygg.module.system.service.user.AdminUserService; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; import org.junit.jupiter.api.Test; @@ -29,9 +29,9 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.SetUtils.asSet; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; import static java.util.Arrays.asList; import static java.util.Collections.singleton; import static java.util.Collections.singletonList; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/permission/RoleServiceImplTest.java similarity index 91% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/permission/RoleServiceImplTest.java index a114556c4..ce964b013 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/permission/RoleServiceImplTest.java @@ -1,17 +1,17 @@ -package cn.iocoder.yudao.module.system.service.permission; +package cn.fuxiaoaio.ygg.module.system.service.permission; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RolePageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; -import cn.iocoder.yudao.module.system.dal.mysql.permission.RoleMapper; -import cn.iocoder.yudao.module.system.enums.permission.DataScopeEnum; -import cn.iocoder.yudao.module.system.enums.permission.RoleTypeEnum; -import cn.iocoder.yudao.module.system.mq.producer.permission.RoleProducer; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role.RoleCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role.RoleExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role.RolePageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.permission.vo.role.RoleUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.RoleDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.permission.RoleMapper; +import cn.fuxiaoaio.ygg.module.system.enums.permission.DataScopeEnum; +import cn.fuxiaoaio.ygg.module.system.enums.permission.RoleTypeEnum; +import cn.fuxiaoaio.ygg.module.system.mq.producer.permission.RoleProducer; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; @@ -23,13 +23,13 @@ import java.util.Map; import java.util.Set; import static cn.hutool.core.util.RandomUtil.randomEle; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildTime; +import static cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils.cloneIgnoreId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; import static java.util.Collections.singleton; import static java.util.Collections.singletonList; import static org.junit.jupiter.api.Assertions.*; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/sensitiveword/SensitiveWordServiceImplTest.java similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/sensitiveword/SensitiveWordServiceImplTest.java index 141236987..e1f704c9f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/sensitiveword/SensitiveWordServiceImplTest.java @@ -1,16 +1,16 @@ -package cn.iocoder.yudao.module.system.service.sensitiveword; +package cn.fuxiaoaio.ygg.module.system.service.sensitiveword; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.SetUtils; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.SensitiveWordCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.SensitiveWordExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.SensitiveWordPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo.SensitiveWordUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.sensitiveword.SensitiveWordDO; -import cn.iocoder.yudao.module.system.dal.mysql.sensitiveword.SensitiveWordMapper; -import cn.iocoder.yudao.module.system.mq.producer.sensitiveword.SensitiveWordProducer; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.SetUtils; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword.vo.SensitiveWordCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword.vo.SensitiveWordExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword.vo.SensitiveWordPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sensitiveword.vo.SensitiveWordUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sensitiveword.SensitiveWordDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.sensitiveword.SensitiveWordMapper; +import cn.fuxiaoaio.ygg.module.system.mq.producer.sensitiveword.SensitiveWordProducer; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; @@ -19,14 +19,14 @@ import javax.annotation.Resource; import java.util.Arrays; import java.util.List; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.SENSITIVE_WORD_NOT_EXISTS; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildTime; +import static cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils.cloneIgnoreId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.randomLongId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.randomPojo; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.SENSITIVE_WORD_NOT_EXISTS; import static java.util.Collections.singletonList; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.verify; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsChannelServiceTest.java similarity index 86% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsChannelServiceTest.java index 11a51b7c6..a8cc84f9b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsChannelServiceTest.java @@ -1,15 +1,15 @@ -package cn.iocoder.yudao.module.system.service.sms; +package cn.fuxiaoaio.ygg.module.system.service.sms; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.sms.core.client.SmsClientFactory; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.channel.SmsChannelUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsChannelDO; -import cn.iocoder.yudao.module.system.dal.mysql.sms.SmsChannelMapper; -import cn.iocoder.yudao.module.system.mq.producer.sms.SmsProducer; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsClientFactory; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.channel.SmsChannelCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.channel.SmsChannelPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.channel.SmsChannelUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsChannelDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.sms.SmsChannelMapper; +import cn.fuxiaoaio.ygg.module.system.mq.producer.sms.SmsProducer; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; @@ -17,13 +17,13 @@ import org.springframework.context.annotation.Import; import javax.annotation.Resource; import java.util.List; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.SMS_CHANNEL_HAS_CHILDREN; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.SMS_CHANNEL_NOT_EXISTS; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildTime; +import static cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils.cloneIgnoreId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.*; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.SMS_CHANNEL_HAS_CHILDREN; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.SMS_CHANNEL_NOT_EXISTS; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsCodeServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsCodeServiceImplTest.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsCodeServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsCodeServiceImplTest.java index e50d025af..607ce9792 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsCodeServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsCodeServiceImplTest.java @@ -1,15 +1,15 @@ -package cn.iocoder.yudao.module.system.service.sms; +package cn.fuxiaoaio.ygg.module.system.service.sms; import cn.hutool.core.map.MapUtil; -import cn.iocoder.yudao.framework.mybatis.core.enums.SqlConstants; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeSendReqDTO; -import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeUseReqDTO; -import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeValidateReqDTO; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsCodeDO; -import cn.iocoder.yudao.module.system.dal.mysql.sms.SmsCodeMapper; -import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum; -import cn.iocoder.yudao.module.system.framework.sms.SmsCodeProperties; +import cn.fuxiaoaio.ygg.framework.mybatis.core.enums.SqlConstants; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.system.api.sms.dto.code.SmsCodeSendReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.sms.dto.code.SmsCodeUseReqDTO; +import cn.fuxiaoaio.ygg.module.system.api.sms.dto.code.SmsCodeValidateReqDTO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsCodeDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.sms.SmsCodeMapper; +import cn.fuxiaoaio.ygg.module.system.enums.sms.SmsSceneEnum; +import cn.fuxiaoaio.ygg.module.system.framework.sms.SmsCodeProperties; import com.baomidou.mybatisplus.annotation.DbType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -21,10 +21,10 @@ import java.time.Duration; import java.time.LocalDateTime; import static cn.hutool.core.util.RandomUtil.randomEle; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.randomPojo; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isNull; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsLogServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsLogServiceImplTest.java similarity index 89% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsLogServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsLogServiceImplTest.java index 2380ca09e..9a255fe43 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsLogServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsLogServiceImplTest.java @@ -1,19 +1,19 @@ -package cn.iocoder.yudao.module.system.service.sms; +package cn.fuxiaoaio.ygg.module.system.service.sms; import cn.hutool.core.map.MapUtil; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.log.SmsLogExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.log.SmsLogPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsLogDO; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO; -import cn.iocoder.yudao.module.system.dal.mysql.sms.SmsLogMapper; -import cn.iocoder.yudao.module.system.enums.sms.SmsReceiveStatusEnum; -import cn.iocoder.yudao.module.system.enums.sms.SmsSendStatusEnum; -import cn.iocoder.yudao.module.system.enums.sms.SmsTemplateTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.CommonResult; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.ArrayUtils; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.log.SmsLogExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.log.SmsLogPageReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsLogDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsTemplateDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.sms.SmsLogMapper; +import cn.fuxiaoaio.ygg.module.system.enums.sms.SmsReceiveStatusEnum; +import cn.fuxiaoaio.ygg.module.system.enums.sms.SmsSendStatusEnum; +import cn.fuxiaoaio.ygg.module.system.enums.sms.SmsTemplateTypeEnum; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; @@ -25,11 +25,11 @@ import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomBoolean; import static cn.hutool.core.util.RandomUtil.randomEle; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildTime; +import static cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils.cloneIgnoreId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsSendServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsSendServiceImplTest.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsSendServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsSendServiceImplTest.java index 8466526ca..0b41d276c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsSendServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsSendServiceImplTest.java @@ -1,22 +1,22 @@ -package cn.iocoder.yudao.module.system.service.sms; +package cn.fuxiaoaio.ygg.module.system.service.sms; import cn.hutool.core.map.MapUtil; -import cn.iocoder.yudao.framework.common.core.KeyValue; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.sms.core.client.SmsClient; -import cn.iocoder.yudao.framework.sms.core.client.SmsClientFactory; -import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsReceiveRespDTO; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO; -import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsChannelDO; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; -import cn.iocoder.yudao.module.system.mq.message.sms.SmsSendMessage; -import cn.iocoder.yudao.module.system.mq.producer.sms.SmsProducer; -import cn.iocoder.yudao.module.system.service.member.MemberService; -import cn.iocoder.yudao.module.system.service.user.AdminUserService; +import cn.fuxiaoaio.ygg.framework.common.core.KeyValue; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsClient; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsClientFactory; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsCommonResult; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsReceiveRespDTO; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsSendRespDTO; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseMockitoUnitTest; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsChannelDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsTemplateDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.module.system.mq.message.sms.SmsSendMessage; +import cn.fuxiaoaio.ygg.module.system.mq.producer.sms.SmsProducer; +import cn.fuxiaoaio.ygg.module.system.service.member.MemberService; +import cn.fuxiaoaio.ygg.module.system.service.user.AdminUserService; import org.assertj.core.util.Lists; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; @@ -27,9 +27,9 @@ import java.util.List; import java.util.Map; import static cn.hutool.core.util.RandomUtil.randomEle; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsTemplateServiceImplTest.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsTemplateServiceImplTest.java index 3b9b577a2..8ddc71ed9 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/sms/SmsTemplateServiceImplTest.java @@ -1,24 +1,24 @@ -package cn.iocoder.yudao.module.system.service.sms; +package cn.fuxiaoaio.ygg.module.system.service.sms; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils; -import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; -import cn.iocoder.yudao.framework.sms.core.client.SmsClient; -import cn.iocoder.yudao.framework.sms.core.client.SmsClientFactory; -import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult; -import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplateCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplateExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplatePageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.sms.vo.template.SmsTemplateUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsChannelDO; -import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO; -import cn.iocoder.yudao.module.system.dal.mysql.sms.SmsTemplateMapper; -import cn.iocoder.yudao.module.system.enums.sms.SmsTemplateTypeEnum; -import cn.iocoder.yudao.module.system.mq.producer.sms.SmsProducer; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.exception.enums.GlobalErrorCodeConstants; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.ArrayUtils; +import cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsClient; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsClientFactory; +import cn.fuxiaoaio.ygg.framework.sms.core.client.SmsCommonResult; +import cn.fuxiaoaio.ygg.framework.sms.core.client.dto.SmsTemplateRespDTO; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template.SmsTemplateCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template.SmsTemplateExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template.SmsTemplatePageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.sms.vo.template.SmsTemplateUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsChannelDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.sms.SmsTemplateDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.sms.SmsTemplateMapper; +import cn.fuxiaoaio.ygg.module.system.enums.sms.SmsTemplateTypeEnum; +import cn.fuxiaoaio.ygg.module.system.mq.producer.sms.SmsProducer; import com.google.common.collect.Lists; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; @@ -30,12 +30,12 @@ import java.util.Map; import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomEle; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildTime; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/social/SocialUserServiceImplTest.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/social/SocialUserServiceImplTest.java index 48f914a1a..4aa553d91 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/social/SocialUserServiceImplTest.java @@ -1,14 +1,14 @@ -package cn.iocoder.yudao.module.system.service.social; +package cn.fuxiaoaio.ygg.module.system.service.social; -import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.social.core.YudaoAuthRequestFactory; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbAndRedisUnitTest; -import cn.iocoder.yudao.module.system.api.social.dto.SocialUserBindReqDTO; -import cn.iocoder.yudao.module.system.dal.dataobject.social.SocialUserBindDO; -import cn.iocoder.yudao.module.system.dal.dataobject.social.SocialUserDO; -import cn.iocoder.yudao.module.system.dal.mysql.social.SocialUserBindMapper; -import cn.iocoder.yudao.module.system.dal.mysql.social.SocialUserMapper; -import cn.iocoder.yudao.module.system.enums.social.SocialTypeEnum; +import cn.fuxiaoaio.ygg.framework.common.enums.UserTypeEnum; +import cn.fuxiaoaio.ygg.framework.social.core.FuxiaoaioAuthRequestFactory; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbAndRedisUnitTest; +import cn.fuxiaoaio.ygg.module.system.api.social.dto.SocialUserBindReqDTO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.social.SocialUserBindDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.social.SocialUserDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.social.SocialUserBindMapper; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.social.SocialUserMapper; +import cn.fuxiaoaio.ygg.module.system.enums.social.SocialTypeEnum; import me.zhyd.oauth.enums.AuthResponseStatus; import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthResponse; @@ -25,12 +25,12 @@ import java.util.List; import static cn.hutool.core.util.RandomUtil.randomLong; import static cn.hutool.core.util.RandomUtil.randomString; -import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.SOCIAL_USER_AUTH_FAILURE; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.SOCIAL_USER_NOT_FOUND; +import static cn.fuxiaoaio.ygg.framework.common.util.json.JsonUtils.toJsonString; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.randomPojo; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.SOCIAL_USER_AUTH_FAILURE; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.SOCIAL_USER_NOT_FOUND; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.*; @@ -46,7 +46,7 @@ public class SocialUserServiceImplTest extends BaseDbAndRedisUnitTest { private SocialUserBindMapper socialUserBindMapper; @MockBean - private YudaoAuthRequestFactory authRequestFactory; + private FuxiaoaioAuthRequestFactory authRequestFactory; @Test public void testGetAuthorizeUrl() { diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/tenant/TenantPackageServiceImplTest.java old mode 100755 new mode 100644 similarity index 88% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/tenant/TenantPackageServiceImplTest.java index 1990b639e..13ccef98f --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/tenant/TenantPackageServiceImplTest.java @@ -1,14 +1,14 @@ -package cn.iocoder.yudao.module.system.service.tenant; +package cn.fuxiaoaio.ygg.module.system.service.tenant; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages.TenantPackageCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages.TenantPackagePageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages.TenantPackageUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantDO; -import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantPackageDO; -import cn.iocoder.yudao.module.system.dal.mysql.tenant.TenantPackageMapper; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.packages.TenantPackageCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.packages.TenantPackagePageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.packages.TenantPackageUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.tenant.TenantDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.tenant.TenantPackageDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.tenant.TenantPackageMapper; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; @@ -16,14 +16,14 @@ import org.springframework.context.annotation.Import; import javax.annotation.Resource; import java.util.List; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildTime; +import static cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils.cloneIgnoreId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.randomLongId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.randomPojo; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; import static java.util.Arrays.asList; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.eq; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/tenant/TenantServiceImplTest.java similarity index 90% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/tenant/TenantServiceImplTest.java index f181f177c..130a20cc2 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/tenant/TenantServiceImplTest.java @@ -1,27 +1,27 @@ -package cn.iocoder.yudao.module.system.service.tenant; +package cn.fuxiaoaio.ygg.module.system.service.tenant; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.tenant.config.TenantProperties; -import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantExportReqVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO; -import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; -import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantDO; -import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantPackageDO; -import cn.iocoder.yudao.module.system.dal.mysql.tenant.TenantMapper; -import cn.iocoder.yudao.module.system.enums.permission.RoleCodeEnum; -import cn.iocoder.yudao.module.system.enums.permission.RoleTypeEnum; -import cn.iocoder.yudao.module.system.service.permission.MenuService; -import cn.iocoder.yudao.module.system.service.permission.PermissionService; -import cn.iocoder.yudao.module.system.service.permission.RoleService; -import cn.iocoder.yudao.module.system.service.tenant.handler.TenantInfoHandler; -import cn.iocoder.yudao.module.system.service.tenant.handler.TenantMenuHandler; -import cn.iocoder.yudao.module.system.service.user.AdminUserService; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.tenant.config.TenantProperties; +import cn.fuxiaoaio.ygg.framework.tenant.core.context.TenantContextHolder; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.tenant.TenantCreateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.tenant.TenantExportReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.tenant.TenantPageReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.tenant.vo.tenant.TenantUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.MenuDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.permission.RoleDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.tenant.TenantDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.tenant.TenantPackageDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.tenant.TenantMapper; +import cn.fuxiaoaio.ygg.module.system.enums.permission.RoleCodeEnum; +import cn.fuxiaoaio.ygg.module.system.enums.permission.RoleTypeEnum; +import cn.fuxiaoaio.ygg.module.system.service.permission.MenuService; +import cn.fuxiaoaio.ygg.module.system.service.permission.PermissionService; +import cn.fuxiaoaio.ygg.module.system.service.permission.RoleService; +import cn.fuxiaoaio.ygg.module.system.service.tenant.handler.TenantInfoHandler; +import cn.fuxiaoaio.ygg.module.system.service.tenant.handler.TenantMenuHandler; +import cn.fuxiaoaio.ygg.module.system.service.user.AdminUserService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; @@ -33,14 +33,14 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; -import static cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantDO.PACKAGE_ID_SYSTEM; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.SetUtils.asSet; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildTime; +import static cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils.cloneIgnoreId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.module.system.dal.dataobject.tenant.TenantDO.PACKAGE_ID_SYSTEM; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; import static java.util.Arrays.asList; import static java.util.Collections.singleton; import static org.junit.jupiter.api.Assertions.*; diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/user/AdminUserServiceImplTest.java similarity index 92% rename from yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/user/AdminUserServiceImplTest.java index a5e0183a4..4f21e870a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/java/cn/fuxiaoaio/ygg/module/system/service/user/AdminUserServiceImplTest.java @@ -1,28 +1,28 @@ -package cn.iocoder.yudao.module.system.service.user; +package cn.fuxiaoaio.ygg.module.system.service.user; import cn.hutool.core.util.RandomUtil; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.exception.ServiceException; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.infra.api.file.FileApi; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.*; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO; -import cn.iocoder.yudao.module.system.dal.dataobject.dept.UserPostDO; -import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; -import cn.iocoder.yudao.module.system.dal.mysql.dept.UserPostMapper; -import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper; -import cn.iocoder.yudao.module.system.enums.common.SexEnum; -import cn.iocoder.yudao.module.system.service.dept.DeptService; -import cn.iocoder.yudao.module.system.service.dept.PostService; -import cn.iocoder.yudao.module.system.service.permission.PermissionService; -import cn.iocoder.yudao.module.system.service.tenant.TenantService; +import cn.fuxiaoaio.ygg.framework.common.enums.CommonStatusEnum; +import cn.fuxiaoaio.ygg.framework.common.exception.ServiceException; +import cn.fuxiaoaio.ygg.framework.common.pojo.PageResult; +import cn.fuxiaoaio.ygg.framework.common.util.collection.ArrayUtils; +import cn.fuxiaoaio.ygg.framework.common.util.collection.CollectionUtils; +import cn.fuxiaoaio.ygg.framework.test.core.ut.BaseDbUnitTest; +import cn.fuxiaoaio.ygg.module.infra.api.file.FileApi; +import cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO; +import cn.fuxiaoaio.ygg.module.system.controller.admin.user.vo.user.*; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.DeptDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.PostDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.dept.UserPostDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.tenant.TenantDO; +import cn.fuxiaoaio.ygg.module.system.dal.dataobject.user.AdminUserDO; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.dept.UserPostMapper; +import cn.fuxiaoaio.ygg.module.system.dal.mysql.user.AdminUserMapper; +import cn.fuxiaoaio.ygg.module.system.enums.common.SexEnum; +import cn.fuxiaoaio.ygg.module.system.service.dept.DeptService; +import cn.fuxiaoaio.ygg.module.system.service.dept.PostService; +import cn.fuxiaoaio.ygg.module.system.service.permission.PermissionService; +import cn.fuxiaoaio.ygg.module.system.service.tenant.TenantService; import org.junit.jupiter.api.Test; import org.mockito.stubbing.Answer; import org.springframework.boot.test.mock.mockito.MockBean; @@ -38,14 +38,14 @@ import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomBytes; import static cn.hutool.core.util.RandomUtil.randomEle; -import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; -import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; +import static cn.fuxiaoaio.ygg.framework.common.util.collection.SetUtils.asSet; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; +import static cn.fuxiaoaio.ygg.framework.common.util.date.LocalDateTimeUtils.buildTime; +import static cn.fuxiaoaio.ygg.framework.common.util.object.ObjectUtils.cloneIgnoreId; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertPojoEquals; +import static cn.fuxiaoaio.ygg.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.fuxiaoaio.ygg.framework.test.core.util.RandomUtils.*; +import static cn.fuxiaoaio.ygg.module.system.enums.ErrorCodeConstants.*; import static java.util.Collections.singleton; import static java.util.Collections.singletonList; import static org.assertj.core.util.Lists.newArrayList; @@ -105,14 +105,14 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest { })); when(postService.getPostList(eq(reqVO.getPostIds()), isNull())).thenReturn(posts); // mock passwordEncoder 的方法 - when(passwordEncoder.encode(eq(reqVO.getPassword()))).thenReturn("yudaoyuanma"); + when(passwordEncoder.encode(eq(reqVO.getPassword()))).thenReturn("fuxiaoaioyuanma"); // 调用 Long userId = userService.createUser(reqVO); // 断言 AdminUserDO user = userMapper.selectById(userId); assertPojoEquals(reqVO, user, "password"); - assertEquals("yudaoyuanma", user.getPassword()); + assertEquals("fuxiaoaioyuanma", user.getPassword()); assertEquals(CommonStatusEnum.ENABLE.getStatus(), user.getStatus()); // 断言关联岗位 List userPosts = userPostMapper.selectListByUserId(user.getId()); @@ -260,7 +260,7 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest { userMapper.insert(dbUser); // 准备参数 Long userId = dbUser.getId(); - String password = "yudao"; + String password = "fuxiaoaio"; // mock 方法 when(passwordEncoder.encode(anyString())).then( (Answer) invocationOnMock -> "encode:" + invocationOnMock.getArgument(0)); @@ -471,7 +471,7 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest { }); when(deptService.getDept(eq(dept.getId()))).thenReturn(dept); // mock passwordEncoder 的方法 - when(passwordEncoder.encode(eq("yudaoyuanma"))).thenReturn("java"); + when(passwordEncoder.encode(eq("fuxiaoaioyuanma"))).thenReturn("java"); // 调用 UserImportRespVO respVO = userService.importUserList(newArrayList(importUser), true); diff --git a/yudao-module-system/yudao-module-system-biz/src/test/resources/application-unit-test.yaml b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/resources/application-unit-test.yaml similarity index 95% rename from yudao-module-system/yudao-module-system-biz/src/test/resources/application-unit-test.yaml rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/resources/application-unit-test.yaml index 7a4abf1f8..cf263f401 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/resources/application-unit-test.yaml +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/resources/application-unit-test.yaml @@ -8,7 +8,7 @@ spring: spring: # 数据源配置项 datasource: - name: ruoyi-vue-pro + name: FUXIAOAIO-CLOUD url: jdbc:h2:mem:testdb;MODE=MYSQL;DATABASE_TO_UPPER=false;NON_KEYWORDS=value; # MODE 使用 MySQL 模式；DATABASE_TO_UPPER 配置表和字段使用小写 driver-class-name: org.h2.Driver username: sa @@ -49,9 +49,9 @@ mybatis-plus: --- #################### 芋道相关配置 #################### # 芋道配置项，设置当前项目所有自定义的配置 -yudao: +fuxiaoaio: info: - base-package: cn.iocoder.yudao.module + base-package: cn.fuxiaoaio.ygg.module captcha: timeout: 5m width: 160 diff --git a/yudao-module-system/yudao-module-system-biz/src/test/resources/logback.xml b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/resources/logback.xml similarity index 100% rename from yudao-module-system/yudao-module-system-biz/src/test/resources/logback.xml rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/resources/logback.xml diff --git a/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/clean.sql b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/resources/sql/clean.sql similarity index 100% rename from yudao-module-system/yudao-module-system-biz/src/test/resources/sql/clean.sql rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/resources/sql/clean.sql diff --git a/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/resources/sql/create_tables.sql similarity index 99% rename from yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql rename to fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/resources/sql/create_tables.sql index 4235f6348..eb6c85505 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/resources/sql/create_tables.sql +++ b/fuxiaoaio-module-system/fuxiaoaio-module-system-biz/src/test/resources/sql/create_tables.sql @@ -647,7 +647,7 @@ CREATE TABLE IF NOT EXISTS "system_mail_log" ( PRIMARY KEY ("id") ) COMMENT '邮件日志表'; --- 将该建表 SQL 语句，添加到 yudao-module-system-biz 模块的 test/resources/sql/create_tables.sql 文件里 +-- 将该建表 SQL 语句，添加到 fuxiaoaio-module-system-biz 模块的 test/resources/sql/create_tables.sql 文件里 CREATE TABLE IF NOT EXISTS "system_notify_template" ( "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, "name" varchar NOT NULL, diff --git a/yudao-module-system/pom.xml b/fuxiaoaio-module-system/pom.xml similarity index 72% rename from yudao-module-system/pom.xml rename to fuxiaoaio-module-system/pom.xml index f29db1d80..5482f2287 100644 --- a/yudao-module-system/pom.xml +++ b/fuxiaoaio-module-system/pom.xml @@ -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"> - cn.iocoder.cloud - yudao + cn.fuxiaoaio.ygg + fuxiaoaio ${revision} 4.0.0 - yudao-module-system-api - yudao-module-system-biz + fuxiaoaio-module-system-api + fuxiaoaio-module-system-biz - yudao-module-system + fuxiaoaio-module-system pom ${project.artifactId} diff --git a/pom.xml b/pom.xml index 425d30ef5..bef4b09a8 100644 --- a/pom.xml +++ b/pom.xml @@ -3,21 +3,21 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.iocoder.cloud - yudao + cn.fuxiaoaio.ygg + fuxiaoaio ${revision} pom - yudao-dependencies - yudao-gateway - yudao-framework + fuxiaoaio-dependencies + fuxiaoaio-gateway + fuxiaoaio-framework - - yudao-module-bpm - yudao-module-system - yudao-module-infra - - yudao-module-report + + fuxiaoaio-module-bpm + fuxiaoaio-module-system + fuxiaoaio-module-infra + + fuxiaoaio-module-report ${project.artifactId} @@ -42,8 +42,8 @@ - cn.iocoder.cloud - yudao-dependencies + cn.fuxiaoaio.ygg + fuxiaoaio-dependencies ${revision} pom import @@ -51,6 +51,19 @@ + + + maven-releases + http://101.43.138.73:8081/repository/maven-releases/ + + + + maven-snapshots + false + http://101.43.138.73:8081/repository/maven-snapshots/ + + + diff --git a/sql/dm/ruoyi-vue-pro-dm8.sql b/sql/dm/ruoyi-vue-pro-dm8.sql index 8275065b4..6a86dc97d 100644 --- a/sql/dm/ruoyi-vue-pro-dm8.sql +++ b/sql/dm/ruoyi-vue-pro-dm8.sql @@ -1164,12 +1164,12 @@ SET IDENTITY_INSERT "RUOYI_VUE_PRO"."INFRA_DATA_SOURCE_CONFIG" OFF; SET IDENTITY_INSERT "RUOYI_VUE_PRO"."INFRA_FILE" ON; SET IDENTITY_INSERT "RUOYI_VUE_PRO"."INFRA_FILE" OFF; SET IDENTITY_INSERT "RUOYI_VUE_PRO"."INFRA_FILE_CONFIG" ON; -INSERT INTO "RUOYI_VUE_PRO"."INFRA_FILE_CONFIG"("ID","NAME","STORAGE","REMARK","MASTER","CONFIG","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED") VALUES(4,'数据库',1,'我是数据库',1,'{"@class":"cn.iocoder.yudao.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}','1','2022-03-15 23:56:24','1','2023-04-08 09:44:47',0); -INSERT INTO "RUOYI_VUE_PRO"."INFRA_FILE_CONFIG"("ID","NAME","STORAGE","REMARK","MASTER","CONFIG","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED") VALUES(5,'本地磁盘',10,'测试下本地存储',0,'{"@class":"cn.iocoder.yudao.framework.file.core.client.local.LocalFileClientConfig","basePath":"/Users/yunai/file_test","domain":"http://127.0.0.1:48080"}','1','2022-03-15 23:57:00','1','2023-04-08 09:44:47',0); -INSERT INTO "RUOYI_VUE_PRO"."INFRA_FILE_CONFIG"("ID","NAME","STORAGE","REMARK","MASTER","CONFIG","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED") VALUES(11,'S3 - 七牛云',20,null,0,'{"@class":"cn.iocoder.yudao.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3-cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8","accessSecret":"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP"}','1','2022-03-19 18:00:03','1','2023-04-08 09:44:47',0); -INSERT INTO "RUOYI_VUE_PRO"."INFRA_FILE_CONFIG"("ID","NAME","STORAGE","REMARK","MASTER","CONFIG","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED") VALUES(15,'S3 - 七牛云',20,'',0,'{"@class":"cn.iocoder.yudao.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3-cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8","accessSecret":"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP"}','1','2022-06-10 20:50:41','1','2023-04-08 09:44:47',0); -INSERT INTO "RUOYI_VUE_PRO"."INFRA_FILE_CONFIG"("ID","NAME","STORAGE","REMARK","MASTER","CONFIG","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED") VALUES(16,'S3 - 七牛云',20,'',0,'{"@class":"cn.iocoder.yudao.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3-cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8","accessSecret":"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP"}','1','2022-06-11 20:32:08','1','2023-04-08 09:44:47',0); -INSERT INTO "RUOYI_VUE_PRO"."INFRA_FILE_CONFIG"("ID","NAME","STORAGE","REMARK","MASTER","CONFIG","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED") VALUES(17,'S3 - 七牛云',20,'',0,'{"@class":"cn.iocoder.yudao.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3-cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8","accessSecret":"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP"}','1','2022-06-11 20:32:47','1','2023-04-08 09:44:47',0); +INSERT INTO "RUOYI_VUE_PRO"."INFRA_FILE_CONFIG"("ID","NAME","STORAGE","REMARK","MASTER","CONFIG","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED") VALUES(4,'数据库',1,'我是数据库',1,'{"@class":"cn.fuxiaoaio.ygg.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}','1','2022-03-15 23:56:24','1','2023-04-08 09:44:47',0); +INSERT INTO "RUOYI_VUE_PRO"."INFRA_FILE_CONFIG"("ID","NAME","STORAGE","REMARK","MASTER","CONFIG","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED") VALUES(5,'本地磁盘',10,'测试下本地存储',0,'{"@class":"cn.fuxiaoaio.ygg.framework.file.core.client.local.LocalFileClientConfig","basePath":"/Users/yunai/file_test","domain":"http://127.0.0.1:48080"}','1','2022-03-15 23:57:00','1','2023-04-08 09:44:47',0); +INSERT INTO "RUOYI_VUE_PRO"."INFRA_FILE_CONFIG"("ID","NAME","STORAGE","REMARK","MASTER","CONFIG","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED") VALUES(11,'S3 - 七牛云',20,null,0,'{"@class":"cn.fuxiaoaio.ygg.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3-cn-south-1.qiniucs.com","domain":"http://test.fuxiaoaio.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8","accessSecret":"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP"}','1','2022-03-19 18:00:03','1','2023-04-08 09:44:47',0); +INSERT INTO "RUOYI_VUE_PRO"."INFRA_FILE_CONFIG"("ID","NAME","STORAGE","REMARK","MASTER","CONFIG","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED") VALUES(15,'S3 - 七牛云',20,'',0,'{"@class":"cn.fuxiaoaio.ygg.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3-cn-south-1.qiniucs.com","domain":"http://test.fuxiaoaio.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8","accessSecret":"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP"}','1','2022-06-10 20:50:41','1','2023-04-08 09:44:47',0); +INSERT INTO "RUOYI_VUE_PRO"."INFRA_FILE_CONFIG"("ID","NAME","STORAGE","REMARK","MASTER","CONFIG","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED") VALUES(16,'S3 - 七牛云',20,'',0,'{"@class":"cn.fuxiaoaio.ygg.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3-cn-south-1.qiniucs.com","domain":"http://test.fuxiaoaio.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8","accessSecret":"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP"}','1','2022-06-11 20:32:08','1','2023-04-08 09:44:47',0); +INSERT INTO "RUOYI_VUE_PRO"."INFRA_FILE_CONFIG"("ID","NAME","STORAGE","REMARK","MASTER","CONFIG","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED") VALUES(17,'S3 - 七牛云',20,'',0,'{"@class":"cn.fuxiaoaio.ygg.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3-cn-south-1.qiniucs.com","domain":"http://test.fuxiaoaio.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8","accessSecret":"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP"}','1','2022-06-11 20:32:47','1','2023-04-08 09:44:47',0); SET IDENTITY_INSERT "RUOYI_VUE_PRO"."INFRA_FILE_CONFIG" OFF; SET IDENTITY_INSERT "RUOYI_VUE_PRO"."INFRA_FILE_CONTENT" ON; @@ -1205,7 +1205,7 @@ SET IDENTITY_INSERT "RUOYI_VUE_PRO"."PAY_REFUND" ON; SET IDENTITY_INSERT "RUOYI_VUE_PRO"."PAY_REFUND" OFF; INSERT INTO "RUOYI_VUE_PRO"."QRTZ_CRON_TRIGGERS"("SCHED_NAME","TRIGGER_NAME","TRIGGER_GROUP","CRON_EXPRESSION","TIME_ZONE_ID") VALUES('schedulerName','payNotifyJob','DEFAULT','* * * * * ?','Asia/Shanghai'); -INSERT INTO "RUOYI_VUE_PRO"."QRTZ_JOB_DETAILS"("SCHED_NAME","JOB_NAME","JOB_GROUP","DESCRIPTION","JOB_CLASS_NAME","IS_DURABLE","IS_NONCONCURRENT","IS_UPDATE_DATA","REQUESTS_RECOVERY","JOB_DATA") VALUES('schedulerName','payNotifyJob','DEFAULT',null,'cn.iocoder.yudao.framework.quartz.core.handler.JobHandlerInvoker','0','1','1','0',0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B020000787000000000000000057400104A4F425F48414E444C45525F4E414D4574000C7061794E6F746966794A6F627800); +INSERT INTO "RUOYI_VUE_PRO"."QRTZ_JOB_DETAILS"("SCHED_NAME","JOB_NAME","JOB_GROUP","DESCRIPTION","JOB_CLASS_NAME","IS_DURABLE","IS_NONCONCURRENT","IS_UPDATE_DATA","REQUESTS_RECOVERY","JOB_DATA") VALUES('schedulerName','payNotifyJob','DEFAULT',null,'cn.fuxiaoaio.ygg.framework.quartz.core.handler.JobHandlerInvoker','0','1','1','0',0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B020000787000000000000000057400104A4F425F48414E444C45525F4E414D4574000C7061794E6F746966794A6F627800); INSERT INTO "RUOYI_VUE_PRO"."QRTZ_LOCKS"("SCHED_NAME","LOCK_NAME") VALUES('schedulerName','STATE_ACCESS'); INSERT INTO "RUOYI_VUE_PRO"."QRTZ_LOCKS"("SCHED_NAME","LOCK_NAME") VALUES('schedulerName','TRIGGER_ACCESS'); @@ -1907,7 +1907,7 @@ INSERT INTO "RUOYI_VUE_PRO"."SYSTEM_MENU"("ID","NAME","PERMISSION","TYPE","SORT" SET IDENTITY_INSERT "RUOYI_VUE_PRO"."SYSTEM_MENU" OFF; SET IDENTITY_INSERT "RUOYI_VUE_PRO"."SYSTEM_NOTICE" ON; INSERT INTO "RUOYI_VUE_PRO"."SYSTEM_NOTICE"("ID","TITLE","CONTENT","TYPE","STATUS","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED","TENANT_ID") VALUES(1,'芋道的公众','

新版本内容133

',1,0,'admin','2021-01-05 17:03:48','1','2022-05-04 21:00:20',0,1); -INSERT INTO "RUOYI_VUE_PRO"."SYSTEM_NOTICE"("ID","TITLE","CONTENT","TYPE","STATUS","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED","TENANT_ID") VALUES(2,'维护通知：2018-07-01 若依系统凌晨维护','

维护内容

',2,1,'admin','2021-01-05 17:03:48','1','2022-05-11 12:34:24',0,1); +INSERT INTO "RUOYI_VUE_PRO"."SYSTEM_NOTICE"("ID","TITLE","CONTENT","TYPE","STATUS","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED","TENANT_ID") VALUES(2,'维护通知：2018-07-01 若依系统凌晨维护','

维护内容

',2,1,'admin','2021-01-05 17:03:48','1','2022-05-11 12:34:24',0,1); INSERT INTO "RUOYI_VUE_PRO"."SYSTEM_NOTICE"("ID","TITLE","CONTENT","TYPE","STATUS","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED","TENANT_ID") VALUES(4,'我是测试标题','

哈哈哈哈123

',1,0,'110','2022-02-22 01:01:25','110','2022-02-22 01:01:46',0,121); SET IDENTITY_INSERT "RUOYI_VUE_PRO"."SYSTEM_NOTICE" OFF; @@ -3983,10 +3983,10 @@ SET IDENTITY_INSERT "RUOYI_VUE_PRO"."SYSTEM_OAUTH2_ACCESS_TOKEN" OFF; SET IDENTITY_INSERT "RUOYI_VUE_PRO"."SYSTEM_OAUTH2_APPROVE" ON; SET IDENTITY_INSERT "RUOYI_VUE_PRO"."SYSTEM_OAUTH2_APPROVE" OFF; SET IDENTITY_INSERT "RUOYI_VUE_PRO"."SYSTEM_OAUTH2_CLIENT" ON; -INSERT INTO "RUOYI_VUE_PRO"."SYSTEM_OAUTH2_CLIENT"("ID","CLIENT_ID","SECRET","NAME","LOGO","DESCRIPTION","STATUS","ACCESS_TOKEN_VALIDITY_SECONDS","REFRESH_TOKEN_VALIDITY_SECONDS","REDIRECT_URIS","AUTHORIZED_GRANT_TYPES","SCOPES","AUTO_APPROVE_SCOPES","AUTHORITIES","RESOURCE_IDS","ADDITIONAL_INFORMATION","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED") VALUES(1,'default','admin123','芋道源码','http://test.yudao.iocoder.cn/a5e2e244368878a366b516805a4aabf1.png','我是描述',0,1800,43200,'["https://www.iocoder.cn","https://doc.iocoder.cn"]','["password","authorization_code","implicit","refresh_token"]','["user.read","user.write"]','[]','["user.read","user.write"]','[]','{}','1','2022-05-11 21:47:12','1','2022-07-05 16:23:52',0); -INSERT INTO "RUOYI_VUE_PRO"."SYSTEM_OAUTH2_CLIENT"("ID","CLIENT_ID","SECRET","NAME","LOGO","DESCRIPTION","STATUS","ACCESS_TOKEN_VALIDITY_SECONDS","REFRESH_TOKEN_VALIDITY_SECONDS","REDIRECT_URIS","AUTHORIZED_GRANT_TYPES","SCOPES","AUTO_APPROVE_SCOPES","AUTHORITIES","RESOURCE_IDS","ADDITIONAL_INFORMATION","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED") VALUES(40,'test','test2','biubiu','http://test.yudao.iocoder.cn/277a899d573723f1fcdfb57340f00379.png',null,0,1800,43200,'["https://www.iocoder.cn"]','["password","authorization_code","implicit"]','["user_info","projects"]','["user_info"]','[]','[]','{}','1','2022-05-12 00:28:20','1','2022-06-19 00:26:13',0); -INSERT INTO "RUOYI_VUE_PRO"."SYSTEM_OAUTH2_CLIENT"("ID","CLIENT_ID","SECRET","NAME","LOGO","DESCRIPTION","STATUS","ACCESS_TOKEN_VALIDITY_SECONDS","REFRESH_TOKEN_VALIDITY_SECONDS","REDIRECT_URIS","AUTHORIZED_GRANT_TYPES","SCOPES","AUTO_APPROVE_SCOPES","AUTHORITIES","RESOURCE_IDS","ADDITIONAL_INFORMATION","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED") VALUES(41,'yudao-sso-demo-by-code','test','基于授权码模式，如何实现 SSO 单点登录？','http://test.yudao.iocoder.cn/fe4ed36596adad5120036ef61a6d0153654544d44af8dd4ad3ffe8f759933d6f.png',null,0,1800,43200,'["http://127.0.0.1:18080"]','["authorization_code","refresh_token"]','["user.read","user.write"]','[]','[]','[]',null,'1','2022-09-29 13:28:31','1','2022-09-29 13:28:31',0); -INSERT INTO "RUOYI_VUE_PRO"."SYSTEM_OAUTH2_CLIENT"("ID","CLIENT_ID","SECRET","NAME","LOGO","DESCRIPTION","STATUS","ACCESS_TOKEN_VALIDITY_SECONDS","REFRESH_TOKEN_VALIDITY_SECONDS","REDIRECT_URIS","AUTHORIZED_GRANT_TYPES","SCOPES","AUTO_APPROVE_SCOPES","AUTHORITIES","RESOURCE_IDS","ADDITIONAL_INFORMATION","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED") VALUES(42,'yudao-sso-demo-by-password','test','基于密码模式，如何实现 SSO 单点登录？','http://test.yudao.iocoder.cn/604bdc695e13b3b22745be704d1f2aa8ee05c5f26f9fead6d1ca49005afbc857.jpeg',null,0,1800,43200,'["http://127.0.0.1:18080"]','["password","refresh_token"]','["user.read","user.write"]','[]','[]','[]',null,'1','2022-10-04 17:40:16','1','2022-10-04 20:31:21',0); +INSERT INTO "RUOYI_VUE_PRO"."SYSTEM_OAUTH2_CLIENT"("ID","CLIENT_ID","SECRET","NAME","LOGO","DESCRIPTION","STATUS","ACCESS_TOKEN_VALIDITY_SECONDS","REFRESH_TOKEN_VALIDITY_SECONDS","REDIRECT_URIS","AUTHORIZED_GRANT_TYPES","SCOPES","AUTO_APPROVE_SCOPES","AUTHORITIES","RESOURCE_IDS","ADDITIONAL_INFORMATION","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED") VALUES(1,'default','admin123','芋道源码','http://test.fuxiaoaio.iocoder.cn/a5e2e244368878a366b516805a4aabf1.png','我是描述',0,1800,43200,'["https://www.iocoder.cn","https://doc.iocoder.cn"]','["password","authorization_code","implicit","refresh_token"]','["user.read","user.write"]','[]','["user.read","user.write"]','[]','{}','1','2022-05-11 21:47:12','1','2022-07-05 16:23:52',0); +INSERT INTO "RUOYI_VUE_PRO"."SYSTEM_OAUTH2_CLIENT"("ID","CLIENT_ID","SECRET","NAME","LOGO","DESCRIPTION","STATUS","ACCESS_TOKEN_VALIDITY_SECONDS","REFRESH_TOKEN_VALIDITY_SECONDS","REDIRECT_URIS","AUTHORIZED_GRANT_TYPES","SCOPES","AUTO_APPROVE_SCOPES","AUTHORITIES","RESOURCE_IDS","ADDITIONAL_INFORMATION","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED") VALUES(40,'test','test2','biubiu','http://test.fuxiaoaio.iocoder.cn/277a899d573723f1fcdfb57340f00379.png',null,0,1800,43200,'["https://www.iocoder.cn"]','["password","authorization_code","implicit"]','["user_info","projects"]','["user_info"]','[]','[]','{}','1','2022-05-12 00:28:20','1','2022-06-19 00:26:13',0); +INSERT INTO "RUOYI_VUE_PRO"."SYSTEM_OAUTH2_CLIENT"("ID","CLIENT_ID","SECRET","NAME","LOGO","DESCRIPTION","STATUS","ACCESS_TOKEN_VALIDITY_SECONDS","REFRESH_TOKEN_VALIDITY_SECONDS","REDIRECT_URIS","AUTHORIZED_GRANT_TYPES","SCOPES","AUTO_APPROVE_SCOPES","AUTHORITIES","RESOURCE_IDS","ADDITIONAL_INFORMATION","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED") VALUES(41,'fuxiaoaio-sso-demo-by-code','test','基于授权码模式，如何实现 SSO 单点登录？','http://test.fuxiaoaio.iocoder.cn/fe4ed36596adad5120036ef61a6d0153654544d44af8dd4ad3ffe8f759933d6f.png',null,0,1800,43200,'["http://127.0.0.1:18080"]','["authorization_code","refresh_token"]','["user.read","user.write"]','[]','[]','[]',null,'1','2022-09-29 13:28:31','1','2022-09-29 13:28:31',0); +INSERT INTO "RUOYI_VUE_PRO"."SYSTEM_OAUTH2_CLIENT"("ID","CLIENT_ID","SECRET","NAME","LOGO","DESCRIPTION","STATUS","ACCESS_TOKEN_VALIDITY_SECONDS","REFRESH_TOKEN_VALIDITY_SECONDS","REDIRECT_URIS","AUTHORIZED_GRANT_TYPES","SCOPES","AUTO_APPROVE_SCOPES","AUTHORITIES","RESOURCE_IDS","ADDITIONAL_INFORMATION","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED") VALUES(42,'fuxiaoaio-sso-demo-by-password','test','基于密码模式，如何实现 SSO 单点登录？','http://test.fuxiaoaio.iocoder.cn/604bdc695e13b3b22745be704d1f2aa8ee05c5f26f9fead6d1ca49005afbc857.jpeg',null,0,1800,43200,'["http://127.0.0.1:18080"]','["password","refresh_token"]','["user.read","user.write"]','[]','[]','[]',null,'1','2022-10-04 17:40:16','1','2022-10-04 20:31:21',0); SET IDENTITY_INSERT "RUOYI_VUE_PRO"."SYSTEM_OAUTH2_CLIENT" OFF; SET IDENTITY_INSERT "RUOYI_VUE_PRO"."SYSTEM_OAUTH2_CODE" ON; @@ -4868,8 +4868,8 @@ INSERT INTO "RUOYI_VUE_PRO"."SYSTEM_TENANT_PACKAGE"("ID","NAME","STATUS","REMARK SET IDENTITY_INSERT "RUOYI_VUE_PRO"."SYSTEM_TENANT_PACKAGE" OFF; SET IDENTITY_INSERT "RUOYI_VUE_PRO"."SYSTEM_USERS" ON; -INSERT INTO "RUOYI_VUE_PRO"."SYSTEM_USERS"("ID","USERNAME","PASSWORD","NICKNAME","REMARK","DEPT_ID","POST_IDS","EMAIL","MOBILE","SEX","AVATAR","STATUS","LOGIN_IP","LOGIN_DATE","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED","TENANT_ID") VALUES(1,'admin','$2a$10$mRMIYLDtRHlf6.9ipiqH1.Z.bh/R9dO9d5iHiGYPigi6r5KOoR2Wm','芋道源码','管理员',103,'[1]','aoteman@126.com','15612345678',1,'http://test.yudao.iocoder.cn/e1fdd7271685ec143a0900681606406621717a666ad0b2798b096df41422b32f.png',0,'0:0:0:0:0:0:0:1','2023-04-13 23:09:16','admin','2021-01-05 17:03:47',null,'2023-04-13 23:09:16',0,1); -INSERT INTO "RUOYI_VUE_PRO"."SYSTEM_USERS"("ID","USERNAME","PASSWORD","NICKNAME","REMARK","DEPT_ID","POST_IDS","EMAIL","MOBILE","SEX","AVATAR","STATUS","LOGIN_IP","LOGIN_DATE","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED","TENANT_ID") VALUES(100,'yudao','$2a$10$11U48RhyJ5pSBYWSn12AD./ld671.ycSzJHbyrtpeoMeYiw31eo8a','芋道','不要吓我',104,'[1]','yudao@iocoder.cn','15601691300',1,'',1,'127.0.0.1','2022-07-09 23:03:33','','2021-01-07 09:07:17',null,'2022-07-09 23:03:33',0,1); +INSERT INTO "RUOYI_VUE_PRO"."SYSTEM_USERS"("ID","USERNAME","PASSWORD","NICKNAME","REMARK","DEPT_ID","POST_IDS","EMAIL","MOBILE","SEX","AVATAR","STATUS","LOGIN_IP","LOGIN_DATE","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED","TENANT_ID") VALUES(1,'admin','$2a$10$mRMIYLDtRHlf6.9ipiqH1.Z.bh/R9dO9d5iHiGYPigi6r5KOoR2Wm','芋道源码','管理员',103,'[1]','aoteman@126.com','15612345678',1,'http://test.fuxiaoaio.iocoder.cn/e1fdd7271685ec143a0900681606406621717a666ad0b2798b096df41422b32f.png',0,'0:0:0:0:0:0:0:1','2023-04-13 23:09:16','admin','2021-01-05 17:03:47',null,'2023-04-13 23:09:16',0,1); +INSERT INTO "RUOYI_VUE_PRO"."SYSTEM_USERS"("ID","USERNAME","PASSWORD","NICKNAME","REMARK","DEPT_ID","POST_IDS","EMAIL","MOBILE","SEX","AVATAR","STATUS","LOGIN_IP","LOGIN_DATE","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED","TENANT_ID") VALUES(100,'fuxiaoaio','$2a$10$11U48RhyJ5pSBYWSn12AD./ld671.ycSzJHbyrtpeoMeYiw31eo8a','芋道','不要吓我',104,'[1]','fuxiaoaio@iocoder.cn','15601691300',1,'',1,'127.0.0.1','2022-07-09 23:03:33','','2021-01-07 09:07:17',null,'2022-07-09 23:03:33',0,1); INSERT INTO "RUOYI_VUE_PRO"."SYSTEM_USERS"("ID","USERNAME","PASSWORD","NICKNAME","REMARK","DEPT_ID","POST_IDS","EMAIL","MOBILE","SEX","AVATAR","STATUS","LOGIN_IP","LOGIN_DATE","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED","TENANT_ID") VALUES(103,'yuanma','$2a$10$YMpimV4T6BtDhIaA8jSW.u8UTGBeGhc/qwXP4oxoMr4mOw9.qttt6','源码',null,106,null,'yuanma@iocoder.cn','15601701300',0,'',0,'127.0.0.1','2022-07-08 01:26:27','','2021-01-13 23:50:35',null,'2022-07-08 01:26:27',0,1); INSERT INTO "RUOYI_VUE_PRO"."SYSTEM_USERS"("ID","USERNAME","PASSWORD","NICKNAME","REMARK","DEPT_ID","POST_IDS","EMAIL","MOBILE","SEX","AVATAR","STATUS","LOGIN_IP","LOGIN_DATE","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED","TENANT_ID") VALUES(104,'test','$2a$10$GP8zvqHB//TekuzYZSBYAuBQJiNq1.fxQVDYJ.uBCOnWCtDVKE4H6','测试号',null,107,'[1,2]','111@qq.com','15601691200',1,'',0,'127.0.0.1','2022-05-28 15:43:17','','2021-01-21 02:13:53',null,'2022-07-09 09:00:33',0,1); INSERT INTO "RUOYI_VUE_PRO"."SYSTEM_USERS"("ID","USERNAME","PASSWORD","NICKNAME","REMARK","DEPT_ID","POST_IDS","EMAIL","MOBILE","SEX","AVATAR","STATUS","LOGIN_IP","LOGIN_DATE","CREATOR","CREATE_TIME","UPDATER","UPDATE_TIME","DELETED","TENANT_ID") VALUES(107,'admin107','$2a$10$dYOOBKMO93v/.ReCqzyFg.o67Tqk.bbc2bhrpyBGkIw9aypCtr2pm','芋艿',null,null,null,'','15601691300',0,'',0,'',null,'1','2022-02-20 22:59:33','1','2022-02-27 08:26:51',0,118); diff --git a/sql/mysql/optional/go-view.sql b/sql/mysql/optional/go-view.sql index 210cff3f9..8b6ae1276 100644 --- a/sql/mysql/optional/go-view.sql +++ b/sql/mysql/optional/go-view.sql @@ -41,7 +41,7 @@ CREATE TABLE `report_go_view_project` ( -- Records of report_go_view_project -- ---------------------------- BEGIN; -INSERT INTO `report_go_view_project` (`id`, `name`, `pic_url`, `content`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (6, 'HTTP示例', 'http://test.yudao.iocoder.cn/7c0cb26b09cfa97cae0b3e5d19b210978eed0ab184dd0bff1b66b3daf70a01fc.png', '{\n \"editCanvasConfig\": {\n \"projectName\": \"HTTP示例\",\n \"width\": 1920,\n \"height\": 1080,\n \"filterShow\": false,\n \"hueRotate\": 0,\n \"saturate\": 1,\n \"contrast\": 1,\n \"brightness\": 1,\n \"opacity\": 1,\n \"rotateZ\": 0,\n \"rotateX\": 0,\n \"rotateY\": 0,\n \"skewX\": 0,\n \"skewY\": 0,\n \"blendMode\": \"normal\",\n \"background\": null,\n \"backgroundImage\": null,\n \"selectColor\": true,\n \"chartThemeColor\": \"dark\",\n \"chartThemeSetting\": {\n \"title\": {\n \"show\": true,\n \"textStyle\": {\n \"color\": \"#BFBFBF\",\n \"fontSize\": 18\n },\n \"subtextStyle\": {\n \"color\": \"#A2A2A2\",\n \"fontSize\": 14\n }\n },\n \"xAxis\": {\n \"show\": true,\n \"name\": \"\",\n \"nameGap\": 15,\n \"nameTextStyle\": {\n \"color\": \"#B9B8CE\",\n \"fontSize\": 12\n },\n \"inverse\": false,\n \"axisLabel\": {\n \"show\": true,\n \"fontSize\": 12,\n \"color\": \"#B9B8CE\",\n \"rotate\": 0\n },\n \"position\": \"bottom\",\n \"axisLine\": {\n \"show\": true,\n \"lineStyle\": {\n \"color\": \"#B9B8CE\",\n \"width\": 1\n },\n \"onZero\": true\n },\n \"axisTick\": {\n \"show\": true,\n \"length\": 5\n },\n \"splitLine\": {\n \"show\": false,\n \"lineStyle\": {\n \"color\": \"#484753\",\n \"width\": 1,\n \"type\": \"solid\"\n }\n }\n },\n \"yAxis\": {\n \"show\": true,\n \"name\": \"\",\n \"nameGap\": 15,\n \"nameTextStyle\": {\n \"color\": \"#B9B8CE\",\n \"fontSize\": 12\n },\n \"inverse\": false,\n \"axisLabel\": {\n \"show\": true,\n \"fontSize\": 12,\n \"color\": \"#B9B8CE\",\n \"rotate\": 0\n },\n \"position\": \"left\",\n \"axisLine\": {\n \"show\": true,\n \"lineStyle\": {\n \"color\": \"#B9B8CE\",\n \"width\": 1\n },\n \"onZero\": true\n },\n \"axisTick\": {\n \"show\": true,\n \"length\": 5\n },\n \"splitLine\": {\n \"show\": true,\n \"lineStyle\": {\n \"color\": \"#484753\",\n \"width\": 1,\n \"type\": \"solid\"\n }\n }\n },\n \"legend\": {\n \"show\": true,\n \"top\": \"5%\",\n \"textStyle\": {\n \"color\": \"#B9B8CE\"\n }\n },\n \"grid\": {\n \"show\": false,\n \"left\": \"10%\",\n \"top\": \"60\",\n \"right\": \"10%\",\n \"bottom\": \"60\"\n },\n \"dataset\": null\n },\n \"previewScaleType\": \"fit\"\n },\n \"componentList\": [\n {\n \"id\": \"4vxgys8nh6g000\",\n \"isGroup\": false,\n \"attr\": {\n \"x\": 7,\n \"y\": 11,\n \"w\": 1898,\n \"h\": 1066,\n \"offsetX\": 0,\n \"offsetY\": 0,\n \"zIndex\": -1\n },\n \"styles\": {\n \"filterShow\": false,\n \"hueRotate\": 0,\n \"saturate\": 1,\n \"contrast\": 1,\n \"brightness\": 1,\n \"opacity\": 1,\n \"rotateZ\": 0,\n \"rotateX\": 0,\n \"rotateY\": 0,\n \"skewX\": 0,\n \"skewY\": 0,\n \"blendMode\": \"normal\",\n \"animations\": []\n },\n \"status\": {\n \"lock\": false,\n \"hide\": false\n },\n \"request\": {\n \"requestDataType\": 1,\n \"requestHttpType\": \"get\",\n \"requestUrl\": \"http://127.0.0.1:48080/admin-api/report/go-view/data/get-by-http\",\n \"requestInterval\": null,\n \"requestIntervalUnit\": \"second\",\n \"requestContentType\": 0,\n \"requestParamsBodyType\": \"none\",\n \"requestSQLContent\": {\n \"sql\": \"select * from where\"\n },\n \"requestParams\": {\n \"Body\": {\n \"form-data\": {},\n \"x-www-form-urlencoded\": {},\n \"json\": \"\",\n \"xml\": \"\"\n },\n \"Header\": {},\n \"Params\": {}\n }\n },\n \"filter\": null,\n \"events\": {\n \"baseEvent\": {\n \"click\": null,\n \"dblclick\": null,\n \"mouseenter\": null,\n \"mouseleave\": null\n },\n \"advancedEvents\": {\n \"vnodeMounted\": null,\n \"vnodeBeforeMount\": null\n }\n },\n \"key\": \"LineCommon\",\n \"chartConfig\": {\n \"key\": \"LineCommon\",\n \"chartKey\": \"VLineCommon\",\n \"conKey\": \"VCLineCommon\",\n \"title\": \"折线图\",\n \"category\": \"Lines\",\n \"categoryName\": \"折线图\",\n \"package\": \"Charts\",\n \"chartFrame\": \"echarts\",\n \"image\": \"line.png\"\n },\n \"option\": {\n \"legend\": {\n \"show\": true,\n \"top\": \"5%\",\n \"textStyle\": {\n \"color\": \"#B9B8CE\"\n }\n },\n \"xAxis\": {\n \"show\": true,\n \"name\": \"\",\n \"nameGap\": 15,\n \"nameTextStyle\": {\n \"color\": \"#B9B8CE\",\n \"fontSize\": 12\n },\n \"inverse\": false,\n \"axisLabel\": {\n \"show\": true,\n \"fontSize\": 12,\n \"color\": \"#B9B8CE\",\n \"rotate\": 0\n },\n \"position\": \"bottom\",\n \"axisLine\": {\n \"show\": true,\n \"lineStyle\": {\n \"color\": \"#B9B8CE\",\n \"width\": 1\n },\n \"onZero\": true\n },\n \"axisTick\": {\n \"show\": true,\n \"length\": 5\n },\n \"splitLine\": {\n \"show\": false,\n \"lineStyle\": {\n \"color\": \"#484753\",\n \"width\": 1,\n \"type\": \"solid\"\n }\n },\n \"type\": \"category\"\n },\n \"yAxis\": {\n \"show\": true,\n \"name\": \"\",\n \"nameGap\": 15,\n \"nameTextStyle\": {\n \"color\": \"#B9B8CE\",\n \"fontSize\": 12\n },\n \"inverse\": false,\n \"axisLabel\": {\n \"show\": true,\n \"fontSize\": 12,\n \"color\": \"#B9B8CE\",\n \"rotate\": 0\n },\n \"position\": \"left\",\n \"axisLine\": {\n \"show\": true,\n \"lineStyle\": {\n \"color\": \"#B9B8CE\",\n \"width\": 1\n },\n \"onZero\": true\n },\n \"axisTick\": {\n \"show\": true,\n \"length\": 5\n },\n \"splitLine\": {\n \"show\": true,\n \"lineStyle\": {\n \"color\": \"#484753\",\n \"width\": 1,\n \"type\": \"solid\"\n }\n },\n \"type\": \"value\"\n },\n \"grid\": {\n \"show\": false,\n \"left\": \"10%\",\n \"top\": \"60\",\n \"right\": \"10%\",\n \"bottom\": \"60\"\n },\n \"tooltip\": {\n \"show\": true,\n \"trigger\": \"axis\",\n \"axisPointer\": {\n \"type\": \"line\"\n }\n },\n \"dataset\": {\n \"dimensions\": [\n \"日期\",\n \"PV\",\n \"UV\"\n ],\n \"source\": [\n {\n \"UV\": 518,\n \"日期\": \"2021-01\",\n \"PV\": 7954\n },\n {\n \"UV\": 135,\n \"日期\": \"2021-02\",\n \"PV\": 9402\n },\n {\n \"UV\": 905,\n \"日期\": \"2021-03\",\n \"PV\": 1665\n },\n {\n \"UV\": 157,\n \"日期\": \"2021-04\",\n \"PV\": 2633\n },\n {\n \"UV\": 849,\n \"日期\": \"2021-05\",\n \"PV\": 7650\n },\n {\n \"UV\": 563,\n \"日期\": \"2021-06\",\n \"PV\": 2399\n },\n {\n \"UV\": 427,\n \"日期\": \"2021-07\",\n \"PV\": 9952\n },\n {\n \"UV\": 158,\n \"日期\": \"2021-08\",\n \"PV\": 9232\n },\n {\n \"UV\": 894,\n \"日期\": \"2021-09\",\n \"PV\": 3013\n },\n {\n \"UV\": 343,\n \"日期\": \"2021-10\",\n \"PV\": 6181\n },\n {\n \"UV\": 294,\n \"日期\": \"2021-11\",\n \"PV\": 8949\n },\n {\n \"UV\": 452,\n \"日期\": \"2021-12\",\n \"PV\": 8730\n }\n ]\n },\n \"series\": [\n {\n \"type\": \"line\",\n \"label\": {\n \"show\": true,\n \"position\": \"top\",\n \"color\": \"#fff\",\n \"fontSize\": 12\n },\n \"symbolSize\": 5,\n \"itemStyle\": {\n \"color\": null,\n \"borderRadius\": 0\n },\n \"lineStyle\": {\n \"type\": \"solid\",\n \"width\": 3,\n \"color\": null\n }\n },\n {\n \"type\": \"line\",\n \"label\": {\n \"show\": true,\n \"position\": \"top\",\n \"color\": \"#fff\",\n \"fontSize\": 12\n },\n \"symbolSize\": 5,\n \"itemStyle\": {\n \"color\": null,\n \"borderRadius\": 0\n },\n \"lineStyle\": {\n \"type\": \"solid\",\n \"width\": 3,\n \"color\": null\n }\n }\n ],\n \"backgroundColor\": \"rgba(0,0,0,0)\"\n }\n }\n ],\n \"requestGlobalConfig\": {\n \"requestDataPond\": [],\n \"requestOriginUrl\": \"\",\n \"requestInterval\": 30,\n \"requestIntervalUnit\": \"second\",\n \"requestParams\": {\n \"Body\": {\n \"form-data\": {},\n \"x-www-form-urlencoded\": {},\n \"json\": \"\",\n \"xml\": \"\"\n },\n \"Header\": {},\n \"Params\": {}\n }\n }\n}', 0, NULL, '1', '2023-02-07 11:38:22', '1', '2023-02-07 17:27:43', b'0', 1), (7, 'SQL示例', 'http://test.yudao.iocoder.cn/c1f570bad6ec7e7fa4a0a7c8f563da4ea158fde6e731da4dd1abe8ba9b6baeed.png', '{\n \"editCanvasConfig\": {\n \"projectName\": \"SQL示例\",\n \"width\": 1920,\n \"height\": 1080,\n \"filterShow\": false,\n \"hueRotate\": 0,\n \"saturate\": 1,\n \"contrast\": 1,\n \"brightness\": 1,\n \"opacity\": 1,\n \"rotateZ\": 0,\n \"rotateX\": 0,\n \"rotateY\": 0,\n \"skewX\": 0,\n \"skewY\": 0,\n \"blendMode\": \"normal\",\n \"background\": null,\n \"backgroundImage\": null,\n \"selectColor\": true,\n \"chartThemeColor\": \"dark\",\n \"chartThemeSetting\": {\n \"title\": {\n \"show\": true,\n \"textStyle\": {\n \"color\": \"#BFBFBF\",\n \"fontSize\": 18\n },\n \"subtextStyle\": {\n \"color\": \"#A2A2A2\",\n \"fontSize\": 14\n }\n },\n \"xAxis\": {\n \"show\": true,\n \"name\": \"\",\n \"nameGap\": 15,\n \"nameTextStyle\": {\n \"color\": \"#B9B8CE\",\n \"fontSize\": 12\n },\n \"inverse\": false,\n \"axisLabel\": {\n \"show\": true,\n \"fontSize\": 12,\n \"color\": \"#B9B8CE\",\n \"rotate\": 0\n },\n \"position\": \"bottom\",\n \"axisLine\": {\n \"show\": true,\n \"lineStyle\": {\n \"color\": \"#B9B8CE\",\n \"width\": 1\n },\n \"onZero\": true\n },\n \"axisTick\": {\n \"show\": true,\n \"length\": 5\n },\n \"splitLine\": {\n \"show\": false,\n \"lineStyle\": {\n \"color\": \"#484753\",\n \"width\": 1,\n \"type\": \"solid\"\n }\n }\n },\n \"yAxis\": {\n \"show\": true,\n \"name\": \"\",\n \"nameGap\": 15,\n \"nameTextStyle\": {\n \"color\": \"#B9B8CE\",\n \"fontSize\": 12\n },\n \"inverse\": false,\n \"axisLabel\": {\n \"show\": true,\n \"fontSize\": 12,\n \"color\": \"#B9B8CE\",\n \"rotate\": 0\n },\n \"position\": \"left\",\n \"axisLine\": {\n \"show\": true,\n \"lineStyle\": {\n \"color\": \"#B9B8CE\",\n \"width\": 1\n },\n \"onZero\": true\n },\n \"axisTick\": {\n \"show\": true,\n \"length\": 5\n },\n \"splitLine\": {\n \"show\": true,\n \"lineStyle\": {\n \"color\": \"#484753\",\n \"width\": 1,\n \"type\": \"solid\"\n }\n }\n },\n \"legend\": {\n \"show\": true,\n \"top\": \"5%\",\n \"textStyle\": {\n \"color\": \"#B9B8CE\"\n }\n },\n \"grid\": {\n \"show\": false,\n \"left\": \"10%\",\n \"top\": \"60\",\n \"right\": \"10%\",\n \"bottom\": \"60\"\n },\n \"dataset\": null\n },\n \"previewScaleType\": \"fit\"\n },\n \"componentList\": [\n {\n \"id\": \"5cqrghfle9g000\",\n \"isGroup\": false,\n \"attr\": {\n \"x\": 27,\n \"y\": 3,\n \"w\": 1870,\n \"h\": 1051,\n \"offsetX\": 0,\n \"offsetY\": 0,\n \"zIndex\": -1\n },\n \"styles\": {\n \"filterShow\": false,\n \"hueRotate\": 0,\n \"saturate\": 1,\n \"contrast\": 1,\n \"brightness\": 1,\n \"opacity\": 1,\n \"rotateZ\": 0,\n \"rotateX\": 0,\n \"rotateY\": 0,\n \"skewX\": 0,\n \"skewY\": 0,\n \"blendMode\": \"normal\",\n \"animations\": [\n \"headShake\"\n ]\n },\n \"status\": {\n \"lock\": false,\n \"hide\": false\n },\n \"request\": {\n \"requestDataType\": 1,\n \"requestHttpType\": \"post\",\n \"requestUrl\": \"http://127.0.0.1:48080/admin-api/report/go-view/data/get-by-sql\",\n \"requestInterval\": null,\n \"requestIntervalUnit\": \"second\",\n \"requestContentType\": 0,\n \"requestParamsBodyType\": \"none\",\n \"requestSQLContent\": {\n \"sql\": \"SELECT DATE_FORMAT(create_time, \\\"%Y-%m\\\") AS time, COUNT(*) AS \'次数\', COUNT(DISTINCT(user_id)) AS \'人数\' FROM system_login_log GROUP BY DATE_FORMAT(create_time, \\\"%Y-%m\\\")\"\n },\n \"requestParams\": {\n \"Body\": {\n \"form-data\": {},\n \"x-www-form-urlencoded\": {},\n \"json\": \"\",\n \"xml\": \"\"\n },\n \"Header\": {},\n \"Params\": {}\n }\n },\n \"filter\": null,\n \"events\": {\n \"baseEvent\": {\n \"click\": null,\n \"dblclick\": null,\n \"mouseenter\": null,\n \"mouseleave\": null\n },\n \"advancedEvents\": {\n \"vnodeMounted\": null,\n \"vnodeBeforeMount\": null\n }\n },\n \"key\": \"LineCommon\",\n \"chartConfig\": {\n \"key\": \"LineCommon\",\n \"chartKey\": \"VLineCommon\",\n \"conKey\": \"VCLineCommon\",\n \"title\": \"折线图\",\n \"category\": \"Lines\",\n \"categoryName\": \"折线图\",\n \"package\": \"Charts\",\n \"chartFrame\": \"echarts\",\n \"image\": \"line.png\"\n },\n \"option\": {\n \"legend\": {\n \"show\": true,\n \"top\": \"5%\",\n \"textStyle\": {\n \"color\": \"#B9B8CE\"\n }\n },\n \"xAxis\": {\n \"show\": true,\n \"name\": \"\",\n \"nameGap\": 15,\n \"nameTextStyle\": {\n \"color\": \"#B9B8CE\",\n \"fontSize\": 12\n },\n \"inverse\": false,\n \"axisLabel\": {\n \"show\": true,\n \"fontSize\": 12,\n \"color\": \"#B9B8CE\",\n \"rotate\": 0\n },\n \"position\": \"bottom\",\n \"axisLine\": {\n \"show\": true,\n \"lineStyle\": {\n \"color\": \"#B9B8CE\",\n \"width\": 1\n },\n \"onZero\": true\n },\n \"axisTick\": {\n \"show\": true,\n \"length\": 5\n },\n \"splitLine\": {\n \"show\": false,\n \"lineStyle\": {\n \"color\": \"#484753\",\n \"width\": 1,\n \"type\": \"solid\"\n }\n },\n \"type\": \"category\"\n },\n \"yAxis\": {\n \"show\": true,\n \"name\": \"\",\n \"nameGap\": 15,\n \"nameTextStyle\": {\n \"color\": \"#B9B8CE\",\n \"fontSize\": 12\n },\n \"inverse\": false,\n \"axisLabel\": {\n \"show\": true,\n \"fontSize\": 12,\n \"color\": \"#B9B8CE\",\n \"rotate\": 0\n },\n \"position\": \"left\",\n \"axisLine\": {\n \"show\": true,\n \"lineStyle\": {\n \"color\": \"#B9B8CE\",\n \"width\": 1\n },\n \"onZero\": true\n },\n \"axisTick\": {\n \"show\": true,\n \"length\": 5\n },\n \"splitLine\": {\n \"show\": true,\n \"lineStyle\": {\n \"color\": \"#484753\",\n \"width\": 1,\n \"type\": \"solid\"\n }\n },\n \"type\": \"value\"\n },\n \"grid\": {\n \"show\": false,\n \"left\": \"10%\",\n \"top\": \"60\",\n \"right\": \"10%\",\n \"bottom\": \"60\"\n },\n \"tooltip\": {\n \"show\": true,\n \"trigger\": \"axis\",\n \"axisPointer\": {\n \"type\": \"line\"\n }\n },\n \"dataset\": {\n \"dimensions\": [\n \"time\",\n \"次数\",\n \"人数\"\n ],\n \"source\": [\n {\n \"次数\": 94,\n \"time\": \"2022-05\",\n \"人数\": 5\n },\n {\n \"次数\": 120,\n \"time\": \"2022-06\",\n \"人数\": 2\n },\n {\n \"次数\": 118,\n \"time\": \"2022-07\",\n \"人数\": 5\n },\n {\n \"次数\": 37,\n \"time\": \"2022-08\",\n \"人数\": 2\n },\n {\n \"次数\": 65,\n \"time\": \"2022-09\",\n \"人数\": 2\n },\n {\n \"次数\": 35,\n \"time\": \"2022-10\",\n \"人数\": 2\n },\n {\n \"次数\": 86,\n \"time\": \"2022-11\",\n \"人数\": 1\n },\n {\n \"次数\": 49,\n \"time\": \"2022-12\",\n \"人数\": 3\n },\n {\n \"次数\": 45,\n \"time\": \"2023-01\",\n \"人数\": 1\n },\n {\n \"次数\": 70,\n \"time\": \"2023-02\",\n \"人数\": 1\n }\n ]\n },\n \"series\": [\n {\n \"type\": \"line\",\n \"label\": {\n \"show\": true,\n \"position\": \"top\",\n \"color\": \"#fff\",\n \"fontSize\": 12\n },\n \"symbolSize\": 5,\n \"itemStyle\": {\n \"color\": null,\n \"borderRadius\": 0\n },\n \"lineStyle\": {\n \"type\": \"solid\",\n \"width\": 3,\n \"color\": null\n }\n },\n {\n \"type\": \"line\",\n \"label\": {\n \"show\": true,\n \"position\": \"top\",\n \"color\": \"#fff\",\n \"fontSize\": 12\n },\n \"symbolSize\": 5,\n \"itemStyle\": {\n \"color\": null,\n \"borderRadius\": 0\n },\n \"lineStyle\": {\n \"type\": \"solid\",\n \"width\": 3,\n \"color\": null\n }\n }\n ],\n \"backgroundColor\": \"rgba(0,0,0,0)\"\n }\n }\n ],\n \"requestGlobalConfig\": {\n \"requestDataPond\": [],\n \"requestOriginUrl\": \"\",\n \"requestInterval\": 30,\n \"requestIntervalUnit\": \"second\",\n \"requestParams\": {\n \"Body\": {\n \"form-data\": {},\n \"x-www-form-urlencoded\": {},\n \"json\": \"\",\n \"xml\": \"\"\n },\n \"Header\": {},\n \"Params\": {}\n }\n }\n}', 0, NULL, '1', '2023-02-07 11:43:57', '1', '2023-02-07 17:27:40', b'0', 1), (8, '57q2gor533g000', NULL, NULL, 1, NULL, '1', '2023-02-07 19:27:09', '1', '2023-02-07 19:27:09', b'0', 1); +INSERT INTO `report_go_view_project` (`id`, `name`, `pic_url`, `content`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (6, 'HTTP示例', 'http://test.fuxiaoaio.iocoder.cn/7c0cb26b09cfa97cae0b3e5d19b210978eed0ab184dd0bff1b66b3daf70a01fc.png', '{\n \"editCanvasConfig\": {\n \"projectName\": \"HTTP示例\",\n \"width\": 1920,\n \"height\": 1080,\n \"filterShow\": false,\n \"hueRotate\": 0,\n \"saturate\": 1,\n \"contrast\": 1,\n \"brightness\": 1,\n \"opacity\": 1,\n \"rotateZ\": 0,\n \"rotateX\": 0,\n \"rotateY\": 0,\n \"skewX\": 0,\n \"skewY\": 0,\n \"blendMode\": \"normal\",\n \"background\": null,\n \"backgroundImage\": null,\n \"selectColor\": true,\n \"chartThemeColor\": \"dark\",\n \"chartThemeSetting\": {\n \"title\": {\n \"show\": true,\n \"textStyle\": {\n \"color\": \"#BFBFBF\",\n \"fontSize\": 18\n },\n \"subtextStyle\": {\n \"color\": \"#A2A2A2\",\n \"fontSize\": 14\n }\n },\n \"xAxis\": {\n \"show\": true,\n \"name\": \"\",\n \"nameGap\": 15,\n \"nameTextStyle\": {\n \"color\": \"#B9B8CE\",\n \"fontSize\": 12\n },\n \"inverse\": false,\n \"axisLabel\": {\n \"show\": true,\n \"fontSize\": 12,\n \"color\": \"#B9B8CE\",\n \"rotate\": 0\n },\n \"position\": \"bottom\",\n \"axisLine\": {\n \"show\": true,\n \"lineStyle\": {\n \"color\": \"#B9B8CE\",\n \"width\": 1\n },\n \"onZero\": true\n },\n \"axisTick\": {\n \"show\": true,\n \"length\": 5\n },\n \"splitLine\": {\n \"show\": false,\n \"lineStyle\": {\n \"color\": \"#484753\",\n \"width\": 1,\n \"type\": \"solid\"\n }\n }\n },\n \"yAxis\": {\n \"show\": true,\n \"name\": \"\",\n \"nameGap\": 15,\n \"nameTextStyle\": {\n \"color\": \"#B9B8CE\",\n \"fontSize\": 12\n },\n \"inverse\": false,\n \"axisLabel\": {\n \"show\": true,\n \"fontSize\": 12,\n \"color\": \"#B9B8CE\",\n \"rotate\": 0\n },\n \"position\": \"left\",\n \"axisLine\": {\n \"show\": true,\n \"lineStyle\": {\n \"color\": \"#B9B8CE\",\n \"width\": 1\n },\n \"onZero\": true\n },\n \"axisTick\": {\n \"show\": true,\n \"length\": 5\n },\n \"splitLine\": {\n \"show\": true,\n \"lineStyle\": {\n \"color\": \"#484753\",\n \"width\": 1,\n \"type\": \"solid\"\n }\n }\n },\n \"legend\": {\n \"show\": true,\n \"top\": \"5%\",\n \"textStyle\": {\n \"color\": \"#B9B8CE\"\n }\n },\n \"grid\": {\n \"show\": false,\n \"left\": \"10%\",\n \"top\": \"60\",\n \"right\": \"10%\",\n \"bottom\": \"60\"\n },\n \"dataset\": null\n },\n \"previewScaleType\": \"fit\"\n },\n \"componentList\": [\n {\n \"id\": \"4vxgys8nh6g000\",\n \"isGroup\": false,\n \"attr\": {\n \"x\": 7,\n \"y\": 11,\n \"w\": 1898,\n \"h\": 1066,\n \"offsetX\": 0,\n \"offsetY\": 0,\n \"zIndex\": -1\n },\n \"styles\": {\n \"filterShow\": false,\n \"hueRotate\": 0,\n \"saturate\": 1,\n \"contrast\": 1,\n \"brightness\": 1,\n \"opacity\": 1,\n \"rotateZ\": 0,\n \"rotateX\": 0,\n \"rotateY\": 0,\n \"skewX\": 0,\n \"skewY\": 0,\n \"blendMode\": \"normal\",\n \"animations\": []\n },\n \"status\": {\n \"lock\": false,\n \"hide\": false\n },\n \"request\": {\n \"requestDataType\": 1,\n \"requestHttpType\": \"get\",\n \"requestUrl\": \"http://127.0.0.1:48080/admin-api/report/go-view/data/get-by-http\",\n \"requestInterval\": null,\n \"requestIntervalUnit\": \"second\",\n \"requestContentType\": 0,\n \"requestParamsBodyType\": \"none\",\n \"requestSQLContent\": {\n \"sql\": \"select * from where\"\n },\n \"requestParams\": {\n \"Body\": {\n \"form-data\": {},\n \"x-www-form-urlencoded\": {},\n \"json\": \"\",\n \"xml\": \"\"\n },\n \"Header\": {},\n \"Params\": {}\n }\n },\n \"filter\": null,\n \"events\": {\n \"baseEvent\": {\n \"click\": null,\n \"dblclick\": null,\n \"mouseenter\": null,\n \"mouseleave\": null\n },\n \"advancedEvents\": {\n \"vnodeMounted\": null,\n \"vnodeBeforeMount\": null\n }\n },\n \"key\": \"LineCommon\",\n \"chartConfig\": {\n \"key\": \"LineCommon\",\n \"chartKey\": \"VLineCommon\",\n \"conKey\": \"VCLineCommon\",\n \"title\": \"折线图\",\n \"category\": \"Lines\",\n \"categoryName\": \"折线图\",\n \"package\": \"Charts\",\n \"chartFrame\": \"echarts\",\n \"image\": \"line.png\"\n },\n \"option\": {\n \"legend\": {\n \"show\": true,\n \"top\": \"5%\",\n \"textStyle\": {\n \"color\": \"#B9B8CE\"\n }\n },\n \"xAxis\": {\n \"show\": true,\n \"name\": \"\",\n \"nameGap\": 15,\n \"nameTextStyle\": {\n \"color\": \"#B9B8CE\",\n \"fontSize\": 12\n },\n \"inverse\": false,\n \"axisLabel\": {\n \"show\": true,\n \"fontSize\": 12,\n \"color\": \"#B9B8CE\",\n \"rotate\": 0\n },\n \"position\": \"bottom\",\n \"axisLine\": {\n \"show\": true,\n \"lineStyle\": {\n \"color\": \"#B9B8CE\",\n \"width\": 1\n },\n \"onZero\": true\n },\n \"axisTick\": {\n \"show\": true,\n \"length\": 5\n },\n \"splitLine\": {\n \"show\": false,\n \"lineStyle\": {\n \"color\": \"#484753\",\n \"width\": 1,\n \"type\": \"solid\"\n }\n },\n \"type\": \"category\"\n },\n \"yAxis\": {\n \"show\": true,\n \"name\": \"\",\n \"nameGap\": 15,\n \"nameTextStyle\": {\n \"color\": \"#B9B8CE\",\n \"fontSize\": 12\n },\n \"inverse\": false,\n \"axisLabel\": {\n \"show\": true,\n \"fontSize\": 12,\n \"color\": \"#B9B8CE\",\n \"rotate\": 0\n },\n \"position\": \"left\",\n \"axisLine\": {\n \"show\": true,\n \"lineStyle\": {\n \"color\": \"#B9B8CE\",\n \"width\": 1\n },\n \"onZero\": true\n },\n \"axisTick\": {\n \"show\": true,\n \"length\": 5\n },\n \"splitLine\": {\n \"show\": true,\n \"lineStyle\": {\n \"color\": \"#484753\",\n \"width\": 1,\n \"type\": \"solid\"\n }\n },\n \"type\": \"value\"\n },\n \"grid\": {\n \"show\": false,\n \"left\": \"10%\",\n \"top\": \"60\",\n \"right\": \"10%\",\n \"bottom\": \"60\"\n },\n \"tooltip\": {\n \"show\": true,\n \"trigger\": \"axis\",\n \"axisPointer\": {\n \"type\": \"line\"\n }\n },\n \"dataset\": {\n \"dimensions\": [\n \"日期\",\n \"PV\",\n \"UV\"\n ],\n \"source\": [\n {\n \"UV\": 518,\n \"日期\": \"2021-01\",\n \"PV\": 7954\n },\n {\n \"UV\": 135,\n \"日期\": \"2021-02\",\n \"PV\": 9402\n },\n {\n \"UV\": 905,\n \"日期\": \"2021-03\",\n \"PV\": 1665\n },\n {\n \"UV\": 157,\n \"日期\": \"2021-04\",\n \"PV\": 2633\n },\n {\n \"UV\": 849,\n \"日期\": \"2021-05\",\n \"PV\": 7650\n },\n {\n \"UV\": 563,\n \"日期\": \"2021-06\",\n \"PV\": 2399\n },\n {\n \"UV\": 427,\n \"日期\": \"2021-07\",\n \"PV\": 9952\n },\n {\n \"UV\": 158,\n \"日期\": \"2021-08\",\n \"PV\": 9232\n },\n {\n \"UV\": 894,\n \"日期\": \"2021-09\",\n \"PV\": 3013\n },\n {\n \"UV\": 343,\n \"日期\": \"2021-10\",\n \"PV\": 6181\n },\n {\n \"UV\": 294,\n \"日期\": \"2021-11\",\n \"PV\": 8949\n },\n {\n \"UV\": 452,\n \"日期\": \"2021-12\",\n \"PV\": 8730\n }\n ]\n },\n \"series\": [\n {\n \"type\": \"line\",\n \"label\": {\n \"show\": true,\n \"position\": \"top\",\n \"color\": \"#fff\",\n \"fontSize\": 12\n },\n \"symbolSize\": 5,\n \"itemStyle\": {\n \"color\": null,\n \"borderRadius\": 0\n },\n \"lineStyle\": {\n \"type\": \"solid\",\n \"width\": 3,\n \"color\": null\n }\n },\n {\n \"type\": \"line\",\n \"label\": {\n \"show\": true,\n \"position\": \"top\",\n \"color\": \"#fff\",\n \"fontSize\": 12\n },\n \"symbolSize\": 5,\n \"itemStyle\": {\n \"color\": null,\n \"borderRadius\": 0\n },\n \"lineStyle\": {\n \"type\": \"solid\",\n \"width\": 3,\n \"color\": null\n }\n }\n ],\n \"backgroundColor\": \"rgba(0,0,0,0)\"\n }\n }\n ],\n \"requestGlobalConfig\": {\n \"requestDataPond\": [],\n \"requestOriginUrl\": \"\",\n \"requestInterval\": 30,\n \"requestIntervalUnit\": \"second\",\n \"requestParams\": {\n \"Body\": {\n \"form-data\": {},\n \"x-www-form-urlencoded\": {},\n \"json\": \"\",\n \"xml\": \"\"\n },\n \"Header\": {},\n \"Params\": {}\n }\n }\n}', 0, NULL, '1', '2023-02-07 11:38:22', '1', '2023-02-07 17:27:43', b'0', 1), (7, 'SQL示例', 'http://test.fuxiaoaio.iocoder.cn/c1f570bad6ec7e7fa4a0a7c8f563da4ea158fde6e731da4dd1abe8ba9b6baeed.png', '{\n \"editCanvasConfig\": {\n \"projectName\": \"SQL示例\",\n \"width\": 1920,\n \"height\": 1080,\n \"filterShow\": false,\n \"hueRotate\": 0,\n \"saturate\": 1,\n \"contrast\": 1,\n \"brightness\": 1,\n \"opacity\": 1,\n \"rotateZ\": 0,\n \"rotateX\": 0,\n \"rotateY\": 0,\n \"skewX\": 0,\n \"skewY\": 0,\n \"blendMode\": \"normal\",\n \"background\": null,\n \"backgroundImage\": null,\n \"selectColor\": true,\n \"chartThemeColor\": \"dark\",\n \"chartThemeSetting\": {\n \"title\": {\n \"show\": true,\n \"textStyle\": {\n \"color\": \"#BFBFBF\",\n \"fontSize\": 18\n },\n \"subtextStyle\": {\n \"color\": \"#A2A2A2\",\n \"fontSize\": 14\n }\n },\n \"xAxis\": {\n \"show\": true,\n \"name\": \"\",\n \"nameGap\": 15,\n \"nameTextStyle\": {\n \"color\": \"#B9B8CE\",\n \"fontSize\": 12\n },\n \"inverse\": false,\n \"axisLabel\": {\n \"show\": true,\n \"fontSize\": 12,\n \"color\": \"#B9B8CE\",\n \"rotate\": 0\n },\n \"position\": \"bottom\",\n \"axisLine\": {\n \"show\": true,\n \"lineStyle\": {\n \"color\": \"#B9B8CE\",\n \"width\": 1\n },\n \"onZero\": true\n },\n \"axisTick\": {\n \"show\": true,\n \"length\": 5\n },\n \"splitLine\": {\n \"show\": false,\n \"lineStyle\": {\n \"color\": \"#484753\",\n \"width\": 1,\n \"type\": \"solid\"\n }\n }\n },\n \"yAxis\": {\n \"show\": true,\n \"name\": \"\",\n \"nameGap\": 15,\n \"nameTextStyle\": {\n \"color\": \"#B9B8CE\",\n \"fontSize\": 12\n },\n \"inverse\": false,\n \"axisLabel\": {\n \"show\": true,\n \"fontSize\": 12,\n \"color\": \"#B9B8CE\",\n \"rotate\": 0\n },\n \"position\": \"left\",\n \"axisLine\": {\n \"show\": true,\n \"lineStyle\": {\n \"color\": \"#B9B8CE\",\n \"width\": 1\n },\n \"onZero\": true\n },\n \"axisTick\": {\n \"show\": true,\n \"length\": 5\n },\n \"splitLine\": {\n \"show\": true,\n \"lineStyle\": {\n \"color\": \"#484753\",\n \"width\": 1,\n \"type\": \"solid\"\n }\n }\n },\n \"legend\": {\n \"show\": true,\n \"top\": \"5%\",\n \"textStyle\": {\n \"color\": \"#B9B8CE\"\n }\n },\n \"grid\": {\n \"show\": false,\n \"left\": \"10%\",\n \"top\": \"60\",\n \"right\": \"10%\",\n \"bottom\": \"60\"\n },\n \"dataset\": null\n },\n \"previewScaleType\": \"fit\"\n },\n \"componentList\": [\n {\n \"id\": \"5cqrghfle9g000\",\n \"isGroup\": false,\n \"attr\": {\n \"x\": 27,\n \"y\": 3,\n \"w\": 1870,\n \"h\": 1051,\n \"offsetX\": 0,\n \"offsetY\": 0,\n \"zIndex\": -1\n },\n \"styles\": {\n \"filterShow\": false,\n \"hueRotate\": 0,\n \"saturate\": 1,\n \"contrast\": 1,\n \"brightness\": 1,\n \"opacity\": 1,\n \"rotateZ\": 0,\n \"rotateX\": 0,\n \"rotateY\": 0,\n \"skewX\": 0,\n \"skewY\": 0,\n \"blendMode\": \"normal\",\n \"animations\": [\n \"headShake\"\n ]\n },\n \"status\": {\n \"lock\": false,\n \"hide\": false\n },\n \"request\": {\n \"requestDataType\": 1,\n \"requestHttpType\": \"post\",\n \"requestUrl\": \"http://127.0.0.1:48080/admin-api/report/go-view/data/get-by-sql\",\n \"requestInterval\": null,\n \"requestIntervalUnit\": \"second\",\n \"requestContentType\": 0,\n \"requestParamsBodyType\": \"none\",\n \"requestSQLContent\": {\n \"sql\": \"SELECT DATE_FORMAT(create_time, \\\"%Y-%m\\\") AS time, COUNT(*) AS \'次数\', COUNT(DISTINCT(user_id)) AS \'人数\' FROM system_login_log GROUP BY DATE_FORMAT(create_time, \\\"%Y-%m\\\")\"\n },\n \"requestParams\": {\n \"Body\": {\n \"form-data\": {},\n \"x-www-form-urlencoded\": {},\n \"json\": \"\",\n \"xml\": \"\"\n },\n \"Header\": {},\n \"Params\": {}\n }\n },\n \"filter\": null,\n \"events\": {\n \"baseEvent\": {\n \"click\": null,\n \"dblclick\": null,\n \"mouseenter\": null,\n \"mouseleave\": null\n },\n \"advancedEvents\": {\n \"vnodeMounted\": null,\n \"vnodeBeforeMount\": null\n }\n },\n \"key\": \"LineCommon\",\n \"chartConfig\": {\n \"key\": \"LineCommon\",\n \"chartKey\": \"VLineCommon\",\n \"conKey\": \"VCLineCommon\",\n \"title\": \"折线图\",\n \"category\": \"Lines\",\n \"categoryName\": \"折线图\",\n \"package\": \"Charts\",\n \"chartFrame\": \"echarts\",\n \"image\": \"line.png\"\n },\n \"option\": {\n \"legend\": {\n \"show\": true,\n \"top\": \"5%\",\n \"textStyle\": {\n \"color\": \"#B9B8CE\"\n }\n },\n \"xAxis\": {\n \"show\": true,\n \"name\": \"\",\n \"nameGap\": 15,\n \"nameTextStyle\": {\n \"color\": \"#B9B8CE\",\n \"fontSize\": 12\n },\n \"inverse\": false,\n \"axisLabel\": {\n \"show\": true,\n \"fontSize\": 12,\n \"color\": \"#B9B8CE\",\n \"rotate\": 0\n },\n \"position\": \"bottom\",\n \"axisLine\": {\n \"show\": true,\n \"lineStyle\": {\n \"color\": \"#B9B8CE\",\n \"width\": 1\n },\n \"onZero\": true\n },\n \"axisTick\": {\n \"show\": true,\n \"length\": 5\n },\n \"splitLine\": {\n \"show\": false,\n \"lineStyle\": {\n \"color\": \"#484753\",\n \"width\": 1,\n \"type\": \"solid\"\n }\n },\n \"type\": \"category\"\n },\n \"yAxis\": {\n \"show\": true,\n \"name\": \"\",\n \"nameGap\": 15,\n \"nameTextStyle\": {\n \"color\": \"#B9B8CE\",\n \"fontSize\": 12\n },\n \"inverse\": false,\n \"axisLabel\": {\n \"show\": true,\n \"fontSize\": 12,\n \"color\": \"#B9B8CE\",\n \"rotate\": 0\n },\n \"position\": \"left\",\n \"axisLine\": {\n \"show\": true,\n \"lineStyle\": {\n \"color\": \"#B9B8CE\",\n \"width\": 1\n },\n \"onZero\": true\n },\n \"axisTick\": {\n \"show\": true,\n \"length\": 5\n },\n \"splitLine\": {\n \"show\": true,\n \"lineStyle\": {\n \"color\": \"#484753\",\n \"width\": 1,\n \"type\": \"solid\"\n }\n },\n \"type\": \"value\"\n },\n \"grid\": {\n \"show\": false,\n \"left\": \"10%\",\n \"top\": \"60\",\n \"right\": \"10%\",\n \"bottom\": \"60\"\n },\n \"tooltip\": {\n \"show\": true,\n \"trigger\": \"axis\",\n \"axisPointer\": {\n \"type\": \"line\"\n }\n },\n \"dataset\": {\n \"dimensions\": [\n \"time\",\n \"次数\",\n \"人数\"\n ],\n \"source\": [\n {\n \"次数\": 94,\n \"time\": \"2022-05\",\n \"人数\": 5\n },\n {\n \"次数\": 120,\n \"time\": \"2022-06\",\n \"人数\": 2\n },\n {\n \"次数\": 118,\n \"time\": \"2022-07\",\n \"人数\": 5\n },\n {\n \"次数\": 37,\n \"time\": \"2022-08\",\n \"人数\": 2\n },\n {\n \"次数\": 65,\n \"time\": \"2022-09\",\n \"人数\": 2\n },\n {\n \"次数\": 35,\n \"time\": \"2022-10\",\n \"人数\": 2\n },\n {\n \"次数\": 86,\n \"time\": \"2022-11\",\n \"人数\": 1\n },\n {\n \"次数\": 49,\n \"time\": \"2022-12\",\n \"人数\": 3\n },\n {\n \"次数\": 45,\n \"time\": \"2023-01\",\n \"人数\": 1\n },\n {\n \"次数\": 70,\n \"time\": \"2023-02\",\n \"人数\": 1\n }\n ]\n },\n \"series\": [\n {\n \"type\": \"line\",\n \"label\": {\n \"show\": true,\n \"position\": \"top\",\n \"color\": \"#fff\",\n \"fontSize\": 12\n },\n \"symbolSize\": 5,\n \"itemStyle\": {\n \"color\": null,\n \"borderRadius\": 0\n },\n \"lineStyle\": {\n \"type\": \"solid\",\n \"width\": 3,\n \"color\": null\n }\n },\n {\n \"type\": \"line\",\n \"label\": {\n \"show\": true,\n \"position\": \"top\",\n \"color\": \"#fff\",\n \"fontSize\": 12\n },\n \"symbolSize\": 5,\n \"itemStyle\": {\n \"color\": null,\n \"borderRadius\": 0\n },\n \"lineStyle\": {\n \"type\": \"solid\",\n \"width\": 3,\n \"color\": null\n }\n }\n ],\n \"backgroundColor\": \"rgba(0,0,0,0)\"\n }\n }\n ],\n \"requestGlobalConfig\": {\n \"requestDataPond\": [],\n \"requestOriginUrl\": \"\",\n \"requestInterval\": 30,\n \"requestIntervalUnit\": \"second\",\n \"requestParams\": {\n \"Body\": {\n \"form-data\": {},\n \"x-www-form-urlencoded\": {},\n \"json\": \"\",\n \"xml\": \"\"\n },\n \"Header\": {},\n \"Params\": {}\n }\n }\n}', 0, NULL, '1', '2023-02-07 11:43:57', '1', '2023-02-07 17:27:40', b'0', 1), (8, '57q2gor533g000', NULL, NULL, 1, NULL, '1', '2023-02-07 19:27:09', '1', '2023-02-07 19:27:09', b'0', 1); COMMIT; SET FOREIGN_KEY_CHECKS = 1; diff --git a/sql/mysql/optional/mp.sql b/sql/mysql/optional/mp.sql index 3fcc00c74..cc711379d 100644 --- a/sql/mysql/optional/mp.sql +++ b/sql/mysql/optional/mp.sql @@ -116,7 +116,7 @@ CREATE TABLE `mp_material` ( -- Records of mp_material -- ---------------------------- BEGIN; -INSERT INTO `mp_material` (`id`, `account_id`, `app_id`, `media_id`, `type`, `permanent`, `url`, `name`, `mp_url`, `title`, `introduction`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (80, 1, 'wx5b23ba7a5589ecbb', 'r6ryvl6LrxBU0miaST4Y-tlQmcl3RdC-Jcgns6IQtf7zenGy3b86WLT7GzUcrb1T', 'image', b'1', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-tlQmcl3RdC-Jcgns6IQtf7zenGy3b86WLT7GzUcrb1T.png', 'file', 'http://mmbiz.qpic.cn/mmbiz_png/btUmCVHwbJUoicwBiacjVeQbu6QxgBVrukfSJXz509boa21SpH8OVHAqXCJiaiaAaHQJNxwwsa0gHRXVr0G5EZYamw/0?wx_fmt=png', '', '', '1', '2023-01-14 00:56:06', '1', '2023-01-14 07:45:41', b'1', 1), (81, 1, 'wx5b23ba7a5589ecbb', 'r6ryvl6LrxBU0miaST4Y-pWqXoCgpdNp1fvSv7c6zoTnCsW6BGAVFNJ-E9hkAIXO', 'image', b'1', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pWqXoCgpdNp1fvSv7c6zoTnCsW6BGAVFNJ-E9hkAIXO.jpg', 'file', 'http://mmbiz.qpic.cn/mmbiz_jpg/btUmCVHwbJUoicwBiacjVeQbu6QxgBVrukzCJPJRkia5cQviaDTbLMc614uobiblN4Au4UApLYOShXNDNjdndjPVswg/0?wx_fmt=jpeg', '', '', '1', '2023-01-14 01:30:49', '1', '2023-01-14 07:31:02', b'1', 1), (82, 1, 'wx5b23ba7a5589ecbb', 'r6ryvl6LrxBU0miaST4Y-vNzhGc_1b37nxAvj0Zt8iuGACe-mC9_a5OhVFIzt0DX', 'image', b'1', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-vNzhGc_1b37nxAvj0Zt8iuGACe-mC9_a5OhVFIzt0DX.png', 'file', 'http://mmbiz.qpic.cn/mmbiz_png/btUmCVHwbJVkZaoiatUmOpaGalzHIVxhUNOGPaZfZUSfKzpS8bPShaicSyErHn2mEzthXochM7GE3tIDAt5FNrUg/0?wx_fmt=png', NULL, NULL, '1', '2023-01-14 08:20:53', '1', '2023-01-14 07:30:59', b'1', 1), (88, 4, 'wx01b971b269525c69', 'rdp2FpJLZJb_Z771EZCE0sdggkEkJ9BXy1wIiory8puv2L0sRYeBBVztrxmjjT_P', 'voice', b'1', 'http://test.yudao.iocoder.cn/rdp2FpJLZJb_Z771EZCE0sdggkEkJ9BXy1wIiory8puv2L0sRYeBBVztrxmjjT_P.amr', 'file', NULL, '', '', '1', '2023-01-14 16:28:53', '1', '2023-01-14 08:29:36', b'1', 1), (89, 4, 'wx01b971b269525c69', 'rdp2FpJLZJb_Z771EZCE0jlwnElym7bDUZUQI6t36O9xlh-wQWZpdDEVNHj_-Zo3', 'video', b'1', 'http://test.yudao.iocoder.cn/rdp2FpJLZJb_Z771EZCE0jlwnElym7bDUZUQI6t36O9xlh-wQWZpdDEVNHj_-Zo3.mp4', 'file', NULL, '1', '2', '1', '2023-01-14 16:53:53', '1', '2023-01-14 08:54:45', b'1', 1), (90, 4, 'wx01b971b269525c69', 'rdp2FpJLZJb_Z771EZCE0nKJFlsOPjLkDApXEgRjaGydiFVTsC0zMq8-x5V6-rG4', 'video', b'1', 'http://test.yudao.iocoder.cn/rdp2FpJLZJb_Z771EZCE0nKJFlsOPjLkDApXEgRjaGydiFVTsC0zMq8-x5V6-rG4.mp4', 'file', NULL, '12', '34', '1', '2023-01-14 16:55:02', '1', '2023-01-14 08:55:06', b'1', 1); +INSERT INTO `mp_material` (`id`, `account_id`, `app_id`, `media_id`, `type`, `permanent`, `url`, `name`, `mp_url`, `title`, `introduction`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (80, 1, 'wx5b23ba7a5589ecbb', 'r6ryvl6LrxBU0miaST4Y-tlQmcl3RdC-Jcgns6IQtf7zenGy3b86WLT7GzUcrb1T', 'image', b'1', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-tlQmcl3RdC-Jcgns6IQtf7zenGy3b86WLT7GzUcrb1T.png', 'file', 'http://mmbiz.qpic.cn/mmbiz_png/btUmCVHwbJUoicwBiacjVeQbu6QxgBVrukfSJXz509boa21SpH8OVHAqXCJiaiaAaHQJNxwwsa0gHRXVr0G5EZYamw/0?wx_fmt=png', '', '', '1', '2023-01-14 00:56:06', '1', '2023-01-14 07:45:41', b'1', 1), (81, 1, 'wx5b23ba7a5589ecbb', 'r6ryvl6LrxBU0miaST4Y-pWqXoCgpdNp1fvSv7c6zoTnCsW6BGAVFNJ-E9hkAIXO', 'image', b'1', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pWqXoCgpdNp1fvSv7c6zoTnCsW6BGAVFNJ-E9hkAIXO.jpg', 'file', 'http://mmbiz.qpic.cn/mmbiz_jpg/btUmCVHwbJUoicwBiacjVeQbu6QxgBVrukzCJPJRkia5cQviaDTbLMc614uobiblN4Au4UApLYOShXNDNjdndjPVswg/0?wx_fmt=jpeg', '', '', '1', '2023-01-14 01:30:49', '1', '2023-01-14 07:31:02', b'1', 1), (82, 1, 'wx5b23ba7a5589ecbb', 'r6ryvl6LrxBU0miaST4Y-vNzhGc_1b37nxAvj0Zt8iuGACe-mC9_a5OhVFIzt0DX', 'image', b'1', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-vNzhGc_1b37nxAvj0Zt8iuGACe-mC9_a5OhVFIzt0DX.png', 'file', 'http://mmbiz.qpic.cn/mmbiz_png/btUmCVHwbJVkZaoiatUmOpaGalzHIVxhUNOGPaZfZUSfKzpS8bPShaicSyErHn2mEzthXochM7GE3tIDAt5FNrUg/0?wx_fmt=png', NULL, NULL, '1', '2023-01-14 08:20:53', '1', '2023-01-14 07:30:59', b'1', 1), (88, 4, 'wx01b971b269525c69', 'rdp2FpJLZJb_Z771EZCE0sdggkEkJ9BXy1wIiory8puv2L0sRYeBBVztrxmjjT_P', 'voice', b'1', 'http://test.fuxiaoaio.iocoder.cn/rdp2FpJLZJb_Z771EZCE0sdggkEkJ9BXy1wIiory8puv2L0sRYeBBVztrxmjjT_P.amr', 'file', NULL, '', '', '1', '2023-01-14 16:28:53', '1', '2023-01-14 08:29:36', b'1', 1), (89, 4, 'wx01b971b269525c69', 'rdp2FpJLZJb_Z771EZCE0jlwnElym7bDUZUQI6t36O9xlh-wQWZpdDEVNHj_-Zo3', 'video', b'1', 'http://test.fuxiaoaio.iocoder.cn/rdp2FpJLZJb_Z771EZCE0jlwnElym7bDUZUQI6t36O9xlh-wQWZpdDEVNHj_-Zo3.mp4', 'file', NULL, '1', '2', '1', '2023-01-14 16:53:53', '1', '2023-01-14 08:54:45', b'1', 1), (90, 4, 'wx01b971b269525c69', 'rdp2FpJLZJb_Z771EZCE0nKJFlsOPjLkDApXEgRjaGydiFVTsC0zMq8-x5V6-rG4', 'video', b'1', 'http://test.fuxiaoaio.iocoder.cn/rdp2FpJLZJb_Z771EZCE0nKJFlsOPjLkDApXEgRjaGydiFVTsC0zMq8-x5V6-rG4.mp4', 'file', NULL, '12', '34', '1', '2023-01-14 16:55:02', '1', '2023-01-14 08:55:06', b'1', 1); COMMIT; -- ---------------------------- @@ -159,7 +159,7 @@ CREATE TABLE `mp_menu` ( -- Records of mp_menu -- ---------------------------- BEGIN; -INSERT INTO `mp_menu` (`id`, `account_id`, `app_id`, `name`, `menu_key`, `parent_id`, `type`, `url`, `mini_program_app_id`, `mini_program_page_path`, `article_id`, `reply_message_type`, `reply_content`, `reply_media_id`, `reply_media_url`, `reply_title`, `reply_description`, `reply_thumb_media_id`, `reply_thumb_media_url`, `reply_articles`, `reply_music_url`, `reply_hq_music_url`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, 1, 'wx5b23ba7a5589ecbb', '今日歌曲', 'V1001_TODAY_MUSIC', '0', 'click', NULL, NULL, NULL, NULL, 'text', '幸会幸会', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '', '2023-01-07 02:51:58', '', '2023-01-14 15:44:49', b'1', 1), (2, 1, 'wx5b23ba7a5589ecbb', '搜索', '', '0', 'view', 'http://www.soso.com/', NULL, NULL, NULL, 'text', '幸会幸会', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '', '2023-01-07 02:51:58', '', '2023-01-14 13:22:13', b'1', 1), (3, 1, 'wx5b23ba7a5589ecbb', '父按钮', '', '0', '', '', NULL, NULL, NULL, 'text', '幸会幸会', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '', '2023-01-07 02:51:58', '', '2023-01-14 15:44:49', b'1', 1), (4, 1, 'wx5b23ba7a5589ecbb', '归去来兮', 'MUSIC', '3', 'click', NULL, NULL, NULL, NULL, 'text', '幸会幸会', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '', '2023-01-07 02:51:58', '', '2023-01-14 15:44:49', b'1', 1), (5, 1, 'wx5b23ba7a5589ecbb', '不说', '', '3', 'view', 'http://www.soso.com/', NULL, NULL, NULL, 'text', '幸会幸会', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '', '2023-01-07 02:51:58', '', '2023-01-14 15:44:49', b'1', 1), (26, 1, 'wx5b23ba7a5589ecbb', '今日歌曲', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-14 23:44:50', '1', '2023-01-14 16:35:05', b'1', 1), (27, 1, 'wx5b23ba7a5589ecbb', '搜索', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-14 23:44:50', '1', '2023-01-14 16:35:05', b'1', 1), (28, 1, 'wx5b23ba7a5589ecbb', '父按钮', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-14 23:44:50', '1', '2023-01-14 16:35:05', b'1', 1), (29, 1, 'wx5b23ba7a5589ecbb', '归去来兮', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-14 23:44:50', '1', '2023-01-14 16:35:05', b'1', 1), (30, 1, 'wx5b23ba7a5589ecbb', '不说', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-14 23:44:50', '1', '2023-01-14 16:35:05', b'1', 1), (31, 1, 'wx5b23ba7a5589ecbb', '123', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 00:35:05', '1', '2023-01-14 16:35:43', b'1', 1), (32, 1, 'wx5b23ba7a5589ecbb', '123', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 00:35:43', '1', '2023-01-14 16:39:10', b'1', 1), (33, 1, 'wx5b23ba7a5589ecbb', '嘿嘿', NULL, '0', 'view', 'https://www.iocoder.cn', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 00:39:10', '1', '2023-01-14 16:40:09', b'1', 1), (38, 1, 'wx5b23ba7a5589ecbb', '顶级1', NULL, '0', 'view', 'https://www.iocoder.cn', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 00:42:54', '1', '2023-01-14 16:51:35', b'1', 1), (39, 1, 'wx5b23ba7a5589ecbb', '明星', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 00:42:54', '1', '2023-01-14 16:51:35', b'1', 1), (40, 1, 'wx5b23ba7a5589ecbb', '喊个', NULL, '39', 'view', 'https://www.iocoder.cn', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 00:42:54', '1', '2023-01-14 16:51:35', b'1', 1), (41, 1, 'wx5b23ba7a5589ecbb', 'haha', NULL, '39', 'view', 'http://soso.com', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 00:42:54', '1', '2023-01-14 16:51:35', b'1', 1), (42, 1, 'wx5b23ba7a5589ecbb', '顶级1', NULL, '0', 'view', 'https://www.iocoder.cn', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 00:51:35', '1', '2023-01-14 16:51:53', b'1', 1), (43, 1, 'wx5b23ba7a5589ecbb', '明星', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 00:51:35', '1', '2023-01-14 16:51:53', b'1', 1), (44, 1, 'wx5b23ba7a5589ecbb', '喊个', NULL, '43', 'view', 'https://www.iocoder.cn', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 00:51:35', '1', '2023-01-14 16:51:53', b'1', 1), (45, 1, 'wx5b23ba7a5589ecbb', 'haha', NULL, '43', 'view', 'http://soso.com', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 00:51:35', '1', '2023-01-14 16:51:53', b'1', 1), (46, 1, 'wx5b23ba7a5589ecbb', '测试菜单', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 11:32:17', '1', '2023-01-15 04:39:11', b'1', 1), (47, 1, 'wx5b23ba7a5589ecbb', '跳转网页', NULL, '46', 'view', 'https://www.iocoder.cn', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 11:32:17', '1', '2023-01-15 04:39:11', b'1', 1), (48, 1, 'wx5b23ba7a5589ecbb', '点击回复', '123', '0', 'click', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 12:39:12', '1', '2023-01-15 09:19:01', b'1', 1), (49, 1, 'wx5b23ba7a5589ecbb', '点击回复', '123', '0', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG.png', '', '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:19:02', '1', '2023-01-15 09:26:50', b'1', 1), (50, 1, 'wx5b23ba7a5589ecbb', '点击回复', '123', '0', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg', 'http://test.yudao.iocoder.cn/a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg.mp3', '', '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:26:51', '1', '2023-01-15 09:27:39', b'1', 1), (51, 1, 'wx5b23ba7a5589ecbb', '点击回复', '123', '0', 'click', NULL, NULL, NULL, NULL, 'video', '', 'XQockIDz-7p8wHuI0wxzd2dZvhKWrQnxM5pPXvaW8Qsid2hLjVxk90wM47ZsYERT', 'http://test.yudao.iocoder.cn/XQockIDz-7p8wHuI0wxzd2dZvhKWrQnxM5pPXvaW8Qsid2hLjVxk90wM47ZsYERT.mp4', '奥特曼', '奥特快', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:27:40', '1', '2023-01-15 09:28:20', b'1', 1), (52, 1, 'wx5b23ba7a5589ecbb', '点击回复', '123', '0', 'click', NULL, NULL, NULL, NULL, 'video', '', 'XQockIDz-7p8wHuI0wxzd2dZvhKWrQnxM5pPXvaW8Qsid2hLjVxk90wM47ZsYERT', 'http://test.yudao.iocoder.cn/XQockIDz-7p8wHuI0wxzd2dZvhKWrQnxM5pPXvaW8Qsid2hLjVxk90wM47ZsYERT.mp4', NULL, '奥特快', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:28:21', '1', '2023-01-15 09:29:21', b'1', 1), (53, 1, 'wx5b23ba7a5589ecbb', '点击回复', '123', '0', 'click', NULL, NULL, NULL, NULL, 'video', '', 'XQockIDz-7p8wHuI0wxzd2dZvhKWrQnxM5pPXvaW8Qsid2hLjVxk90wM47ZsYERT', 'http://test.yudao.iocoder.cn/XQockIDz-7p8wHuI0wxzd2dZvhKWrQnxM5pPXvaW8Qsid2hLjVxk90wM47ZsYERT.mp4', NULL, '奥特快', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:29:22', '1', '2023-01-15 09:32:49', b'1', 1), (54, 1, 'wx5b23ba7a5589ecbb', '回复图片', '01', '0', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG.png', '', '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:29:22', '1', '2023-01-15 09:32:49', b'1', 1), (55, 1, 'wx5b23ba7a5589ecbb', '回复图片', 'image', '0', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-jVixJGgnBnkBPRbuVptOW0CHYuQFyiOVNtamctS8xU8', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-jVixJGgnBnkBPRbuVptOW0CHYuQFyiOVNtamctS8xU8.jpg', '', '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:33:06', '1', '2023-01-15 09:33:45', b'1', 1), (56, 1, 'wx5b23ba7a5589ecbb', '回复图片', 'image', '0', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-jVixJGgnBnkBPRbuVptOW0CHYuQFyiOVNtamctS8xU8', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-jVixJGgnBnkBPRbuVptOW0CHYuQFyiOVNtamctS8xU8.jpg', NULL, '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:33:45', '1', '2023-01-15 09:33:55', b'1', 1), (57, 1, 'wx5b23ba7a5589ecbb', '回复语音', 'aoteman', '0', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg', 'http://test.yudao.iocoder.cn/a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg.mp3', '', '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:33:45', '1', '2023-01-15 09:33:55', b'1', 1), (58, 1, 'wx5b23ba7a5589ecbb', '回复图片', 'image', '0', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-jVixJGgnBnkBPRbuVptOW0CHYuQFyiOVNtamctS8xU8', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-jVixJGgnBnkBPRbuVptOW0CHYuQFyiOVNtamctS8xU8.jpg', NULL, '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:33:56', '1', '2023-01-15 09:34:02', b'1', 1), (59, 1, 'wx5b23ba7a5589ecbb', '回复语音', 'aoteman', '0', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg', 'http://test.yudao.iocoder.cn/a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg.mp3', NULL, '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:33:56', '1', '2023-01-15 09:34:02', b'1', 1), (60, 1, 'wx5b23ba7a5589ecbb', '回复图片', 'image', '0', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-jVixJGgnBnkBPRbuVptOW0CHYuQFyiOVNtamctS8xU8', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-jVixJGgnBnkBPRbuVptOW0CHYuQFyiOVNtamctS8xU8.jpg', NULL, '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:34:02', '1', '2023-01-15 09:34:44', b'1', 1), (61, 1, 'wx5b23ba7a5589ecbb', '回复语音', 'aoteman', '0', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg', 'http://test.yudao.iocoder.cn/a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg.mp3', NULL, '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:34:02', '1', '2023-01-15 09:34:44', b'1', 1), (62, 1, 'wx5b23ba7a5589ecbb', '回复语音', 'aoteman', '0', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg', 'http://test.yudao.iocoder.cn/a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg.mp3', NULL, '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:34:45', '1', '2023-01-15 09:36:27', b'1', 1), (63, 1, 'wx5b23ba7a5589ecbb', '回复语音', 'aoteman', '0', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg', 'http://test.yudao.iocoder.cn/a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg.mp3', NULL, '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:36:28', '1', '2023-01-15 09:37:20', b'1', 1), (64, 1, 'wx5b23ba7a5589ecbb', '回复语音', 'aoteman', '0', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg', 'http://test.yudao.iocoder.cn/a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg.mp3', NULL, '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:37:21', '1', '2023-01-15 09:40:13', b'1', 1), (65, 1, 'wx5b23ba7a5589ecbb', '回复语音', 'aoteman', '0', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg', 'http://test.yudao.iocoder.cn/a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg.mp3', NULL, '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:40:14', '1', '2023-01-15 09:40:24', b'1', 1), (66, 1, 'wx5b23ba7a5589ecbb', '回复语音', 'aoteman', '0', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg', 'http://test.yudao.iocoder.cn/a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg.mp3', NULL, '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:40:24', '1', '2023-01-15 09:41:12', b'1', 1), (67, 1, 'wx5b23ba7a5589ecbb', '回复语音', 'aoteman', '0', 'click', NULL, NULL, NULL, NULL, 'video', '', 'a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg', 'http://test.yudao.iocoder.cn/a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg.mp3', '', '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:41:13', '1', '2023-01-15 09:43:32', b'1', 1), (68, 1, 'wx5b23ba7a5589ecbb', '回复视频', '123', '0', 'click', NULL, NULL, NULL, NULL, 'video', '', 'r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU.mp4', '我是视频', '我真的是视频', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:41:13', '1', '2023-01-15 09:43:32', b'1', 1), (69, 1, 'wx5b23ba7a5589ecbb', '回复语音', 'aoteman', '0', 'click', NULL, NULL, NULL, NULL, 'video', '', 'a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg', 'http://test.yudao.iocoder.cn/a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg.mp3', NULL, '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:43:33', '1', '2023-01-15 10:06:28', b'1', 1), (70, 1, 'wx5b23ba7a5589ecbb', '回复视频', '123', '0', 'click', NULL, NULL, NULL, NULL, 'video', '', 'r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU.mp4', NULL, '我真的是视频', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:43:33', '1', '2023-01-15 10:06:28', b'1', 1), (71, 1, 'wx5b23ba7a5589ecbb', '回复音乐', 'ao11', '0', 'click', NULL, NULL, NULL, NULL, 'music', '', NULL, NULL, '1', '2', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:43:33', '1', '2023-01-15 10:06:28', b'1', 1), (72, 1, 'wx5b23ba7a5589ecbb', '回复音乐', '01', '0', 'click', NULL, NULL, NULL, NULL, 'music', '', NULL, NULL, '1', '2', 'wBnOlFbeYaWXb7AVX5Ha_Uy373JHA2EoS0FUziAhkwP0r6Hv43PeQHXKY4GADfbl', 'http://test.yudao.iocoder.cn/wBnOlFbeYaWXb7AVX5Ha_Uy373JHA2EoS0FUziAhkwP0r6Hv43PeQHXKY4GADfbl.png', NULL, 'https://www.iocoder.cn/1.mp3', 'https://www.iocoder.cn/2.mp3', '1', '2023-01-15 18:16:12', '1', '2023-01-15 10:21:13', b'1', 1), (73, 1, 'wx5b23ba7a5589ecbb', '回复音乐', '01', '0', 'click', NULL, NULL, NULL, NULL, 'music', '', NULL, NULL, '1', '2', 'wBnOlFbeYaWXb7AVX5Ha_Uy373JHA2EoS0FUziAhkwP0r6Hv43PeQHXKY4GADfbl', 'http://test.yudao.iocoder.cn/wBnOlFbeYaWXb7AVX5Ha_Uy373JHA2EoS0FUziAhkwP0r6Hv43PeQHXKY4GADfbl.png', NULL, 'https://www.iocoder.cn/1.mp3', 'https://www.iocoder.cn/2.mp3', '1', '2023-01-15 18:21:14', '1', '2023-01-15 10:21:36', b'1', 1), (74, 1, 'wx5b23ba7a5589ecbb', '回复音乐', '01', '0', 'click', NULL, NULL, NULL, NULL, 'music', '', NULL, NULL, '1', '2', 'wBnOlFbeYaWXb7AVX5Ha_Uy373JHA2EoS0FUziAhkwP0r6Hv43PeQHXKY4GADfbl', 'http://test.yudao.iocoder.cn/wBnOlFbeYaWXb7AVX5Ha_Uy373JHA2EoS0FUziAhkwP0r6Hv43PeQHXKY4GADfbl.png', NULL, 'https://www.iocoder.cn/1.mp3', 'https://www.iocoder.cn/2.mp3', '1', '2023-01-15 18:21:36', '1', '2023-01-15 10:21:59', b'1', 1), (75, 1, 'wx5b23ba7a5589ecbb', '回复图文', 'music', '0', 'click', NULL, NULL, NULL, NULL, 'news', '', NULL, NULL, '', '', NULL, NULL, '[{\"title\":\"我是标题\",\"description\":null,\"picUrl\":\"http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=1&sn=dadf5d7e9aa594b58666fb2013fdf215&chksm=9f6354aea814ddb8fde13b17a34acbe86987b5c3403c6bd47e1e94977f6988b62653f6ab55e6#rd\"},{\"title\":\"我是标题 2\",\"description\":null,\"picUrl\":\"http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=2&sn=c8041e2fc639c07d73bbbb6f80cf1784&chksm=9f6354aea814ddb8f48d7b330252c0374878014feb45a8fd4c22aaa0483c062f20ba15463368#rd\"}]', NULL, NULL, '1', '2023-01-15 18:23:23', '1', '2023-01-15 10:23:53', b'1', 1), (76, 1, 'wx5b23ba7a5589ecbb', '回复图文', 'music', '0', 'click', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, '', '', NULL, NULL, '[{\"title\":\"我是标题\",\"description\":null,\"picUrl\":\"http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=1&sn=dadf5d7e9aa594b58666fb2013fdf215&chksm=9f6354aea814ddb8fde13b17a34acbe86987b5c3403c6bd47e1e94977f6988b62653f6ab55e6#rd\"},{\"title\":\"我是标题 2\",\"description\":null,\"picUrl\":\"http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=2&sn=c8041e2fc639c07d73bbbb6f80cf1784&chksm=9f6354aea814ddb8f48d7b330252c0374878014feb45a8fd4c22aaa0483c062f20ba15463368#rd\"}]', NULL, NULL, '1', '2023-01-15 18:23:54', '1', '2023-01-15 11:13:21', b'1', 1), (77, 1, 'wx5b23ba7a5589ecbb', '回复图文', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:13:21', '1', '2023-01-15 11:13:36', b'1', 1), (78, 1, 'wx5b23ba7a5589ecbb', '文本', 't1', '77', 'click', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:13:21', '1', '2023-01-15 11:13:36', b'1', 1), (79, 1, 'wx5b23ba7a5589ecbb', '回复图文', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:13:36', '1', '2023-01-15 11:13:49', b'1', 1), (80, 1, 'wx5b23ba7a5589ecbb', '文本', 't1', '79', 'click', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:13:36', '1', '2023-01-15 11:13:49', b'1', 1), (81, 1, 'wx5b23ba7a5589ecbb', '图片', 'pic', '79', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG.png', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:13:36', '1', '2023-01-15 11:13:49', b'1', 1), (82, 1, 'wx5b23ba7a5589ecbb', '回复图文', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:13:49', '1', '2023-01-15 11:14:06', b'1', 1), (83, 1, 'wx5b23ba7a5589ecbb', '文本', 't1', '82', 'click', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:13:49', '1', '2023-01-15 11:14:06', b'1', 1), (84, 1, 'wx5b23ba7a5589ecbb', '图片', 'pic', '82', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG.png', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:13:49', '1', '2023-01-15 11:14:06', b'1', 1), (85, 1, 'wx5b23ba7a5589ecbb', '语音', 'v3', '82', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA', 'http://test.yudao.iocoder.cn/a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA.mp3', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:13:49', '1', '2023-01-15 11:14:06', b'1', 1), (86, 1, 'wx5b23ba7a5589ecbb', '回复图文', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:14:07', '1', '2023-01-15 11:14:35', b'1', 1), (87, 1, 'wx5b23ba7a5589ecbb', '文本', 't1', '86', 'click', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:14:07', '1', '2023-01-15 11:14:35', b'1', 1), (88, 1, 'wx5b23ba7a5589ecbb', '图片', 'pic', '86', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG.png', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:14:07', '1', '2023-01-15 11:14:35', b'1', 1), (89, 1, 'wx5b23ba7a5589ecbb', '语音', 'v3', '86', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA', 'http://test.yudao.iocoder.cn/a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA.mp3', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:14:07', '1', '2023-01-15 11:14:35', b'1', 1), (90, 1, 'wx5b23ba7a5589ecbb', '子菜单名称', 'o', '86', 'click', NULL, NULL, NULL, NULL, 'video', '', 'r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU.mp4', '我是视频', '我真的是视频', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:14:07', '1', '2023-01-15 11:14:35', b'1', 1), (91, 1, 'wx5b23ba7a5589ecbb', '回复图文', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:14:35', '1', '2023-01-15 11:18:13', b'1', 1), (92, 1, 'wx5b23ba7a5589ecbb', '文本', 't1', '91', 'click', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:14:35', '1', '2023-01-15 11:18:13', b'1', 1), (93, 1, 'wx5b23ba7a5589ecbb', '图片', 'pic', '91', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG.png', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:14:35', '1', '2023-01-15 11:18:13', b'1', 1), (94, 1, 'wx5b23ba7a5589ecbb', '语音', 'v3', '91', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA', 'http://test.yudao.iocoder.cn/a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA.mp3', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:14:35', '1', '2023-01-15 11:18:13', b'1', 1), (95, 1, 'wx5b23ba7a5589ecbb', '视频', 'o', '91', 'click', NULL, NULL, NULL, NULL, 'video', '', 'r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU.mp4', '我是视频', '我真的是视频', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:14:35', '1', '2023-01-15 11:18:13', b'1', 1), (96, 1, 'wx5b23ba7a5589ecbb', '图文', 'wx', '91', 'click', NULL, NULL, NULL, NULL, 'news', '', NULL, NULL, '', '', NULL, NULL, '[{\"title\":\"我是标题\",\"description\":null,\"picUrl\":\"http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=1&sn=dadf5d7e9aa594b58666fb2013fdf215&chksm=9f6354aea814ddb8fde13b17a34acbe86987b5c3403c6bd47e1e94977f6988b62653f6ab55e6#rd\"},{\"title\":\"我是标题 2\",\"description\":null,\"picUrl\":\"http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=2&sn=c8041e2fc639c07d73bbbb6f80cf1784&chksm=9f6354aea814ddb8f48d7b330252c0374878014feb45a8fd4c22aaa0483c062f20ba15463368#rd\"}]', NULL, NULL, '1', '2023-01-15 19:14:35', '1', '2023-01-15 11:18:13', b'1', 1), (97, 1, 'wx5b23ba7a5589ecbb', '回复图文', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:18:14', '1', '2023-01-15 11:26:07', b'1', 1), (98, 1, 'wx5b23ba7a5589ecbb', '文本', 't1', '97', 'click', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:18:14', '1', '2023-01-15 11:26:07', b'1', 1), (99, 1, 'wx5b23ba7a5589ecbb', '图片', 'pic', '97', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG.png', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:18:14', '1', '2023-01-15 11:26:07', b'1', 1), (100, 1, 'wx5b23ba7a5589ecbb', '语音', 'v3', '97', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA', 'http://test.yudao.iocoder.cn/a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA.mp3', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:18:14', '1', '2023-01-15 11:26:07', b'1', 1), (101, 1, 'wx5b23ba7a5589ecbb', '视频', 'o', '97', 'click', NULL, NULL, NULL, NULL, 'video', '', 'r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU.mp4', '我是视频', '我真的是视频', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:18:14', '1', '2023-01-15 11:26:07', b'1', 1), (102, 1, 'wx5b23ba7a5589ecbb', '图文', 'wx', '97', 'click', NULL, NULL, NULL, NULL, 'news', '', NULL, NULL, '', '', NULL, NULL, '[{\"title\":\"我是标题\",\"description\":null,\"picUrl\":\"http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=1&sn=dadf5d7e9aa594b58666fb2013fdf215&chksm=9f6354aea814ddb8fde13b17a34acbe86987b5c3403c6bd47e1e94977f6988b62653f6ab55e6#rd\"},{\"title\":\"我是标题 2\",\"description\":null,\"picUrl\":\"http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=2&sn=c8041e2fc639c07d73bbbb6f80cf1784&chksm=9f6354aea814ddb8f48d7b330252c0374878014feb45a8fd4c22aaa0483c062f20ba15463368#rd\"}]', NULL, NULL, '1', '2023-01-15 19:18:14', '1', '2023-01-15 11:26:07', b'1', 1), (103, 1, 'wx5b23ba7a5589ecbb', '测试', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:18:14', '1', '2023-01-15 11:26:07', b'1', 1), (104, 1, 'wx5b23ba7a5589ecbb', '跳转网页', NULL, '103', 'view', 'https://www.iocoder.cn', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:18:14', '1', '2023-01-15 11:26:07', b'1', 1), (105, 1, 'wx5b23ba7a5589ecbb', '回复图文', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:26:08', '1', '2023-01-15 11:33:57', b'1', 1), (106, 1, 'wx5b23ba7a5589ecbb', '文本', 't1', '105', 'click', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:26:08', '1', '2023-01-15 11:33:57', b'1', 1), (107, 1, 'wx5b23ba7a5589ecbb', '图片', 'pic', '105', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG.png', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:26:08', '1', '2023-01-15 11:33:57', b'1', 1), (108, 1, 'wx5b23ba7a5589ecbb', '语音', 'v3', '105', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA', 'http://test.yudao.iocoder.cn/a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA.mp3', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:26:08', '1', '2023-01-15 11:33:57', b'1', 1), (109, 1, 'wx5b23ba7a5589ecbb', '视频', 'o', '105', 'click', NULL, NULL, NULL, NULL, 'video', '', 'r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU.mp4', '我是视频', '我真的是视频', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:26:08', '1', '2023-01-15 11:33:57', b'1', 1), (110, 1, 'wx5b23ba7a5589ecbb', '图文', 'wx', '105', 'click', NULL, NULL, NULL, NULL, 'news', '', NULL, NULL, '', '', NULL, NULL, '[{\"title\":\"我是标题\",\"description\":null,\"picUrl\":\"http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=1&sn=dadf5d7e9aa594b58666fb2013fdf215&chksm=9f6354aea814ddb8fde13b17a34acbe86987b5c3403c6bd47e1e94977f6988b62653f6ab55e6#rd\"},{\"title\":\"我是标题 2\",\"description\":null,\"picUrl\":\"http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=2&sn=c8041e2fc639c07d73bbbb6f80cf1784&chksm=9f6354aea814ddb8f48d7b330252c0374878014feb45a8fd4c22aaa0483c062f20ba15463368#rd\"}]', NULL, NULL, '1', '2023-01-15 19:26:08', '1', '2023-01-15 11:33:57', b'1', 1), (111, 1, 'wx5b23ba7a5589ecbb', '测试', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:26:08', '1', '2023-01-15 11:33:57', b'1', 1), (112, 1, 'wx5b23ba7a5589ecbb', '跳转网页', NULL, '111', 'view', 'https://www.iocoder.cn', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:26:08', '1', '2023-01-15 11:33:57', b'1', 1), (113, 1, 'wx5b23ba7a5589ecbb', '扫码回复', 'test_02', '111', 'scancode_waitmsg', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:26:08', '1', '2023-01-15 11:33:57', b'1', 1), (114, 1, 'wx5b23ba7a5589ecbb', '回复图文', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:33:58', '1', '2023-01-15 11:44:54', b'1', 1), (115, 1, 'wx5b23ba7a5589ecbb', '文本', 't1', '114', 'click', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:33:58', '1', '2023-01-15 11:44:54', b'1', 1), (116, 1, 'wx5b23ba7a5589ecbb', '图片', 'pic', '114', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG.png', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:33:58', '1', '2023-01-15 11:44:54', b'1', 1), (117, 1, 'wx5b23ba7a5589ecbb', '语音', 'v3', '114', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA', 'http://test.yudao.iocoder.cn/a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA.mp3', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:33:58', '1', '2023-01-15 11:44:54', b'1', 1), (118, 1, 'wx5b23ba7a5589ecbb', '视频', 'o', '114', 'click', NULL, NULL, NULL, NULL, 'video', '', 'r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU.mp4', '我是视频', '我真的是视频', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:33:58', '1', '2023-01-15 11:44:54', b'1', 1), (119, 1, 'wx5b23ba7a5589ecbb', '图文', 'wx', '114', 'click', NULL, NULL, NULL, NULL, 'news', '', NULL, NULL, '', '', NULL, NULL, '[{\"title\":\"我是标题\",\"description\":null,\"picUrl\":\"http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=1&sn=dadf5d7e9aa594b58666fb2013fdf215&chksm=9f6354aea814ddb8fde13b17a34acbe86987b5c3403c6bd47e1e94977f6988b62653f6ab55e6#rd\"},{\"title\":\"我是标题 2\",\"description\":null,\"picUrl\":\"http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=2&sn=c8041e2fc639c07d73bbbb6f80cf1784&chksm=9f6354aea814ddb8f48d7b330252c0374878014feb45a8fd4c22aaa0483c062f20ba15463368#rd\"}]', NULL, NULL, '1', '2023-01-15 19:33:58', '1', '2023-01-15 11:44:54', b'1', 1), (120, 1, 'wx5b23ba7a5589ecbb', '测试', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:33:58', '1', '2023-01-15 11:44:54', b'1', 1), (121, 1, 'wx5b23ba7a5589ecbb', '跳转网页', NULL, '120', 'view', 'https://www.iocoder.cn', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:33:58', '1', '2023-01-15 11:44:54', b'1', 1), (122, 1, 'wx5b23ba7a5589ecbb', '扫码回复', 'test_02', '120', 'scancode_waitmsg', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:33:58', '1', '2023-01-15 11:44:54', b'1', 1), (123, 1, 'wx5b23ba7a5589ecbb', '扫码直接回结果', '2344455', '120', 'scancode_push', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:33:58', '1', '2023-01-15 11:44:54', b'1', 1), (124, 1, 'wx5b23ba7a5589ecbb', '回复图文', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (125, 1, 'wx5b23ba7a5589ecbb', '文本', 't1', '124', 'click', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (126, 1, 'wx5b23ba7a5589ecbb', '图片', 'pic', '124', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG.png', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (127, 1, 'wx5b23ba7a5589ecbb', '语音', 'v3', '124', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA', 'http://test.yudao.iocoder.cn/a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA.mp3', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (128, 1, 'wx5b23ba7a5589ecbb', '视频', 'o', '124', 'click', NULL, NULL, NULL, NULL, 'video', '', 'r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU.mp4', '我是视频', '我真的是视频', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (129, 1, 'wx5b23ba7a5589ecbb', '图文', 'wx', '124', 'click', NULL, NULL, NULL, NULL, 'news', '', NULL, NULL, '', '', NULL, NULL, '[{\"title\":\"我是标题\",\"description\":null,\"picUrl\":\"http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=1&sn=dadf5d7e9aa594b58666fb2013fdf215&chksm=9f6354aea814ddb8fde13b17a34acbe86987b5c3403c6bd47e1e94977f6988b62653f6ab55e6#rd\"},{\"title\":\"我是标题 2\",\"description\":null,\"picUrl\":\"http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=2&sn=c8041e2fc639c07d73bbbb6f80cf1784&chksm=9f6354aea814ddb8f48d7b330252c0374878014feb45a8fd4c22aaa0483c062f20ba15463368#rd\"}]', NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (130, 1, 'wx5b23ba7a5589ecbb', '测试', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (131, 1, 'wx5b23ba7a5589ecbb', '跳转网页', NULL, '130', 'view', 'https://www.iocoder.cn', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (132, 1, 'wx5b23ba7a5589ecbb', '扫码回复', 'test_02', '130', 'scancode_waitmsg', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (133, 1, 'wx5b23ba7a5589ecbb', '扫码直接回结果', '2344455', '130', 'scancode_push', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (134, 1, 'wx5b23ba7a5589ecbb', '系统拍照', '0x0', '130', 'pic_sysphoto', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (135, 1, 'wx5b23ba7a5589ecbb', '拍照或相册', '0x3', '130', 'pic_photo_or_album', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (136, 1, 'wx5b23ba7a5589ecbb', '测试2', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (137, 1, 'wx5b23ba7a5589ecbb', '微信相册', 'ppp2222', '136', 'pic_weixin', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (138, 1, 'wx5b23ba7a5589ecbb', '回复图文', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (139, 1, 'wx5b23ba7a5589ecbb', '文本', 't1', '138', 'click', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (140, 1, 'wx5b23ba7a5589ecbb', '图片', 'pic', '138', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG.png', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (141, 1, 'wx5b23ba7a5589ecbb', '语音', 'v3', '138', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA', 'http://test.yudao.iocoder.cn/a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA.mp3', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (142, 1, 'wx5b23ba7a5589ecbb', '视频', 'o', '138', 'click', NULL, NULL, NULL, NULL, 'video', '', 'r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU', 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU.mp4', '我是视频', '我真的是视频', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (143, 1, 'wx5b23ba7a5589ecbb', '图文', 'wx', '138', 'click', NULL, NULL, NULL, NULL, 'news', '', NULL, NULL, '', '', NULL, NULL, '[{\"title\":\"我是标题\",\"description\":null,\"picUrl\":\"http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=1&sn=dadf5d7e9aa594b58666fb2013fdf215&chksm=9f6354aea814ddb8fde13b17a34acbe86987b5c3403c6bd47e1e94977f6988b62653f6ab55e6#rd\"},{\"title\":\"我是标题 2\",\"description\":null,\"picUrl\":\"http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=2&sn=c8041e2fc639c07d73bbbb6f80cf1784&chksm=9f6354aea814ddb8f48d7b330252c0374878014feb45a8fd4c22aaa0483c062f20ba15463368#rd\"}]', NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (144, 1, 'wx5b23ba7a5589ecbb', '测试', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (145, 1, 'wx5b23ba7a5589ecbb', '跳转网页', NULL, '144', 'view', 'https://www.iocoder.cn', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (146, 1, 'wx5b23ba7a5589ecbb', '扫码回复', 'test_02', '144', 'scancode_waitmsg', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (147, 1, 'wx5b23ba7a5589ecbb', '扫码直接回结果', '2344455', '144', 'scancode_push', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (148, 1, 'wx5b23ba7a5589ecbb', '系统拍照', '0x0', '144', 'pic_sysphoto', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (149, 1, 'wx5b23ba7a5589ecbb', '拍照或相册', '0x3', '144', 'pic_photo_or_album', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (150, 1, 'wx5b23ba7a5589ecbb', '测试2', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (151, 1, 'wx5b23ba7a5589ecbb', '微信相册', 'ppp2222', '150', 'pic_weixin', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (152, 1, 'wx5b23ba7a5589ecbb', '选择地理位置', 'lll2', '150', 'location_select', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1); +INSERT INTO `mp_menu` (`id`, `account_id`, `app_id`, `name`, `menu_key`, `parent_id`, `type`, `url`, `mini_program_app_id`, `mini_program_page_path`, `article_id`, `reply_message_type`, `reply_content`, `reply_media_id`, `reply_media_url`, `reply_title`, `reply_description`, `reply_thumb_media_id`, `reply_thumb_media_url`, `reply_articles`, `reply_music_url`, `reply_hq_music_url`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, 1, 'wx5b23ba7a5589ecbb', '今日歌曲', 'V1001_TODAY_MUSIC', '0', 'click', NULL, NULL, NULL, NULL, 'text', '幸会幸会', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '', '2023-01-07 02:51:58', '', '2023-01-14 15:44:49', b'1', 1), (2, 1, 'wx5b23ba7a5589ecbb', '搜索', '', '0', 'view', 'http://www.soso.com/', NULL, NULL, NULL, 'text', '幸会幸会', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '', '2023-01-07 02:51:58', '', '2023-01-14 13:22:13', b'1', 1), (3, 1, 'wx5b23ba7a5589ecbb', '父按钮', '', '0', '', '', NULL, NULL, NULL, 'text', '幸会幸会', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '', '2023-01-07 02:51:58', '', '2023-01-14 15:44:49', b'1', 1), (4, 1, 'wx5b23ba7a5589ecbb', '归去来兮', 'MUSIC', '3', 'click', NULL, NULL, NULL, NULL, 'text', '幸会幸会', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '', '2023-01-07 02:51:58', '', '2023-01-14 15:44:49', b'1', 1), (5, 1, 'wx5b23ba7a5589ecbb', '不说', '', '3', 'view', 'http://www.soso.com/', NULL, NULL, NULL, 'text', '幸会幸会', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '', '2023-01-07 02:51:58', '', '2023-01-14 15:44:49', b'1', 1), (26, 1, 'wx5b23ba7a5589ecbb', '今日歌曲', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-14 23:44:50', '1', '2023-01-14 16:35:05', b'1', 1), (27, 1, 'wx5b23ba7a5589ecbb', '搜索', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-14 23:44:50', '1', '2023-01-14 16:35:05', b'1', 1), (28, 1, 'wx5b23ba7a5589ecbb', '父按钮', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-14 23:44:50', '1', '2023-01-14 16:35:05', b'1', 1), (29, 1, 'wx5b23ba7a5589ecbb', '归去来兮', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-14 23:44:50', '1', '2023-01-14 16:35:05', b'1', 1), (30, 1, 'wx5b23ba7a5589ecbb', '不说', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-14 23:44:50', '1', '2023-01-14 16:35:05', b'1', 1), (31, 1, 'wx5b23ba7a5589ecbb', '123', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 00:35:05', '1', '2023-01-14 16:35:43', b'1', 1), (32, 1, 'wx5b23ba7a5589ecbb', '123', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 00:35:43', '1', '2023-01-14 16:39:10', b'1', 1), (33, 1, 'wx5b23ba7a5589ecbb', '嘿嘿', NULL, '0', 'view', 'https://www.iocoder.cn', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 00:39:10', '1', '2023-01-14 16:40:09', b'1', 1), (38, 1, 'wx5b23ba7a5589ecbb', '顶级1', NULL, '0', 'view', 'https://www.iocoder.cn', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 00:42:54', '1', '2023-01-14 16:51:35', b'1', 1), (39, 1, 'wx5b23ba7a5589ecbb', '明星', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 00:42:54', '1', '2023-01-14 16:51:35', b'1', 1), (40, 1, 'wx5b23ba7a5589ecbb', '喊个', NULL, '39', 'view', 'https://www.iocoder.cn', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 00:42:54', '1', '2023-01-14 16:51:35', b'1', 1), (41, 1, 'wx5b23ba7a5589ecbb', 'haha', NULL, '39', 'view', 'http://soso.com', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 00:42:54', '1', '2023-01-14 16:51:35', b'1', 1), (42, 1, 'wx5b23ba7a5589ecbb', '顶级1', NULL, '0', 'view', 'https://www.iocoder.cn', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 00:51:35', '1', '2023-01-14 16:51:53', b'1', 1), (43, 1, 'wx5b23ba7a5589ecbb', '明星', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 00:51:35', '1', '2023-01-14 16:51:53', b'1', 1), (44, 1, 'wx5b23ba7a5589ecbb', '喊个', NULL, '43', 'view', 'https://www.iocoder.cn', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 00:51:35', '1', '2023-01-14 16:51:53', b'1', 1), (45, 1, 'wx5b23ba7a5589ecbb', 'haha', NULL, '43', 'view', 'http://soso.com', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 00:51:35', '1', '2023-01-14 16:51:53', b'1', 1), (46, 1, 'wx5b23ba7a5589ecbb', '测试菜单', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 11:32:17', '1', '2023-01-15 04:39:11', b'1', 1), (47, 1, 'wx5b23ba7a5589ecbb', '跳转网页', NULL, '46', 'view', 'https://www.iocoder.cn', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 11:32:17', '1', '2023-01-15 04:39:11', b'1', 1), (48, 1, 'wx5b23ba7a5589ecbb', '点击回复', '123', '0', 'click', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', '1', '2023-01-15 12:39:12', '1', '2023-01-15 09:19:01', b'1', 1), (49, 1, 'wx5b23ba7a5589ecbb', '点击回复', '123', '0', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG.png', '', '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:19:02', '1', '2023-01-15 09:26:50', b'1', 1), (50, 1, 'wx5b23ba7a5589ecbb', '点击回复', '123', '0', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg', 'http://test.fuxiaoaio.iocoder.cn/a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg.mp3', '', '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:26:51', '1', '2023-01-15 09:27:39', b'1', 1), (51, 1, 'wx5b23ba7a5589ecbb', '点击回复', '123', '0', 'click', NULL, NULL, NULL, NULL, 'video', '', 'XQockIDz-7p8wHuI0wxzd2dZvhKWrQnxM5pPXvaW8Qsid2hLjVxk90wM47ZsYERT', 'http://test.fuxiaoaio.iocoder.cn/XQockIDz-7p8wHuI0wxzd2dZvhKWrQnxM5pPXvaW8Qsid2hLjVxk90wM47ZsYERT.mp4', '奥特曼', '奥特快', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:27:40', '1', '2023-01-15 09:28:20', b'1', 1), (52, 1, 'wx5b23ba7a5589ecbb', '点击回复', '123', '0', 'click', NULL, NULL, NULL, NULL, 'video', '', 'XQockIDz-7p8wHuI0wxzd2dZvhKWrQnxM5pPXvaW8Qsid2hLjVxk90wM47ZsYERT', 'http://test.fuxiaoaio.iocoder.cn/XQockIDz-7p8wHuI0wxzd2dZvhKWrQnxM5pPXvaW8Qsid2hLjVxk90wM47ZsYERT.mp4', NULL, '奥特快', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:28:21', '1', '2023-01-15 09:29:21', b'1', 1), (53, 1, 'wx5b23ba7a5589ecbb', '点击回复', '123', '0', 'click', NULL, NULL, NULL, NULL, 'video', '', 'XQockIDz-7p8wHuI0wxzd2dZvhKWrQnxM5pPXvaW8Qsid2hLjVxk90wM47ZsYERT', 'http://test.fuxiaoaio.iocoder.cn/XQockIDz-7p8wHuI0wxzd2dZvhKWrQnxM5pPXvaW8Qsid2hLjVxk90wM47ZsYERT.mp4', NULL, '奥特快', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:29:22', '1', '2023-01-15 09:32:49', b'1', 1), (54, 1, 'wx5b23ba7a5589ecbb', '回复图片', '01', '0', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG.png', '', '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:29:22', '1', '2023-01-15 09:32:49', b'1', 1), (55, 1, 'wx5b23ba7a5589ecbb', '回复图片', 'image', '0', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-jVixJGgnBnkBPRbuVptOW0CHYuQFyiOVNtamctS8xU8', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-jVixJGgnBnkBPRbuVptOW0CHYuQFyiOVNtamctS8xU8.jpg', '', '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:33:06', '1', '2023-01-15 09:33:45', b'1', 1), (56, 1, 'wx5b23ba7a5589ecbb', '回复图片', 'image', '0', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-jVixJGgnBnkBPRbuVptOW0CHYuQFyiOVNtamctS8xU8', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-jVixJGgnBnkBPRbuVptOW0CHYuQFyiOVNtamctS8xU8.jpg', NULL, '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:33:45', '1', '2023-01-15 09:33:55', b'1', 1), (57, 1, 'wx5b23ba7a5589ecbb', '回复语音', 'aoteman', '0', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg', 'http://test.fuxiaoaio.iocoder.cn/a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg.mp3', '', '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:33:45', '1', '2023-01-15 09:33:55', b'1', 1), (58, 1, 'wx5b23ba7a5589ecbb', '回复图片', 'image', '0', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-jVixJGgnBnkBPRbuVptOW0CHYuQFyiOVNtamctS8xU8', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-jVixJGgnBnkBPRbuVptOW0CHYuQFyiOVNtamctS8xU8.jpg', NULL, '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:33:56', '1', '2023-01-15 09:34:02', b'1', 1), (59, 1, 'wx5b23ba7a5589ecbb', '回复语音', 'aoteman', '0', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg', 'http://test.fuxiaoaio.iocoder.cn/a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg.mp3', NULL, '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:33:56', '1', '2023-01-15 09:34:02', b'1', 1), (60, 1, 'wx5b23ba7a5589ecbb', '回复图片', 'image', '0', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-jVixJGgnBnkBPRbuVptOW0CHYuQFyiOVNtamctS8xU8', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-jVixJGgnBnkBPRbuVptOW0CHYuQFyiOVNtamctS8xU8.jpg', NULL, '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:34:02', '1', '2023-01-15 09:34:44', b'1', 1), (61, 1, 'wx5b23ba7a5589ecbb', '回复语音', 'aoteman', '0', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg', 'http://test.fuxiaoaio.iocoder.cn/a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg.mp3', NULL, '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:34:02', '1', '2023-01-15 09:34:44', b'1', 1), (62, 1, 'wx5b23ba7a5589ecbb', '回复语音', 'aoteman', '0', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg', 'http://test.fuxiaoaio.iocoder.cn/a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg.mp3', NULL, '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:34:45', '1', '2023-01-15 09:36:27', b'1', 1), (63, 1, 'wx5b23ba7a5589ecbb', '回复语音', 'aoteman', '0', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg', 'http://test.fuxiaoaio.iocoder.cn/a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg.mp3', NULL, '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:36:28', '1', '2023-01-15 09:37:20', b'1', 1), (64, 1, 'wx5b23ba7a5589ecbb', '回复语音', 'aoteman', '0', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg', 'http://test.fuxiaoaio.iocoder.cn/a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg.mp3', NULL, '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:37:21', '1', '2023-01-15 09:40:13', b'1', 1), (65, 1, 'wx5b23ba7a5589ecbb', '回复语音', 'aoteman', '0', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg', 'http://test.fuxiaoaio.iocoder.cn/a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg.mp3', NULL, '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:40:14', '1', '2023-01-15 09:40:24', b'1', 1), (66, 1, 'wx5b23ba7a5589ecbb', '回复语音', 'aoteman', '0', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg', 'http://test.fuxiaoaio.iocoder.cn/a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg.mp3', NULL, '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:40:24', '1', '2023-01-15 09:41:12', b'1', 1), (67, 1, 'wx5b23ba7a5589ecbb', '回复语音', 'aoteman', '0', 'click', NULL, NULL, NULL, NULL, 'video', '', 'a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg', 'http://test.fuxiaoaio.iocoder.cn/a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg.mp3', '', '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:41:13', '1', '2023-01-15 09:43:32', b'1', 1), (68, 1, 'wx5b23ba7a5589ecbb', '回复视频', '123', '0', 'click', NULL, NULL, NULL, NULL, 'video', '', 'r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU.mp4', '我是视频', '我真的是视频', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:41:13', '1', '2023-01-15 09:43:32', b'1', 1), (69, 1, 'wx5b23ba7a5589ecbb', '回复语音', 'aoteman', '0', 'click', NULL, NULL, NULL, NULL, 'video', '', 'a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg', 'http://test.fuxiaoaio.iocoder.cn/a6kOoewXIbX57gB0kCb_Gz-Yg8hVk5OgQ6iWZU_KSOEhpQ31JmkGh0JYPKgi9ebKPthnsckQbQVWfiN58VLrfg.mp3', NULL, '', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:43:33', '1', '2023-01-15 10:06:28', b'1', 1), (70, 1, 'wx5b23ba7a5589ecbb', '回复视频', '123', '0', 'click', NULL, NULL, NULL, NULL, 'video', '', 'r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU.mp4', NULL, '我真的是视频', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:43:33', '1', '2023-01-15 10:06:28', b'1', 1), (71, 1, 'wx5b23ba7a5589ecbb', '回复音乐', 'ao11', '0', 'click', NULL, NULL, NULL, NULL, 'music', '', NULL, NULL, '1', '2', NULL, NULL, NULL, '', '', '1', '2023-01-15 17:43:33', '1', '2023-01-15 10:06:28', b'1', 1), (72, 1, 'wx5b23ba7a5589ecbb', '回复音乐', '01', '0', 'click', NULL, NULL, NULL, NULL, 'music', '', NULL, NULL, '1', '2', 'wBnOlFbeYaWXb7AVX5Ha_Uy373JHA2EoS0FUziAhkwP0r6Hv43PeQHXKY4GADfbl', 'http://test.fuxiaoaio.iocoder.cn/wBnOlFbeYaWXb7AVX5Ha_Uy373JHA2EoS0FUziAhkwP0r6Hv43PeQHXKY4GADfbl.png', NULL, 'https://www.iocoder.cn/1.mp3', 'https://www.iocoder.cn/2.mp3', '1', '2023-01-15 18:16:12', '1', '2023-01-15 10:21:13', b'1', 1), (73, 1, 'wx5b23ba7a5589ecbb', '回复音乐', '01', '0', 'click', NULL, NULL, NULL, NULL, 'music', '', NULL, NULL, '1', '2', 'wBnOlFbeYaWXb7AVX5Ha_Uy373JHA2EoS0FUziAhkwP0r6Hv43PeQHXKY4GADfbl', 'http://test.fuxiaoaio.iocoder.cn/wBnOlFbeYaWXb7AVX5Ha_Uy373JHA2EoS0FUziAhkwP0r6Hv43PeQHXKY4GADfbl.png', NULL, 'https://www.iocoder.cn/1.mp3', 'https://www.iocoder.cn/2.mp3', '1', '2023-01-15 18:21:14', '1', '2023-01-15 10:21:36', b'1', 1), (74, 1, 'wx5b23ba7a5589ecbb', '回复音乐', '01', '0', 'click', NULL, NULL, NULL, NULL, 'music', '', NULL, NULL, '1', '2', 'wBnOlFbeYaWXb7AVX5Ha_Uy373JHA2EoS0FUziAhkwP0r6Hv43PeQHXKY4GADfbl', 'http://test.fuxiaoaio.iocoder.cn/wBnOlFbeYaWXb7AVX5Ha_Uy373JHA2EoS0FUziAhkwP0r6Hv43PeQHXKY4GADfbl.png', NULL, 'https://www.iocoder.cn/1.mp3', 'https://www.iocoder.cn/2.mp3', '1', '2023-01-15 18:21:36', '1', '2023-01-15 10:21:59', b'1', 1), (75, 1, 'wx5b23ba7a5589ecbb', '回复图文', 'music', '0', 'click', NULL, NULL, NULL, NULL, 'news', '', NULL, NULL, '', '', NULL, NULL, '[{\"title\":\"我是标题\",\"description\":null,\"picUrl\":\"http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=1&sn=dadf5d7e9aa594b58666fb2013fdf215&chksm=9f6354aea814ddb8fde13b17a34acbe86987b5c3403c6bd47e1e94977f6988b62653f6ab55e6#rd\"},{\"title\":\"我是标题 2\",\"description\":null,\"picUrl\":\"http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=2&sn=c8041e2fc639c07d73bbbb6f80cf1784&chksm=9f6354aea814ddb8f48d7b330252c0374878014feb45a8fd4c22aaa0483c062f20ba15463368#rd\"}]', NULL, NULL, '1', '2023-01-15 18:23:23', '1', '2023-01-15 10:23:53', b'1', 1), (76, 1, 'wx5b23ba7a5589ecbb', '回复图文', 'music', '0', 'click', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, '', '', NULL, NULL, '[{\"title\":\"我是标题\",\"description\":null,\"picUrl\":\"http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=1&sn=dadf5d7e9aa594b58666fb2013fdf215&chksm=9f6354aea814ddb8fde13b17a34acbe86987b5c3403c6bd47e1e94977f6988b62653f6ab55e6#rd\"},{\"title\":\"我是标题 2\",\"description\":null,\"picUrl\":\"http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=2&sn=c8041e2fc639c07d73bbbb6f80cf1784&chksm=9f6354aea814ddb8f48d7b330252c0374878014feb45a8fd4c22aaa0483c062f20ba15463368#rd\"}]', NULL, NULL, '1', '2023-01-15 18:23:54', '1', '2023-01-15 11:13:21', b'1', 1), (77, 1, 'wx5b23ba7a5589ecbb', '回复图文', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:13:21', '1', '2023-01-15 11:13:36', b'1', 1), (78, 1, 'wx5b23ba7a5589ecbb', '文本', 't1', '77', 'click', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:13:21', '1', '2023-01-15 11:13:36', b'1', 1), (79, 1, 'wx5b23ba7a5589ecbb', '回复图文', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:13:36', '1', '2023-01-15 11:13:49', b'1', 1), (80, 1, 'wx5b23ba7a5589ecbb', '文本', 't1', '79', 'click', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:13:36', '1', '2023-01-15 11:13:49', b'1', 1), (81, 1, 'wx5b23ba7a5589ecbb', '图片', 'pic', '79', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG.png', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:13:36', '1', '2023-01-15 11:13:49', b'1', 1), (82, 1, 'wx5b23ba7a5589ecbb', '回复图文', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:13:49', '1', '2023-01-15 11:14:06', b'1', 1), (83, 1, 'wx5b23ba7a5589ecbb', '文本', 't1', '82', 'click', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:13:49', '1', '2023-01-15 11:14:06', b'1', 1), (84, 1, 'wx5b23ba7a5589ecbb', '图片', 'pic', '82', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG.png', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:13:49', '1', '2023-01-15 11:14:06', b'1', 1), (85, 1, 'wx5b23ba7a5589ecbb', '语音', 'v3', '82', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA', 'http://test.fuxiaoaio.iocoder.cn/a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA.mp3', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:13:49', '1', '2023-01-15 11:14:06', b'1', 1), (86, 1, 'wx5b23ba7a5589ecbb', '回复图文', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:14:07', '1', '2023-01-15 11:14:35', b'1', 1), (87, 1, 'wx5b23ba7a5589ecbb', '文本', 't1', '86', 'click', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:14:07', '1', '2023-01-15 11:14:35', b'1', 1), (88, 1, 'wx5b23ba7a5589ecbb', '图片', 'pic', '86', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG.png', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:14:07', '1', '2023-01-15 11:14:35', b'1', 1), (89, 1, 'wx5b23ba7a5589ecbb', '语音', 'v3', '86', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA', 'http://test.fuxiaoaio.iocoder.cn/a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA.mp3', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:14:07', '1', '2023-01-15 11:14:35', b'1', 1), (90, 1, 'wx5b23ba7a5589ecbb', '子菜单名称', 'o', '86', 'click', NULL, NULL, NULL, NULL, 'video', '', 'r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU.mp4', '我是视频', '我真的是视频', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:14:07', '1', '2023-01-15 11:14:35', b'1', 1), (91, 1, 'wx5b23ba7a5589ecbb', '回复图文', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:14:35', '1', '2023-01-15 11:18:13', b'1', 1), (92, 1, 'wx5b23ba7a5589ecbb', '文本', 't1', '91', 'click', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:14:35', '1', '2023-01-15 11:18:13', b'1', 1), (93, 1, 'wx5b23ba7a5589ecbb', '图片', 'pic', '91', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG.png', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:14:35', '1', '2023-01-15 11:18:13', b'1', 1), (94, 1, 'wx5b23ba7a5589ecbb', '语音', 'v3', '91', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA', 'http://test.fuxiaoaio.iocoder.cn/a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA.mp3', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:14:35', '1', '2023-01-15 11:18:13', b'1', 1), (95, 1, 'wx5b23ba7a5589ecbb', '视频', 'o', '91', 'click', NULL, NULL, NULL, NULL, 'video', '', 'r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU.mp4', '我是视频', '我真的是视频', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:14:35', '1', '2023-01-15 11:18:13', b'1', 1), (96, 1, 'wx5b23ba7a5589ecbb', '图文', 'wx', '91', 'click', NULL, NULL, NULL, NULL, 'news', '', NULL, NULL, '', '', NULL, NULL, '[{\"title\":\"我是标题\",\"description\":null,\"picUrl\":\"http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=1&sn=dadf5d7e9aa594b58666fb2013fdf215&chksm=9f6354aea814ddb8fde13b17a34acbe86987b5c3403c6bd47e1e94977f6988b62653f6ab55e6#rd\"},{\"title\":\"我是标题 2\",\"description\":null,\"picUrl\":\"http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=2&sn=c8041e2fc639c07d73bbbb6f80cf1784&chksm=9f6354aea814ddb8f48d7b330252c0374878014feb45a8fd4c22aaa0483c062f20ba15463368#rd\"}]', NULL, NULL, '1', '2023-01-15 19:14:35', '1', '2023-01-15 11:18:13', b'1', 1), (97, 1, 'wx5b23ba7a5589ecbb', '回复图文', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:18:14', '1', '2023-01-15 11:26:07', b'1', 1), (98, 1, 'wx5b23ba7a5589ecbb', '文本', 't1', '97', 'click', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:18:14', '1', '2023-01-15 11:26:07', b'1', 1), (99, 1, 'wx5b23ba7a5589ecbb', '图片', 'pic', '97', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG.png', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:18:14', '1', '2023-01-15 11:26:07', b'1', 1), (100, 1, 'wx5b23ba7a5589ecbb', '语音', 'v3', '97', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA', 'http://test.fuxiaoaio.iocoder.cn/a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA.mp3', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:18:14', '1', '2023-01-15 11:26:07', b'1', 1), (101, 1, 'wx5b23ba7a5589ecbb', '视频', 'o', '97', 'click', NULL, NULL, NULL, NULL, 'video', '', 'r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU.mp4', '我是视频', '我真的是视频', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:18:14', '1', '2023-01-15 11:26:07', b'1', 1), (102, 1, 'wx5b23ba7a5589ecbb', '图文', 'wx', '97', 'click', NULL, NULL, NULL, NULL, 'news', '', NULL, NULL, '', '', NULL, NULL, '[{\"title\":\"我是标题\",\"description\":null,\"picUrl\":\"http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=1&sn=dadf5d7e9aa594b58666fb2013fdf215&chksm=9f6354aea814ddb8fde13b17a34acbe86987b5c3403c6bd47e1e94977f6988b62653f6ab55e6#rd\"},{\"title\":\"我是标题 2\",\"description\":null,\"picUrl\":\"http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=2&sn=c8041e2fc639c07d73bbbb6f80cf1784&chksm=9f6354aea814ddb8f48d7b330252c0374878014feb45a8fd4c22aaa0483c062f20ba15463368#rd\"}]', NULL, NULL, '1', '2023-01-15 19:18:14', '1', '2023-01-15 11:26:07', b'1', 1), (103, 1, 'wx5b23ba7a5589ecbb', '测试', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:18:14', '1', '2023-01-15 11:26:07', b'1', 1), (104, 1, 'wx5b23ba7a5589ecbb', '跳转网页', NULL, '103', 'view', 'https://www.iocoder.cn', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:18:14', '1', '2023-01-15 11:26:07', b'1', 1), (105, 1, 'wx5b23ba7a5589ecbb', '回复图文', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:26:08', '1', '2023-01-15 11:33:57', b'1', 1), (106, 1, 'wx5b23ba7a5589ecbb', '文本', 't1', '105', 'click', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:26:08', '1', '2023-01-15 11:33:57', b'1', 1), (107, 1, 'wx5b23ba7a5589ecbb', '图片', 'pic', '105', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG.png', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:26:08', '1', '2023-01-15 11:33:57', b'1', 1), (108, 1, 'wx5b23ba7a5589ecbb', '语音', 'v3', '105', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA', 'http://test.fuxiaoaio.iocoder.cn/a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA.mp3', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:26:08', '1', '2023-01-15 11:33:57', b'1', 1), (109, 1, 'wx5b23ba7a5589ecbb', '视频', 'o', '105', 'click', NULL, NULL, NULL, NULL, 'video', '', 'r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU.mp4', '我是视频', '我真的是视频', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:26:08', '1', '2023-01-15 11:33:57', b'1', 1), (110, 1, 'wx5b23ba7a5589ecbb', '图文', 'wx', '105', 'click', NULL, NULL, NULL, NULL, 'news', '', NULL, NULL, '', '', NULL, NULL, '[{\"title\":\"我是标题\",\"description\":null,\"picUrl\":\"http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=1&sn=dadf5d7e9aa594b58666fb2013fdf215&chksm=9f6354aea814ddb8fde13b17a34acbe86987b5c3403c6bd47e1e94977f6988b62653f6ab55e6#rd\"},{\"title\":\"我是标题 2\",\"description\":null,\"picUrl\":\"http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=2&sn=c8041e2fc639c07d73bbbb6f80cf1784&chksm=9f6354aea814ddb8f48d7b330252c0374878014feb45a8fd4c22aaa0483c062f20ba15463368#rd\"}]', NULL, NULL, '1', '2023-01-15 19:26:08', '1', '2023-01-15 11:33:57', b'1', 1), (111, 1, 'wx5b23ba7a5589ecbb', '测试', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:26:08', '1', '2023-01-15 11:33:57', b'1', 1), (112, 1, 'wx5b23ba7a5589ecbb', '跳转网页', NULL, '111', 'view', 'https://www.iocoder.cn', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:26:08', '1', '2023-01-15 11:33:57', b'1', 1), (113, 1, 'wx5b23ba7a5589ecbb', '扫码回复', 'test_02', '111', 'scancode_waitmsg', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:26:08', '1', '2023-01-15 11:33:57', b'1', 1), (114, 1, 'wx5b23ba7a5589ecbb', '回复图文', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:33:58', '1', '2023-01-15 11:44:54', b'1', 1), (115, 1, 'wx5b23ba7a5589ecbb', '文本', 't1', '114', 'click', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:33:58', '1', '2023-01-15 11:44:54', b'1', 1), (116, 1, 'wx5b23ba7a5589ecbb', '图片', 'pic', '114', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG.png', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:33:58', '1', '2023-01-15 11:44:54', b'1', 1), (117, 1, 'wx5b23ba7a5589ecbb', '语音', 'v3', '114', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA', 'http://test.fuxiaoaio.iocoder.cn/a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA.mp3', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:33:58', '1', '2023-01-15 11:44:54', b'1', 1), (118, 1, 'wx5b23ba7a5589ecbb', '视频', 'o', '114', 'click', NULL, NULL, NULL, NULL, 'video', '', 'r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU.mp4', '我是视频', '我真的是视频', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:33:58', '1', '2023-01-15 11:44:54', b'1', 1), (119, 1, 'wx5b23ba7a5589ecbb', '图文', 'wx', '114', 'click', NULL, NULL, NULL, NULL, 'news', '', NULL, NULL, '', '', NULL, NULL, '[{\"title\":\"我是标题\",\"description\":null,\"picUrl\":\"http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=1&sn=dadf5d7e9aa594b58666fb2013fdf215&chksm=9f6354aea814ddb8fde13b17a34acbe86987b5c3403c6bd47e1e94977f6988b62653f6ab55e6#rd\"},{\"title\":\"我是标题 2\",\"description\":null,\"picUrl\":\"http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=2&sn=c8041e2fc639c07d73bbbb6f80cf1784&chksm=9f6354aea814ddb8f48d7b330252c0374878014feb45a8fd4c22aaa0483c062f20ba15463368#rd\"}]', NULL, NULL, '1', '2023-01-15 19:33:58', '1', '2023-01-15 11:44:54', b'1', 1), (120, 1, 'wx5b23ba7a5589ecbb', '测试', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:33:58', '1', '2023-01-15 11:44:54', b'1', 1), (121, 1, 'wx5b23ba7a5589ecbb', '跳转网页', NULL, '120', 'view', 'https://www.iocoder.cn', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:33:58', '1', '2023-01-15 11:44:54', b'1', 1), (122, 1, 'wx5b23ba7a5589ecbb', '扫码回复', 'test_02', '120', 'scancode_waitmsg', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:33:58', '1', '2023-01-15 11:44:54', b'1', 1), (123, 1, 'wx5b23ba7a5589ecbb', '扫码直接回结果', '2344455', '120', 'scancode_push', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:33:58', '1', '2023-01-15 11:44:54', b'1', 1), (124, 1, 'wx5b23ba7a5589ecbb', '回复图文', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (125, 1, 'wx5b23ba7a5589ecbb', '文本', 't1', '124', 'click', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (126, 1, 'wx5b23ba7a5589ecbb', '图片', 'pic', '124', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG.png', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (127, 1, 'wx5b23ba7a5589ecbb', '语音', 'v3', '124', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA', 'http://test.fuxiaoaio.iocoder.cn/a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA.mp3', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (128, 1, 'wx5b23ba7a5589ecbb', '视频', 'o', '124', 'click', NULL, NULL, NULL, NULL, 'video', '', 'r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU.mp4', '我是视频', '我真的是视频', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (129, 1, 'wx5b23ba7a5589ecbb', '图文', 'wx', '124', 'click', NULL, NULL, NULL, NULL, 'news', '', NULL, NULL, '', '', NULL, NULL, '[{\"title\":\"我是标题\",\"description\":null,\"picUrl\":\"http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=1&sn=dadf5d7e9aa594b58666fb2013fdf215&chksm=9f6354aea814ddb8fde13b17a34acbe86987b5c3403c6bd47e1e94977f6988b62653f6ab55e6#rd\"},{\"title\":\"我是标题 2\",\"description\":null,\"picUrl\":\"http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=2&sn=c8041e2fc639c07d73bbbb6f80cf1784&chksm=9f6354aea814ddb8f48d7b330252c0374878014feb45a8fd4c22aaa0483c062f20ba15463368#rd\"}]', NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (130, 1, 'wx5b23ba7a5589ecbb', '测试', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (131, 1, 'wx5b23ba7a5589ecbb', '跳转网页', NULL, '130', 'view', 'https://www.iocoder.cn', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (132, 1, 'wx5b23ba7a5589ecbb', '扫码回复', 'test_02', '130', 'scancode_waitmsg', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (133, 1, 'wx5b23ba7a5589ecbb', '扫码直接回结果', '2344455', '130', 'scancode_push', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (134, 1, 'wx5b23ba7a5589ecbb', '系统拍照', '0x0', '130', 'pic_sysphoto', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (135, 1, 'wx5b23ba7a5589ecbb', '拍照或相册', '0x3', '130', 'pic_photo_or_album', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (136, 1, 'wx5b23ba7a5589ecbb', '测试2', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (137, 1, 'wx5b23ba7a5589ecbb', '微信相册', 'ppp2222', '136', 'pic_weixin', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:44:55', '1', '2023-01-15 11:52:04', b'1', 1), (138, 1, 'wx5b23ba7a5589ecbb', '回复图文', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (139, 1, 'wx5b23ba7a5589ecbb', '文本', 't1', '138', 'click', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (140, 1, 'wx5b23ba7a5589ecbb', '图片', 'pic', '138', 'click', NULL, NULL, NULL, NULL, 'image', '', 'r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG.png', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (141, 1, 'wx5b23ba7a5589ecbb', '语音', 'v3', '138', 'click', NULL, NULL, NULL, NULL, 'voice', '', 'a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA', 'http://test.fuxiaoaio.iocoder.cn/a6kOoewXIbX57gB0kCb_G0h41eeCLWXi-DiMGrPG1iQwjuxGoAoDZCqt6J7IrUrjYwTfa9dGyTJ7qbQ-8TlNrA.mp3', '', '', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (142, 1, 'wx5b23ba7a5589ecbb', '视频', 'o', '138', 'click', NULL, NULL, NULL, NULL, 'video', '', 'r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU', 'http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-v2-X9sD87sdZ8qoWWgu9QgP2NEjlTvDJ47KfF2xhyiU.mp4', '我是视频', '我真的是视频', NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (143, 1, 'wx5b23ba7a5589ecbb', '图文', 'wx', '138', 'click', NULL, NULL, NULL, NULL, 'news', '', NULL, NULL, '', '', NULL, NULL, '[{\"title\":\"我是标题\",\"description\":null,\"picUrl\":\"http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=1&sn=dadf5d7e9aa594b58666fb2013fdf215&chksm=9f6354aea814ddb8fde13b17a34acbe86987b5c3403c6bd47e1e94977f6988b62653f6ab55e6#rd\"},{\"title\":\"我是标题 2\",\"description\":null,\"picUrl\":\"http://test.fuxiaoaio.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png\",\"url\":\"http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&mid=2247483662&idx=2&sn=c8041e2fc639c07d73bbbb6f80cf1784&chksm=9f6354aea814ddb8f48d7b330252c0374878014feb45a8fd4c22aaa0483c062f20ba15463368#rd\"}]', NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (144, 1, 'wx5b23ba7a5589ecbb', '测试', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (145, 1, 'wx5b23ba7a5589ecbb', '跳转网页', NULL, '144', 'view', 'https://www.iocoder.cn', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (146, 1, 'wx5b23ba7a5589ecbb', '扫码回复', 'test_02', '144', 'scancode_waitmsg', NULL, NULL, NULL, NULL, 'text', '123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (147, 1, 'wx5b23ba7a5589ecbb', '扫码直接回结果', '2344455', '144', 'scancode_push', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (148, 1, 'wx5b23ba7a5589ecbb', '系统拍照', '0x0', '144', 'pic_sysphoto', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (149, 1, 'wx5b23ba7a5589ecbb', '拍照或相册', '0x3', '144', 'pic_photo_or_album', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (150, 1, 'wx5b23ba7a5589ecbb', '测试2', NULL, '0', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (151, 1, 'wx5b23ba7a5589ecbb', '微信相册', 'ppp2222', '150', 'pic_weixin', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1), (152, 1, 'wx5b23ba7a5589ecbb', '选择地理位置', 'lll2', '150', 'location_select', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', '2023-01-15 19:52:04', '1', '2023-01-15 13:20:22', b'1', 1); COMMIT; -- ---------------------------- diff --git a/sql/mysql/ruoyi-vue-pro.sql b/sql/mysql/ruoyi-vue-pro.sql index 65e94c88d..6b36710d6 100644 --- a/sql/mysql/ruoyi-vue-pro.sql +++ b/sql/mysql/ruoyi-vue-pro.sql @@ -132,7 +132,7 @@ CREATE TABLE `QRTZ_JOB_DETAILS` ( -- Records of QRTZ_JOB_DETAILS -- ---------------------------- BEGIN; -INSERT INTO `QRTZ_JOB_DETAILS` (`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`, `DESCRIPTION`, `JOB_CLASS_NAME`, `IS_DURABLE`, `IS_NONCONCURRENT`, `IS_UPDATE_DATA`, `REQUESTS_RECOVERY`, `JOB_DATA`) VALUES ('schedulerName', 'payNotifyJob', 'DEFAULT', NULL, 'cn.iocoder.yudao.framework.quartz.core.handler.JobHandlerInvoker', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B020000787000000000000000057400104A4F425F48414E444C45525F4E414D4574000C7061794E6F746966794A6F627800); +INSERT INTO `QRTZ_JOB_DETAILS` (`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`, `DESCRIPTION`, `JOB_CLASS_NAME`, `IS_DURABLE`, `IS_NONCONCURRENT`, `IS_UPDATE_DATA`, `REQUESTS_RECOVERY`, `JOB_DATA`) VALUES ('schedulerName', 'payNotifyJob', 'DEFAULT', NULL, 'cn.fuxiaoaio.ygg.framework.quartz.core.handler.JobHandlerInvoker', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B020000787000000000000000057400104A4F425F48414E444C45525F4E414D4574000C7061794E6F746966794A6F627800); COMMIT; -- ---------------------------- @@ -730,12 +730,12 @@ CREATE TABLE `infra_file_config` ( -- Records of infra_file_config -- ---------------------------- BEGIN; -INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (4, '数据库', 1, '我是数据库', b'1', '{\"@class\":\"cn.iocoder.yudao.framework.file.core.client.db.DBFileClientConfig\",\"domain\":\"http://127.0.0.1:48080\"}', '1', '2022-03-15 23:56:24', '1', '2023-04-08 09:44:47', b'0'); -INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (5, '本地磁盘', 10, '测试下本地存储', b'0', '{\"@class\":\"cn.iocoder.yudao.framework.file.core.client.local.LocalFileClientConfig\",\"basePath\":\"/Users/yunai/file_test\",\"domain\":\"http://127.0.0.1:48080\"}', '1', '2022-03-15 23:57:00', '1', '2023-04-08 09:44:47', b'0'); -INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (11, 'S3 - 七牛云', 20, NULL, b'0', '{\"@class\":\"cn.iocoder.yudao.framework.file.core.client.s3.S3FileClientConfig\",\"endpoint\":\"s3-cn-south-1.qiniucs.com\",\"domain\":\"http://test.yudao.iocoder.cn\",\"bucket\":\"ruoyi-vue-pro\",\"accessKey\":\"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8\",\"accessSecret\":\"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP\"}', '1', '2022-03-19 18:00:03', '1', '2023-04-08 09:44:47', b'0'); -INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (15, 'S3 - 七牛云', 20, '', b'0', '{\"@class\":\"cn.iocoder.yudao.framework.file.core.client.s3.S3FileClientConfig\",\"endpoint\":\"s3-cn-south-1.qiniucs.com\",\"domain\":\"http://test.yudao.iocoder.cn\",\"bucket\":\"ruoyi-vue-pro\",\"accessKey\":\"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8\",\"accessSecret\":\"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP\"}', '1', '2022-06-10 20:50:41', '1', '2023-04-08 09:44:47', b'0'); -INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (16, 'S3 - 七牛云', 20, '', b'0', '{\"@class\":\"cn.iocoder.yudao.framework.file.core.client.s3.S3FileClientConfig\",\"endpoint\":\"s3-cn-south-1.qiniucs.com\",\"domain\":\"http://test.yudao.iocoder.cn\",\"bucket\":\"ruoyi-vue-pro\",\"accessKey\":\"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8\",\"accessSecret\":\"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP\"}', '1', '2022-06-11 20:32:08', '1', '2023-04-08 09:44:47', b'0'); -INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (17, 'S3 - 七牛云', 20, '', b'0', '{\"@class\":\"cn.iocoder.yudao.framework.file.core.client.s3.S3FileClientConfig\",\"endpoint\":\"s3-cn-south-1.qiniucs.com\",\"domain\":\"http://test.yudao.iocoder.cn\",\"bucket\":\"ruoyi-vue-pro\",\"accessKey\":\"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8\",\"accessSecret\":\"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP\"}', '1', '2022-06-11 20:32:47', '1', '2023-04-08 09:44:47', b'0'); +INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (4, '数据库', 1, '我是数据库', b'1', '{\"@class\":\"cn.fuxiaoaio.ygg.framework.file.core.client.db.DBFileClientConfig\",\"domain\":\"http://127.0.0.1:48080\"}', '1', '2022-03-15 23:56:24', '1', '2023-04-08 09:44:47', b'0'); +INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (5, '本地磁盘', 10, '测试下本地存储', b'0', '{\"@class\":\"cn.fuxiaoaio.ygg.framework.file.core.client.local.LocalFileClientConfig\",\"basePath\":\"/Users/yunai/file_test\",\"domain\":\"http://127.0.0.1:48080\"}', '1', '2022-03-15 23:57:00', '1', '2023-04-08 09:44:47', b'0'); +INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (11, 'S3 - 七牛云', 20, NULL, b'0', '{\"@class\":\"cn.fuxiaoaio.ygg.framework.file.core.client.s3.S3FileClientConfig\",\"endpoint\":\"s3-cn-south-1.qiniucs.com\",\"domain\":\"http://test.fuxiaoaio.iocoder.cn\",\"bucket\":\"ruoyi-vue-pro\",\"accessKey\":\"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8\",\"accessSecret\":\"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP\"}', '1', '2022-03-19 18:00:03', '1', '2023-04-08 09:44:47', b'0'); +INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (15, 'S3 - 七牛云', 20, '', b'0', '{\"@class\":\"cn.fuxiaoaio.ygg.framework.file.core.client.s3.S3FileClientConfig\",\"endpoint\":\"s3-cn-south-1.qiniucs.com\",\"domain\":\"http://test.fuxiaoaio.iocoder.cn\",\"bucket\":\"ruoyi-vue-pro\",\"accessKey\":\"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8\",\"accessSecret\":\"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP\"}', '1', '2022-06-10 20:50:41', '1', '2023-04-08 09:44:47', b'0'); +INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (16, 'S3 - 七牛云', 20, '', b'0', '{\"@class\":\"cn.fuxiaoaio.ygg.framework.file.core.client.s3.S3FileClientConfig\",\"endpoint\":\"s3-cn-south-1.qiniucs.com\",\"domain\":\"http://test.fuxiaoaio.iocoder.cn\",\"bucket\":\"ruoyi-vue-pro\",\"accessKey\":\"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8\",\"accessSecret\":\"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP\"}', '1', '2022-06-11 20:32:08', '1', '2023-04-08 09:44:47', b'0'); +INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (17, 'S3 - 七牛云', 20, '', b'0', '{\"@class\":\"cn.fuxiaoaio.ygg.framework.file.core.client.s3.S3FileClientConfig\",\"endpoint\":\"s3-cn-south-1.qiniucs.com\",\"domain\":\"http://test.fuxiaoaio.iocoder.cn\",\"bucket\":\"ruoyi-vue-pro\",\"accessKey\":\"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8\",\"accessSecret\":\"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP\"}', '1', '2022-06-11 20:32:47', '1', '2023-04-08 09:44:47', b'0'); COMMIT; -- ---------------------------- @@ -2112,7 +2112,7 @@ CREATE TABLE `system_notice` ( -- ---------------------------- BEGIN; INSERT INTO `system_notice` (`id`, `title`, `content`, `type`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, '芋道的公众', '

新版本内容133

', 1, 0, 'admin', '2021-01-05 17:03:48', '1', '2022-05-04 21:00:20', b'0', 1); -INSERT INTO `system_notice` (`id`, `title`, `content`, `type`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2, '维护通知：2018-07-01 若依系统凌晨维护', '

维护内容

', 2, 1, 'admin', '2021-01-05 17:03:48', '1', '2022-05-11 12:34:24', b'0', 1); +INSERT INTO `system_notice` (`id`, `title`, `content`, `type`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2, '维护通知：2018-07-01 若依系统凌晨维护', '

维护内容

', 2, 1, 'admin', '2021-01-05 17:03:48', '1', '2022-05-11 12:34:24', b'0', 1); INSERT INTO `system_notice` (`id`, `title`, `content`, `type`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (4, '我是测试标题', '

哈哈哈哈123

', 1, 0, '110', '2022-02-22 01:01:25', '110', '2022-02-22 01:01:46', b'0', 121); COMMIT; @@ -2270,10 +2270,10 @@ CREATE TABLE `system_oauth2_client` ( -- Records of system_oauth2_client -- ---------------------------- BEGIN; -INSERT INTO `system_oauth2_client` (`id`, `client_id`, `secret`, `name`, `logo`, `description`, `status`, `access_token_validity_seconds`, `refresh_token_validity_seconds`, `redirect_uris`, `authorized_grant_types`, `scopes`, `auto_approve_scopes`, `authorities`, `resource_ids`, `additional_information`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1, 'default', 'admin123', '芋道源码', 'http://test.yudao.iocoder.cn/a5e2e244368878a366b516805a4aabf1.png', '我是描述', 0, 1800, 43200, '[\"https://www.iocoder.cn\",\"https://doc.iocoder.cn\"]', '[\"password\",\"authorization_code\",\"implicit\",\"refresh_token\"]', '[\"user.read\",\"user.write\"]', '[]', '[\"user.read\",\"user.write\"]', '[]', '{}', '1', '2022-05-11 21:47:12', '1', '2022-07-05 16:23:52', b'0'); -INSERT INTO `system_oauth2_client` (`id`, `client_id`, `secret`, `name`, `logo`, `description`, `status`, `access_token_validity_seconds`, `refresh_token_validity_seconds`, `redirect_uris`, `authorized_grant_types`, `scopes`, `auto_approve_scopes`, `authorities`, `resource_ids`, `additional_information`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (40, 'test', 'test2', 'biubiu', 'http://test.yudao.iocoder.cn/277a899d573723f1fcdfb57340f00379.png', NULL, 0, 1800, 43200, '[\"https://www.iocoder.cn\"]', '[\"password\",\"authorization_code\",\"implicit\"]', '[\"user_info\",\"projects\"]', '[\"user_info\"]', '[]', '[]', '{}', '1', '2022-05-12 00:28:20', '1', '2022-06-19 00:26:13', b'0'); -INSERT INTO `system_oauth2_client` (`id`, `client_id`, `secret`, `name`, `logo`, `description`, `status`, `access_token_validity_seconds`, `refresh_token_validity_seconds`, `redirect_uris`, `authorized_grant_types`, `scopes`, `auto_approve_scopes`, `authorities`, `resource_ids`, `additional_information`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (41, 'yudao-sso-demo-by-code', 'test', '基于授权码模式，如何实现 SSO 单点登录？', 'http://test.yudao.iocoder.cn/fe4ed36596adad5120036ef61a6d0153654544d44af8dd4ad3ffe8f759933d6f.png', NULL, 0, 1800, 43200, '[\"http://127.0.0.1:18080\"]', '[\"authorization_code\",\"refresh_token\"]', '[\"user.read\",\"user.write\"]', '[]', '[]', '[]', NULL, '1', '2022-09-29 13:28:31', '1', '2022-09-29 13:28:31', b'0'); -INSERT INTO `system_oauth2_client` (`id`, `client_id`, `secret`, `name`, `logo`, `description`, `status`, `access_token_validity_seconds`, `refresh_token_validity_seconds`, `redirect_uris`, `authorized_grant_types`, `scopes`, `auto_approve_scopes`, `authorities`, `resource_ids`, `additional_information`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (42, 'yudao-sso-demo-by-password', 'test', '基于密码模式，如何实现 SSO 单点登录？', 'http://test.yudao.iocoder.cn/604bdc695e13b3b22745be704d1f2aa8ee05c5f26f9fead6d1ca49005afbc857.jpeg', NULL, 0, 1800, 43200, '[\"http://127.0.0.1:18080\"]', '[\"password\",\"refresh_token\"]', '[\"user.read\",\"user.write\"]', '[]', '[]', '[]', NULL, '1', '2022-10-04 17:40:16', '1', '2022-10-04 20:31:21', b'0'); +INSERT INTO `system_oauth2_client` (`id`, `client_id`, `secret`, `name`, `logo`, `description`, `status`, `access_token_validity_seconds`, `refresh_token_validity_seconds`, `redirect_uris`, `authorized_grant_types`, `scopes`, `auto_approve_scopes`, `authorities`, `resource_ids`, `additional_information`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1, 'default', 'admin123', '芋道源码', 'http://test.fuxiaoaio.iocoder.cn/a5e2e244368878a366b516805a4aabf1.png', '我是描述', 0, 1800, 43200, '[\"https://www.iocoder.cn\",\"https://doc.iocoder.cn\"]', '[\"password\",\"authorization_code\",\"implicit\",\"refresh_token\"]', '[\"user.read\",\"user.write\"]', '[]', '[\"user.read\",\"user.write\"]', '[]', '{}', '1', '2022-05-11 21:47:12', '1', '2022-07-05 16:23:52', b'0'); +INSERT INTO `system_oauth2_client` (`id`, `client_id`, `secret`, `name`, `logo`, `description`, `status`, `access_token_validity_seconds`, `refresh_token_validity_seconds`, `redirect_uris`, `authorized_grant_types`, `scopes`, `auto_approve_scopes`, `authorities`, `resource_ids`, `additional_information`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (40, 'test', 'test2', 'biubiu', 'http://test.fuxiaoaio.iocoder.cn/277a899d573723f1fcdfb57340f00379.png', NULL, 0, 1800, 43200, '[\"https://www.iocoder.cn\"]', '[\"password\",\"authorization_code\",\"implicit\"]', '[\"user_info\",\"projects\"]', '[\"user_info\"]', '[]', '[]', '{}', '1', '2022-05-12 00:28:20', '1', '2022-06-19 00:26:13', b'0'); +INSERT INTO `system_oauth2_client` (`id`, `client_id`, `secret`, `name`, `logo`, `description`, `status`, `access_token_validity_seconds`, `refresh_token_validity_seconds`, `redirect_uris`, `authorized_grant_types`, `scopes`, `auto_approve_scopes`, `authorities`, `resource_ids`, `additional_information`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (41, 'fuxiaoaio-sso-demo-by-code', 'test', '基于授权码模式，如何实现 SSO 单点登录？', 'http://test.fuxiaoaio.iocoder.cn/fe4ed36596adad5120036ef61a6d0153654544d44af8dd4ad3ffe8f759933d6f.png', NULL, 0, 1800, 43200, '[\"http://127.0.0.1:18080\"]', '[\"authorization_code\",\"refresh_token\"]', '[\"user.read\",\"user.write\"]', '[]', '[]', '[]', NULL, '1', '2022-09-29 13:28:31', '1', '2022-09-29 13:28:31', b'0'); +INSERT INTO `system_oauth2_client` (`id`, `client_id`, `secret`, `name`, `logo`, `description`, `status`, `access_token_validity_seconds`, `refresh_token_validity_seconds`, `redirect_uris`, `authorized_grant_types`, `scopes`, `auto_approve_scopes`, `authorities`, `resource_ids`, `additional_information`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (42, 'fuxiaoaio-sso-demo-by-password', 'test', '基于密码模式，如何实现 SSO 单点登录？', 'http://test.fuxiaoaio.iocoder.cn/604bdc695e13b3b22745be704d1f2aa8ee05c5f26f9fead6d1ca49005afbc857.jpeg', NULL, 0, 1800, 43200, '[\"http://127.0.0.1:18080\"]', '[\"password\",\"refresh_token\"]', '[\"user.read\",\"user.write\"]', '[]', '[]', '[]', NULL, '1', '2022-10-04 17:40:16', '1', '2022-10-04 20:31:21', b'0'); COMMIT; -- ---------------------------- @@ -3662,8 +3662,8 @@ CREATE TABLE `system_users` ( -- Records of system_users -- ---------------------------- BEGIN; -INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, 'admin', '$2a$10$mRMIYLDtRHlf6.9ipiqH1.Z.bh/R9dO9d5iHiGYPigi6r5KOoR2Wm', '芋道源码', '管理员', 103, '[1]', 'aoteman@126.com', '15612345678', 1, 'http://test.yudao.iocoder.cn/e1fdd7271685ec143a0900681606406621717a666ad0b2798b096df41422b32f.png', 0, '0:0:0:0:0:0:0:1', '2023-04-13 23:09:16', 'admin', '2021-01-05 17:03:47', NULL, '2023-04-13 23:09:16', b'0', 1); -INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (100, 'yudao', '$2a$10$11U48RhyJ5pSBYWSn12AD./ld671.ycSzJHbyrtpeoMeYiw31eo8a', '芋道', '不要吓我', 104, '[1]', 'yudao@iocoder.cn', '15601691300', 1, '', 1, '127.0.0.1', '2022-07-09 23:03:33', '', '2021-01-07 09:07:17', NULL, '2022-07-09 23:03:33', b'0', 1); +INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, 'admin', '$2a$10$mRMIYLDtRHlf6.9ipiqH1.Z.bh/R9dO9d5iHiGYPigi6r5KOoR2Wm', '芋道源码', '管理员', 103, '[1]', 'aoteman@126.com', '15612345678', 1, 'http://test.fuxiaoaio.iocoder.cn/e1fdd7271685ec143a0900681606406621717a666ad0b2798b096df41422b32f.png', 0, '0:0:0:0:0:0:0:1', '2023-04-13 23:09:16', 'admin', '2021-01-05 17:03:47', NULL, '2023-04-13 23:09:16', b'0', 1); +INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (100, 'fuxiaoaio', '$2a$10$11U48RhyJ5pSBYWSn12AD./ld671.ycSzJHbyrtpeoMeYiw31eo8a', '芋道', '不要吓我', 104, '[1]', 'fuxiaoaio@iocoder.cn', '15601691300', 1, '', 1, '127.0.0.1', '2022-07-09 23:03:33', '', '2021-01-07 09:07:17', NULL, '2022-07-09 23:03:33', b'0', 1); INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (103, 'yuanma', '$2a$10$YMpimV4T6BtDhIaA8jSW.u8UTGBeGhc/qwXP4oxoMr4mOw9.qttt6', '源码', NULL, 106, NULL, 'yuanma@iocoder.cn', '15601701300', 0, '', 0, '127.0.0.1', '2022-07-08 01:26:27', '', '2021-01-13 23:50:35', NULL, '2022-07-08 01:26:27', b'0', 1); INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (104, 'test', '$2a$10$GP8zvqHB//TekuzYZSBYAuBQJiNq1.fxQVDYJ.uBCOnWCtDVKE4H6', '测试号', NULL, 107, '[1,2]', '111@qq.com', '15601691200', 1, '', 0, '127.0.0.1', '2022-05-28 15:43:17', '', '2021-01-21 02:13:53', NULL, '2022-07-09 09:00:33', b'0', 1); INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (107, 'admin107', '$2a$10$dYOOBKMO93v/.ReCqzyFg.o67Tqk.bbc2bhrpyBGkIw9aypCtr2pm', '芋艿', NULL, NULL, NULL, '', '15601691300', 0, '', 0, '', NULL, '1', '2022-02-20 22:59:33', '1', '2022-02-27 08:26:51', b'0', 118); diff --git a/sql/oracle/ruoyi-vue-pro.sql b/sql/oracle/ruoyi-vue-pro.sql index 46481ae2f..cb9667bed 100644 --- a/sql/oracle/ruoyi-vue-pro.sql +++ b/sql/oracle/ruoyi-vue-pro.sql @@ -500,7 +500,7 @@ COMMENT ON TABLE "INFRA_API_ACCESS_LOG" IS 'API 访问日志表'; -- ---------------------------- -- Records of INFRA_API_ACCESS_LOG -- ---------------------------- -INSERT INTO "INFRA_API_ACCESS_LOG" ("ID", "TRACE_ID", "USER_ID", "USER_TYPE", "APPLICATION_NAME", "REQUEST_METHOD", "REQUEST_URL", "REQUEST_PARAMS", "USER_IP", "USER_AGENT", "BEGIN_TIME", "END_TIME", "DURATION", "RESULT_CODE", "RESULT_MSG", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "TENANT_ID", "DELETED") VALUES ('0', NULL, '0', '2', 'yudao-server', 'GET', '/admin-api/system/dict-data/list-all-simple', '{"query":{},"body":null}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36', TO_DATE('2022-05-13 01:26:54', 'SYYYY-MM-DD HH24:MI:SS'), TO_DATE('2022-05-13 01:26:54', 'SYYYY-MM-DD HH24:MI:SS'), '94', '0', NULL, NULL, TO_DATE('2022-05-13 01:26:54', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2022-05-13 01:26:54', 'SYYYY-MM-DD HH24:MI:SS'), '1', '0'); +INSERT INTO "INFRA_API_ACCESS_LOG" ("ID", "TRACE_ID", "USER_ID", "USER_TYPE", "APPLICATION_NAME", "REQUEST_METHOD", "REQUEST_URL", "REQUEST_PARAMS", "USER_IP", "USER_AGENT", "BEGIN_TIME", "END_TIME", "DURATION", "RESULT_CODE", "RESULT_MSG", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "TENANT_ID", "DELETED") VALUES ('0', NULL, '0', '2', 'fuxiaoaio-server', 'GET', '/admin-api/system/dict-data/list-all-simple', '{"query":{},"body":null}', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36', TO_DATE('2022-05-13 01:26:54', 'SYYYY-MM-DD HH24:MI:SS'), TO_DATE('2022-05-13 01:26:54', 'SYYYY-MM-DD HH24:MI:SS'), '94', '0', NULL, NULL, TO_DATE('2022-05-13 01:26:54', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2022-05-13 01:26:54', 'SYYYY-MM-DD HH24:MI:SS'), '1', '0'); COMMIT; COMMIT; @@ -814,7 +814,7 @@ INSERT INTO "INFRA_CONFIG" ("ID", "CATEGORY", "TYPE", "NAME", "CONFIG_KEY", "VAL INSERT INTO "INFRA_CONFIG" ("ID", "CATEGORY", "TYPE", "NAME", "CONFIG_KEY", "VALUE", "VISIBLE", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('3', 'ui', '1', '主框架页-侧边栏主题', 'sys.index.sideTheme', 'theme-dark', '0', '深色主题theme-dark，浅色主题theme-light', 'admin', TO_DATE('2021-01-05 17:03:48', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2021-01-19 03:05:21', 'SYYYY-MM-DD HH24:MI:SS'), '0'); INSERT INTO "INFRA_CONFIG" ("ID", "CATEGORY", "TYPE", "NAME", "CONFIG_KEY", "VALUE", "VISIBLE", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('4', '1', '2', 'xxx', 'demo.test', '10', '0', '5', NULL, TO_DATE('2021-01-19 03:10:26', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2021-01-20 09:25:55', 'SYYYY-MM-DD HH24:MI:SS'), '0'); INSERT INTO "INFRA_CONFIG" ("ID", "CATEGORY", "TYPE", "NAME", "CONFIG_KEY", "VALUE", "VISIBLE", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('5', 'xxx', '2', 'xxx', 'xxx', 'xxx', '1', 'xxx', NULL, TO_DATE('2021-02-09 20:06:47', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2021-02-09 20:06:47', 'SYYYY-MM-DD HH24:MI:SS'), '0'); -INSERT INTO "INFRA_CONFIG" ("ID", "CATEGORY", "TYPE", "NAME", "CONFIG_KEY", "VALUE", "VISIBLE", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('6', 'biz', '2', '登陆验证码的开关', 'yudao.captcha.enable', 'true', '1', NULL, '1', TO_DATE('2022-02-17 00:03:11', 'SYYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2022-02-17 00:15:33', 'SYYYY-MM-DD HH24:MI:SS'), '0'); +INSERT INTO "INFRA_CONFIG" ("ID", "CATEGORY", "TYPE", "NAME", "CONFIG_KEY", "VALUE", "VISIBLE", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('6', 'biz', '2', '登陆验证码的开关', 'fuxiaoaio.captcha.enable', 'true', '1', NULL, '1', TO_DATE('2022-02-17 00:03:11', 'SYYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2022-02-17 00:15:33', 'SYYYY-MM-DD HH24:MI:SS'), '0'); COMMIT; COMMIT; @@ -973,9 +973,9 @@ COMMENT ON TABLE "INFRA_FILE_CONFIG" IS '文件配置表'; -- ---------------------------- -- Records of INFRA_FILE_CONFIG -- ---------------------------- -INSERT INTO "INFRA_FILE_CONFIG" ("ID", "NAME", "STORAGE", "REMARK", "MASTER", "CONFIG", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('4', '数据库', '1', '我是数据库', '0', '{"@class":"cn.iocoder.yudao.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', '1', TO_DATE('2022-03-15 23:56:24', 'SYYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2022-03-19 19:10:11', 'SYYYY-MM-DD HH24:MI:SS'), '0'); -INSERT INTO "INFRA_FILE_CONFIG" ("ID", "NAME", "STORAGE", "REMARK", "MASTER", "CONFIG", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('5', '本地磁盘', '10', '测试下本地存储', '0', '{"@class":"cn.iocoder.yudao.framework.file.core.client.local.LocalFileClientConfig","basePath":"/Users/yunai/file_test","domain":"http://127.0.0.1:48080"}', '1', TO_DATE('2022-03-15 23:57:00', 'SYYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2022-03-19 19:10:11', 'SYYYY-MM-DD HH24:MI:SS'), '0'); -INSERT INTO "INFRA_FILE_CONFIG" ("ID", "NAME", "STORAGE", "REMARK", "MASTER", "CONFIG", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('11', 'S3 - 七牛云', '20', NULL, '1', '{"@class":"cn.iocoder.yudao.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3-cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8","accessSecret":"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP"}', '1', TO_DATE('2022-03-19 18:00:03', 'SYYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2022-03-19 19:10:11', 'SYYYY-MM-DD HH24:MI:SS'), '0'); +INSERT INTO "INFRA_FILE_CONFIG" ("ID", "NAME", "STORAGE", "REMARK", "MASTER", "CONFIG", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('4', '数据库', '1', '我是数据库', '0', '{"@class":"cn.fuxiaoaio.ygg.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', '1', TO_DATE('2022-03-15 23:56:24', 'SYYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2022-03-19 19:10:11', 'SYYYY-MM-DD HH24:MI:SS'), '0'); +INSERT INTO "INFRA_FILE_CONFIG" ("ID", "NAME", "STORAGE", "REMARK", "MASTER", "CONFIG", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('5', '本地磁盘', '10', '测试下本地存储', '0', '{"@class":"cn.fuxiaoaio.ygg.framework.file.core.client.local.LocalFileClientConfig","basePath":"/Users/yunai/file_test","domain":"http://127.0.0.1:48080"}', '1', TO_DATE('2022-03-15 23:57:00', 'SYYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2022-03-19 19:10:11', 'SYYYY-MM-DD HH24:MI:SS'), '0'); +INSERT INTO "INFRA_FILE_CONFIG" ("ID", "NAME", "STORAGE", "REMARK", "MASTER", "CONFIG", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('11', 'S3 - 七牛云', '20', NULL, '1', '{"@class":"cn.fuxiaoaio.ygg.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3-cn-south-1.qiniucs.com","domain":"http://test.fuxiaoaio.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8","accessSecret":"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP"}', '1', TO_DATE('2022-03-19 18:00:03', 'SYYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2022-03-19 19:10:11', 'SYYYY-MM-DD HH24:MI:SS'), '0'); COMMIT; COMMIT; @@ -1975,7 +1975,7 @@ DISABLE ROW MOVEMENT -- ---------------------------- -- Records of QRTZ_JOB_DETAILS -- ---------------------------- -INSERT INTO "QRTZ_JOB_DETAILS" ("SCHED_NAME", "JOB_NAME", "JOB_GROUP", "DESCRIPTION", "JOB_CLASS_NAME", "IS_DURABLE", "IS_NONCONCURRENT", "IS_UPDATE_DATA", "REQUESTS_RECOVERY", "JOB_DATA") VALUES ('schedulerName', 'userSessionTimeoutJob', 'DEFAULT', NULL, 'cn.iocoder.yudao.framework.quartz.core.handler.JobHandlerInvoker', '0', '1', '1', '0', HEXTORAW('ACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B020000787000000000000000007400104A4F425F48414E444C45525F4E414D457400157573657253657373696F6E54696D656F75744A6F627800')); +INSERT INTO "QRTZ_JOB_DETAILS" ("SCHED_NAME", "JOB_NAME", "JOB_GROUP", "DESCRIPTION", "JOB_CLASS_NAME", "IS_DURABLE", "IS_NONCONCURRENT", "IS_UPDATE_DATA", "REQUESTS_RECOVERY", "JOB_DATA") VALUES ('schedulerName', 'userSessionTimeoutJob', 'DEFAULT', NULL, 'cn.fuxiaoaio.ygg.framework.quartz.core.handler.JobHandlerInvoker', '0', '1', '1', '0', HEXTORAW('ACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B020000787000000000000000007400104A4F425F48414E444C45525F4E414D457400157573657253657373696F6E54696D656F75744A6F627800')); COMMIT; COMMIT; @@ -2640,8 +2640,8 @@ COMMENT ON TABLE "SYSTEM_ERROR_CODE" IS '错误码表'; -- ---------------------------- -- Records of SYSTEM_ERROR_CODE -- ---------------------------- -INSERT INTO "SYSTEM_ERROR_CODE" ("ID", "TYPE", "APPLICATION_NAME", "CODE", "MESSAGE", "MEMO", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('0', '1', 'yudao-server', '1001007000', '数据源配置不存在', NULL, NULL, TO_DATE('2022-05-01 01:08:31', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2022-05-01 01:08:31', 'SYYYY-MM-DD HH24:MI:SS'), '0'); -INSERT INTO "SYSTEM_ERROR_CODE" ("ID", "TYPE", "APPLICATION_NAME", "CODE", "MESSAGE", "MEMO", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('0', '1', 'yudao-server', '1009000002', '获取高亮流程图异常', NULL, NULL, TO_DATE('2022-05-13 01:26:47', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2022-05-13 01:26:47', 'SYYYY-MM-DD HH24:MI:SS'), '0'); +INSERT INTO "SYSTEM_ERROR_CODE" ("ID", "TYPE", "APPLICATION_NAME", "CODE", "MESSAGE", "MEMO", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('0', '1', 'fuxiaoaio-server', '1001007000', '数据源配置不存在', NULL, NULL, TO_DATE('2022-05-01 01:08:31', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2022-05-01 01:08:31', 'SYYYY-MM-DD HH24:MI:SS'), '0'); +INSERT INTO "SYSTEM_ERROR_CODE" ("ID", "TYPE", "APPLICATION_NAME", "CODE", "MESSAGE", "MEMO", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('0', '1', 'fuxiaoaio-server', '1009000002', '获取高亮流程图异常', NULL, NULL, TO_DATE('2022-05-13 01:26:47', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2022-05-13 01:26:47', 'SYYYY-MM-DD HH24:MI:SS'), '0'); COMMIT; COMMIT; @@ -3243,8 +3243,8 @@ COMMENT ON TABLE "SYSTEM_OAUTH2_CLIENT" IS 'OAuth2 客户端表'; -- ---------------------------- -- Records of SYSTEM_OAUTH2_CLIENT -- ---------------------------- -INSERT INTO "SYSTEM_OAUTH2_CLIENT" ("ID", "CLIENT_ID", "SECRET", "NAME", "LOGO", "DESCRIPTION", "STATUS", "ACCESS_TOKEN_VALIDITY_SECONDS", "REFRESH_TOKEN_VALIDITY_SECONDS", "REDIRECT_URIS", "AUTO_APPROVE_SCOPES", "AUTHORIZED_GRANT_TYPES", "SCOPES", "AUTHORITIES", "RESOURCE_IDS", "ADDITIONAL_INFORMATION", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('1', 'default', 'admin123', '芋道源码', 'http://test.yudao.iocoder.cn/a5e2e244368878a366b516805a4aabf1.png', '我是描述', '0', '180', '8640', '["https://www.iocoder.cn","https://doc.iocoder.cn"]', NULL, '["password","authorization_code","implicit","refresh_token"]', '["user.read","user.write"]', '["system:user:query"]', '[]', '{}', '1', TO_DATE('2022-05-11 21:47:12', 'SYYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2022-05-12 01:00:20', 'SYYYY-MM-DD HH24:MI:SS'), '0'); -INSERT INTO "SYSTEM_OAUTH2_CLIENT" ("ID", "CLIENT_ID", "SECRET", "NAME", "LOGO", "DESCRIPTION", "STATUS", "ACCESS_TOKEN_VALIDITY_SECONDS", "REFRESH_TOKEN_VALIDITY_SECONDS", "REDIRECT_URIS", "AUTO_APPROVE_SCOPES", "AUTHORIZED_GRANT_TYPES", "SCOPES", "AUTHORITIES", "RESOURCE_IDS", "ADDITIONAL_INFORMATION", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('40', 'test', 'test2', 'biubiu', 'http://test.yudao.iocoder.cn/277a899d573723f1fcdfb57340f00379.png', NULL, '0', '1800', '43200', '["https://www.iocoder.cn"]', '[]', '["password","authorization_code","implicit"]', '[]', '[]', '[]', '{}', '1', TO_DATE('2022-05-12 00:28:20', 'SYYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2022-05-26 00:30:33', 'SYYYY-MM-DD HH24:MI:SS'), '0'); +INSERT INTO "SYSTEM_OAUTH2_CLIENT" ("ID", "CLIENT_ID", "SECRET", "NAME", "LOGO", "DESCRIPTION", "STATUS", "ACCESS_TOKEN_VALIDITY_SECONDS", "REFRESH_TOKEN_VALIDITY_SECONDS", "REDIRECT_URIS", "AUTO_APPROVE_SCOPES", "AUTHORIZED_GRANT_TYPES", "SCOPES", "AUTHORITIES", "RESOURCE_IDS", "ADDITIONAL_INFORMATION", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('1', 'default', 'admin123', '芋道源码', 'http://test.fuxiaoaio.iocoder.cn/a5e2e244368878a366b516805a4aabf1.png', '我是描述', '0', '180', '8640', '["https://www.iocoder.cn","https://doc.iocoder.cn"]', NULL, '["password","authorization_code","implicit","refresh_token"]', '["user.read","user.write"]', '["system:user:query"]', '[]', '{}', '1', TO_DATE('2022-05-11 21:47:12', 'SYYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2022-05-12 01:00:20', 'SYYYY-MM-DD HH24:MI:SS'), '0'); +INSERT INTO "SYSTEM_OAUTH2_CLIENT" ("ID", "CLIENT_ID", "SECRET", "NAME", "LOGO", "DESCRIPTION", "STATUS", "ACCESS_TOKEN_VALIDITY_SECONDS", "REFRESH_TOKEN_VALIDITY_SECONDS", "REDIRECT_URIS", "AUTO_APPROVE_SCOPES", "AUTHORIZED_GRANT_TYPES", "SCOPES", "AUTHORITIES", "RESOURCE_IDS", "ADDITIONAL_INFORMATION", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('40', 'test', 'test2', 'biubiu', 'http://test.fuxiaoaio.iocoder.cn/277a899d573723f1fcdfb57340f00379.png', NULL, '0', '1800', '43200', '["https://www.iocoder.cn"]', '[]', '["password","authorization_code","implicit"]', '[]', '[]', '[]', '{}', '1', TO_DATE('2022-05-12 00:28:20', 'SYYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2022-05-26 00:30:33', 'SYYYY-MM-DD HH24:MI:SS'), '0'); COMMIT; COMMIT; @@ -4352,8 +4352,8 @@ COMMENT ON TABLE "SYSTEM_USERS" IS '用户信息表'; -- Records of SYSTEM_USERS -- ---------------------------- INSERT INTO "SYSTEM_USERS" ("ID", "USERNAME", "PASSWORD", "NICKNAME", "REMARK", "DEPT_ID", "POST_IDS", "EMAIL", "MOBILE", "SEX", "AVATAR", "STATUS", "LOGIN_IP", "LOGIN_DATE", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "TENANT_ID", "DELETED") VALUES ('115', 'anzhen', '$2a$10$Qr2lBUuwvDMb98p/o7iSPuHb7GRi4zPHSq4g01ETuY.l4O5txXfvi', 'anzhen', NULL, '100', '[]', NULL, NULL, NULL, NULL, '0', NULL, NULL, '1', TO_DATE('2022-03-24 18:50:59', 'SYYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2022-03-24 18:50:59', 'SYYYY-MM-DD HH24:MI:SS'), '1', '0'); -INSERT INTO "SYSTEM_USERS" ("ID", "USERNAME", "PASSWORD", "NICKNAME", "REMARK", "DEPT_ID", "POST_IDS", "EMAIL", "MOBILE", "SEX", "AVATAR", "STATUS", "LOGIN_IP", "LOGIN_DATE", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "TENANT_ID", "DELETED") VALUES ('1', 'admin', '$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', '芋道源码', '管理员', '103', '[1,2]', 'aoteman@126.com', '15612345678', '1', 'http://test.yudao.iocoder.cn/a294ecb2-73dd-4353-bf40-296b8931d0bf', '0', '127.0.0.1', TO_DATE('2022-05-13 09:40:57', 'SYYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2021-01-05 17:03:47', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2022-05-13 09:40:57', 'SYYYY-MM-DD HH24:MI:SS'), '1', '0'); -INSERT INTO "SYSTEM_USERS" ("ID", "USERNAME", "PASSWORD", "NICKNAME", "REMARK", "DEPT_ID", "POST_IDS", "EMAIL", "MOBILE", "SEX", "AVATAR", "STATUS", "LOGIN_IP", "LOGIN_DATE", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "TENANT_ID", "DELETED") VALUES ('100', 'yudao', '$2a$10$11U48RhyJ5pSBYWSn12AD./ld671.ycSzJHbyrtpeoMeYiw31eo8a', '芋道', '不要吓我', '104', '[1]', 'yudao@iocoder.cn', '15601691300', '1', NULL, '1', NULL, NULL, NULL, TO_DATE('2021-01-07 09:07:17', 'SYYYY-MM-DD HH24:MI:SS'), '104', TO_DATE('2021-12-16 09:26:10', 'SYYYY-MM-DD HH24:MI:SS'), '1', '0'); +INSERT INTO "SYSTEM_USERS" ("ID", "USERNAME", "PASSWORD", "NICKNAME", "REMARK", "DEPT_ID", "POST_IDS", "EMAIL", "MOBILE", "SEX", "AVATAR", "STATUS", "LOGIN_IP", "LOGIN_DATE", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "TENANT_ID", "DELETED") VALUES ('1', 'admin', '$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', '芋道源码', '管理员', '103', '[1,2]', 'aoteman@126.com', '15612345678', '1', 'http://test.fuxiaoaio.iocoder.cn/a294ecb2-73dd-4353-bf40-296b8931d0bf', '0', '127.0.0.1', TO_DATE('2022-05-13 09:40:57', 'SYYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2021-01-05 17:03:47', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2022-05-13 09:40:57', 'SYYYY-MM-DD HH24:MI:SS'), '1', '0'); +INSERT INTO "SYSTEM_USERS" ("ID", "USERNAME", "PASSWORD", "NICKNAME", "REMARK", "DEPT_ID", "POST_IDS", "EMAIL", "MOBILE", "SEX", "AVATAR", "STATUS", "LOGIN_IP", "LOGIN_DATE", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "TENANT_ID", "DELETED") VALUES ('100', 'fuxiaoaio', '$2a$10$11U48RhyJ5pSBYWSn12AD./ld671.ycSzJHbyrtpeoMeYiw31eo8a', '芋道', '不要吓我', '104', '[1]', 'fuxiaoaio@iocoder.cn', '15601691300', '1', NULL, '1', NULL, NULL, NULL, TO_DATE('2021-01-07 09:07:17', 'SYYYY-MM-DD HH24:MI:SS'), '104', TO_DATE('2021-12-16 09:26:10', 'SYYYY-MM-DD HH24:MI:SS'), '1', '0'); INSERT INTO "SYSTEM_USERS" ("ID", "USERNAME", "PASSWORD", "NICKNAME", "REMARK", "DEPT_ID", "POST_IDS", "EMAIL", "MOBILE", "SEX", "AVATAR", "STATUS", "LOGIN_IP", "LOGIN_DATE", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "TENANT_ID", "DELETED") VALUES ('103', 'yuanma', '$2a$10$wWoPT7sqriM2O1YXRL.je.GiL538OR6ZTN8aQZr9JAGdnpCH2tpYe', '源码', NULL, '106', NULL, 'yuanma@iocoder.cn', '15601701300', '0', NULL, '0', '127.0.0.1', TO_DATE('2022-01-18 00:33:40', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2021-01-13 23:50:35', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2022-01-18 00:33:40', 'SYYYY-MM-DD HH24:MI:SS'), '1', '0'); INSERT INTO "SYSTEM_USERS" ("ID", "USERNAME", "PASSWORD", "NICKNAME", "REMARK", "DEPT_ID", "POST_IDS", "EMAIL", "MOBILE", "SEX", "AVATAR", "STATUS", "LOGIN_IP", "LOGIN_DATE", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "TENANT_ID", "DELETED") VALUES ('104', 'test', '$2a$10$e5RpuDCC0GYSt0Hvd2.CjujIXwgGct4SnXi6dVGxdgFsnqgEryk5a', '测试号', NULL, '107', '[]', '111@qq.com', '15601691200', '1', NULL, '0', '127.0.0.1', TO_DATE('2022-03-19 21:46:19', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2021-01-21 02:13:53', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2022-03-19 21:46:19', 'SYYYY-MM-DD HH24:MI:SS'), '1', '0'); INSERT INTO "SYSTEM_USERS" ("ID", "USERNAME", "PASSWORD", "NICKNAME", "REMARK", "DEPT_ID", "POST_IDS", "EMAIL", "MOBILE", "SEX", "AVATAR", "STATUS", "LOGIN_IP", "LOGIN_DATE", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "TENANT_ID", "DELETED") VALUES ('107', 'admin107', '$2a$10$dYOOBKMO93v/.ReCqzyFg.o67Tqk.bbc2bhrpyBGkIw9aypCtr2pm', '芋艿', NULL, NULL, NULL, NULL, '15601691300', '0', NULL, '0', NULL, NULL, '1', TO_DATE('2022-02-20 22:59:33', 'SYYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2022-02-27 08:26:51', 'SYYYY-MM-DD HH24:MI:SS'), '118', '0'); diff --git a/sql/postgresql/ruoyi-vue-pro.sql b/sql/postgresql/ruoyi-vue-pro.sql index a4d76cd94..58bdf3144 100644 --- a/sql/postgresql/ruoyi-vue-pro.sql +++ b/sql/postgresql/ruoyi-vue-pro.sql @@ -1152,7 +1152,7 @@ INSERT INTO "infra_config" ("id", "category", "type", "name", "config_key", "val INSERT INTO "infra_config" ("id", "category", "type", "name", "config_key", "value", "visible", "remark", "creator", "create_time", "updater", "update_time", "deleted") VALUES (3, 'ui', 1, '主框架页-侧边栏主题', 'sys.index.sideTheme', 'theme-dark', '0', '深色主题theme-dark，浅色主题theme-light', 'admin', '2021-01-05 17:03:48', '', '2021-01-19 03:05:21', 0); INSERT INTO "infra_config" ("id", "category", "type", "name", "config_key", "value", "visible", "remark", "creator", "create_time", "updater", "update_time", "deleted") VALUES (4, '1', 2, 'xxx', 'demo.test', '10', '0', '5', '', '2021-01-19 03:10:26', '', '2021-01-20 09:25:55', 0); INSERT INTO "infra_config" ("id", "category", "type", "name", "config_key", "value", "visible", "remark", "creator", "create_time", "updater", "update_time", "deleted") VALUES (5, 'xxx', 2, 'xxx', 'xxx', 'xxx', '1', 'xxx', '', '2021-02-09 20:06:47', '', '2021-02-09 20:06:47', 0); -INSERT INTO "infra_config" ("id", "category", "type", "name", "config_key", "value", "visible", "remark", "creator", "create_time", "updater", "update_time", "deleted") VALUES (6, 'biz', 2, '登陆验证码的开关', 'yudao.captcha.enable', 'true', '1', NULL, '1', '2022-02-17 00:03:11', '1', '2022-04-04 12:51:40', 0); +INSERT INTO "infra_config" ("id", "category", "type", "name", "config_key", "value", "visible", "remark", "creator", "create_time", "updater", "update_time", "deleted") VALUES (6, 'biz', 2, '登陆验证码的开关', 'fuxiaoaio.captcha.enable', 'true', '1', NULL, '1', '2022-02-17 00:03:11', '1', '2022-04-04 12:51:40', 0); COMMIT; -- ---------------------------- @@ -1264,9 +1264,9 @@ COMMENT ON TABLE "infra_file_config" IS '文件配置表'; -- Records of infra_file_config -- ---------------------------- BEGIN; -INSERT INTO "infra_file_config" ("id", "name", "storage", "remark", "master", "config", "creator", "create_time", "updater", "update_time", "deleted") VALUES (4, '数据库', 1, '我是数据库', 'f', '{"@class":"cn.iocoder.yudao.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', '1', '2022-03-15 23:56:24', '1', '2022-03-26 21:39:26', 0); -INSERT INTO "infra_file_config" ("id", "name", "storage", "remark", "master", "config", "creator", "create_time", "updater", "update_time", "deleted") VALUES (5, '本地磁盘', 10, '测试下本地存储', 'f', '{"@class":"cn.iocoder.yudao.framework.file.core.client.local.LocalFileClientConfig","basePath":"/Users/yunai/file_test","domain":"http://127.0.0.1:48080"}', '1', '2022-03-15 23:57:00', '1', '2022-03-26 21:39:26', 0); -INSERT INTO "infra_file_config" ("id", "name", "storage", "remark", "master", "config", "creator", "create_time", "updater", "update_time", "deleted") VALUES (11, 'S3 - 七牛云', 20, NULL, 't', '{"@class":"cn.iocoder.yudao.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3-cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8","accessSecret":"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP"}', '1', '2022-03-19 18:00:03', '1', '2022-05-26 00:03:47.17', 0); +INSERT INTO "infra_file_config" ("id", "name", "storage", "remark", "master", "config", "creator", "create_time", "updater", "update_time", "deleted") VALUES (4, '数据库', 1, '我是数据库', 'f', '{"@class":"cn.fuxiaoaio.ygg.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', '1', '2022-03-15 23:56:24', '1', '2022-03-26 21:39:26', 0); +INSERT INTO "infra_file_config" ("id", "name", "storage", "remark", "master", "config", "creator", "create_time", "updater", "update_time", "deleted") VALUES (5, '本地磁盘', 10, '测试下本地存储', 'f', '{"@class":"cn.fuxiaoaio.ygg.framework.file.core.client.local.LocalFileClientConfig","basePath":"/Users/yunai/file_test","domain":"http://127.0.0.1:48080"}', '1', '2022-03-15 23:57:00', '1', '2022-03-26 21:39:26', 0); +INSERT INTO "infra_file_config" ("id", "name", "storage", "remark", "master", "config", "creator", "create_time", "updater", "update_time", "deleted") VALUES (11, 'S3 - 七牛云', 20, NULL, 't', '{"@class":"cn.fuxiaoaio.ygg.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3-cn-south-1.qiniucs.com","domain":"http://test.fuxiaoaio.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8","accessSecret":"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP"}', '1', '2022-03-19 18:00:03', '1', '2022-05-26 00:03:47.17', 0); COMMIT; -- ---------------------------- @@ -1988,7 +1988,7 @@ CREATE TABLE "qrtz_job_details" ( -- Records of qrtz_job_details -- ---------------------------- BEGIN; -INSERT INTO "qrtz_job_details" ("sched_name", "job_name", "job_group", "description", "job_class_name", "is_durable", "is_nonconcurrent", "is_update_data", "requests_recovery", "job_data") VALUES ('schedulerName', 'userSessionTimeoutJob', 'DEFAULT', NULL, 'cn.iocoder.yudao.framework.quartz.core.handler.JobHandlerInvoker', 'f', 't', 't', 'f', E'\\254\\355\\000\\005sr\\000\\025org.quartz.JobDataMap\\237\\260\\203\\350\\277\\251\\260\\313\\002\\000\\000xr\\000&org.quartz.utils.StringKeyDirtyFlagMap\\202\\010\\350\\303\\373\\305](\\002\\000\\001Z\\000\\023allowsTransientDataxr\\000\\035org.quartz.utils.DirtyFlagMap\\023\\346.\\255(v\\012\\316\\002\\000\\002Z\\000\\005dirtyL\\000\\003mapt\\000\\017Ljava/util/Map;xp\\001sr\\000\\021java.util.HashMap\\005\\007\\332\\301\\303\\026`\\321\\003\\000\\002F\\000\\012loadFactorI\\000\\011thresholdxp?@\\000\\000\\000\\000\\000\\014w\\010\\000\\000\\000\\020\\000\\000\\000\\002t\\000\\006JOB_IDsr\\000\\016java.lang.Long;\\213\\344\\220\\314\\217#\\337\\002\\000\\001J\\000\\005valuexr\\000\\020java.lang.Number\\206\\254\\225\\035\\013\\224\\340\\213\\002\\000\\000xp\\000\\000\\000\\000\\000\\000\\000\\002t\\000\\020JOB_HANDLER_NAMEt\\000\\025userSessionTimeoutJobx\\000'); +INSERT INTO "qrtz_job_details" ("sched_name", "job_name", "job_group", "description", "job_class_name", "is_durable", "is_nonconcurrent", "is_update_data", "requests_recovery", "job_data") VALUES ('schedulerName', 'userSessionTimeoutJob', 'DEFAULT', NULL, 'cn.fuxiaoaio.ygg.framework.quartz.core.handler.JobHandlerInvoker', 'f', 't', 't', 'f', E'\\254\\355\\000\\005sr\\000\\025org.quartz.JobDataMap\\237\\260\\203\\350\\277\\251\\260\\313\\002\\000\\000xr\\000&org.quartz.utils.StringKeyDirtyFlagMap\\202\\010\\350\\303\\373\\305](\\002\\000\\001Z\\000\\023allowsTransientDataxr\\000\\035org.quartz.utils.DirtyFlagMap\\023\\346.\\255(v\\012\\316\\002\\000\\002Z\\000\\005dirtyL\\000\\003mapt\\000\\017Ljava/util/Map;xp\\001sr\\000\\021java.util.HashMap\\005\\007\\332\\301\\303\\026`\\321\\003\\000\\002F\\000\\012loadFactorI\\000\\011thresholdxp?@\\000\\000\\000\\000\\000\\014w\\010\\000\\000\\000\\020\\000\\000\\000\\002t\\000\\006JOB_IDsr\\000\\016java.lang.Long;\\213\\344\\220\\314\\217#\\337\\002\\000\\001J\\000\\005valuexr\\000\\020java.lang.Number\\206\\254\\225\\035\\013\\224\\340\\213\\002\\000\\000xp\\000\\000\\000\\000\\000\\000\\000\\002t\\000\\020JOB_HANDLER_NAMEt\\000\\025userSessionTimeoutJobx\\000'); COMMIT; -- ---------------------------- @@ -2846,7 +2846,7 @@ COMMENT ON TABLE "system_notice" IS '通知公告表'; -- ---------------------------- BEGIN; INSERT INTO "system_notice" ("id", "title", "content", "type", "status", "creator", "create_time", "updater", "update_time", "deleted", "tenant_id") VALUES (1, '芋道的公众', '

新版本内容133

', 1, 0, 'admin', '2021-01-05 17:03:48', '1', '2022-05-04 21:00:20', 0, 1); -INSERT INTO "system_notice" ("id", "title", "content", "type", "status", "creator", "create_time", "updater", "update_time", "deleted", "tenant_id") VALUES (2, '维护通知：2018-07-01 若依系统凌晨维护', '

维护内容

', 2, 1, 'admin', '2021-01-05 17:03:48', '1', '2022-05-11 12:34:24', 0, 1); +INSERT INTO "system_notice" ("id", "title", "content", "type", "status", "creator", "create_time", "updater", "update_time", "deleted", "tenant_id") VALUES (2, '维护通知：2018-07-01 若依系统凌晨维护', '

维护内容

', 2, 1, 'admin', '2021-01-05 17:03:48', '1', '2022-05-11 12:34:24', 0, 1); INSERT INTO "system_notice" ("id", "title", "content", "type", "status", "creator", "create_time", "updater", "update_time", "deleted", "tenant_id") VALUES (4, '我是测试标题', '

哈哈哈哈123

', 1, 0, '110', '2022-02-22 01:01:25', '110', '2022-02-22 01:01:46', 0, 121); COMMIT; @@ -2989,8 +2989,8 @@ COMMENT ON TABLE "system_oauth2_client" IS 'OAuth2 客户端表'; -- Records of system_oauth2_client -- ---------------------------- BEGIN; -INSERT INTO "system_oauth2_client" ("id", "client_id", "secret", "name", "logo", "description", "status", "access_token_validity_seconds", "refresh_token_validity_seconds", "redirect_uris", "authorized_grant_types", "scopes", "authorities", "resource_ids", "additional_information", "creator", "create_time", "updater", "update_time", "deleted", "auto_approve_scopes") VALUES (1, 'default', 'admin123', '芋道源码', 'http://test.yudao.iocoder.cn/a5e2e244368878a366b516805a4aabf1.png', '我是描述', 0, 180, 8640, '["https://www.iocoder.cn","https://doc.iocoder.cn"]', '["password","authorization_code","implicit","refresh_token"]', '["user.read","user.write"]', '["system:user:query"]', '[]', '{}', '1', '2022-05-11 21:47:12', '1', '2022-05-12 01:00:20', 0, NULL); -INSERT INTO "system_oauth2_client" ("id", "client_id", "secret", "name", "logo", "description", "status", "access_token_validity_seconds", "refresh_token_validity_seconds", "redirect_uris", "authorized_grant_types", "scopes", "authorities", "resource_ids", "additional_information", "creator", "create_time", "updater", "update_time", "deleted", "auto_approve_scopes") VALUES (40, 'test', 'test2', 'biubiu', 'http://test.yudao.iocoder.cn/277a899d573723f1fcdfb57340f00379.png', NULL, 0, 1800, 43200, '["https://www.iocoder.cn"]', '["password","authorization_code","implicit"]', '[]', '[]', '[]', '{}', '1', '2022-05-12 00:28:20', '1', '2022-05-25 23:45:33.005', 0, '[]'); +INSERT INTO "system_oauth2_client" ("id", "client_id", "secret", "name", "logo", "description", "status", "access_token_validity_seconds", "refresh_token_validity_seconds", "redirect_uris", "authorized_grant_types", "scopes", "authorities", "resource_ids", "additional_information", "creator", "create_time", "updater", "update_time", "deleted", "auto_approve_scopes") VALUES (1, 'default', 'admin123', '芋道源码', 'http://test.fuxiaoaio.iocoder.cn/a5e2e244368878a366b516805a4aabf1.png', '我是描述', 0, 180, 8640, '["https://www.iocoder.cn","https://doc.iocoder.cn"]', '["password","authorization_code","implicit","refresh_token"]', '["user.read","user.write"]', '["system:user:query"]', '[]', '{}', '1', '2022-05-11 21:47:12', '1', '2022-05-12 01:00:20', 0, NULL); +INSERT INTO "system_oauth2_client" ("id", "client_id", "secret", "name", "logo", "description", "status", "access_token_validity_seconds", "refresh_token_validity_seconds", "redirect_uris", "authorized_grant_types", "scopes", "authorities", "resource_ids", "additional_information", "creator", "create_time", "updater", "update_time", "deleted", "auto_approve_scopes") VALUES (40, 'test', 'test2', 'biubiu', 'http://test.fuxiaoaio.iocoder.cn/277a899d573723f1fcdfb57340f00379.png', NULL, 0, 1800, 43200, '["https://www.iocoder.cn"]', '["password","authorization_code","implicit"]', '[]', '[]', '[]', '{}', '1', '2022-05-12 00:28:20', '1', '2022-05-25 23:45:33.005', 0, '[]'); COMMIT; -- ---------------------------- @@ -4024,7 +4024,7 @@ COMMENT ON TABLE "system_users" IS '用户信息表'; -- Records of system_users -- ---------------------------- BEGIN; -INSERT INTO "system_users" ("id", "username", "password", "nickname", "remark", "dept_id", "post_ids", "email", "mobile", "sex", "avatar", "status", "login_ip", "login_date", "creator", "create_time", "updater", "update_time", "deleted", "tenant_id") VALUES (100, 'yudao', '$2a$10$11U48RhyJ5pSBYWSn12AD./ld671.ycSzJHbyrtpeoMeYiw31eo8a', '芋道', '不要吓我', 104, '[1]', 'yudao@iocoder.cn', '15601691300', 1, '', 1, '', NULL, '', '2021-01-07 09:07:17', '104', '2021-12-16 09:26:10', 0, 1); +INSERT INTO "system_users" ("id", "username", "password", "nickname", "remark", "dept_id", "post_ids", "email", "mobile", "sex", "avatar", "status", "login_ip", "login_date", "creator", "create_time", "updater", "update_time", "deleted", "tenant_id") VALUES (100, 'fuxiaoaio', '$2a$10$11U48RhyJ5pSBYWSn12AD./ld671.ycSzJHbyrtpeoMeYiw31eo8a', '芋道', '不要吓我', 104, '[1]', 'fuxiaoaio@iocoder.cn', '15601691300', 1, '', 1, '', NULL, '', '2021-01-07 09:07:17', '104', '2021-12-16 09:26:10', 0, 1); INSERT INTO "system_users" ("id", "username", "password", "nickname", "remark", "dept_id", "post_ids", "email", "mobile", "sex", "avatar", "status", "login_ip", "login_date", "creator", "create_time", "updater", "update_time", "deleted", "tenant_id") VALUES (103, 'yuanma', '$2a$10$wWoPT7sqriM2O1YXRL.je.GiL538OR6ZTN8aQZr9JAGdnpCH2tpYe', '源码', NULL, 106, NULL, 'yuanma@iocoder.cn', '15601701300', 0, '', 0, '127.0.0.1', '2022-01-18 00:33:40', '', '2021-01-13 23:50:35', NULL, '2022-01-18 00:33:40', 0, 1); INSERT INTO "system_users" ("id", "username", "password", "nickname", "remark", "dept_id", "post_ids", "email", "mobile", "sex", "avatar", "status", "login_ip", "login_date", "creator", "create_time", "updater", "update_time", "deleted", "tenant_id") VALUES (104, 'test', '$2a$10$e5RpuDCC0GYSt0Hvd2.CjujIXwgGct4SnXi6dVGxdgFsnqgEryk5a', '测试号', NULL, 107, '[]', '111@qq.com', '15601691200', 1, '', 0, '127.0.0.1', '2022-03-19 21:46:19', '', '2021-01-21 02:13:53', NULL, '2022-03-19 21:46:19', 0, 1); INSERT INTO "system_users" ("id", "username", "password", "nickname", "remark", "dept_id", "post_ids", "email", "mobile", "sex", "avatar", "status", "login_ip", "login_date", "creator", "create_time", "updater", "update_time", "deleted", "tenant_id") VALUES (107, 'admin107', '$2a$10$dYOOBKMO93v/.ReCqzyFg.o67Tqk.bbc2bhrpyBGkIw9aypCtr2pm', '芋艿', NULL, NULL, NULL, '', '15601691300', 0, '', 0, '', NULL, '1', '2022-02-20 22:59:33', '1', '2022-02-27 08:26:51', 0, 118); @@ -4036,7 +4036,7 @@ INSERT INTO "system_users" ("id", "username", "password", "nickname", "remark", INSERT INTO "system_users" ("id", "username", "password", "nickname", "remark", "dept_id", "post_ids", "email", "mobile", "sex", "avatar", "status", "login_ip", "login_date", "creator", "create_time", "updater", "update_time", "deleted", "tenant_id") VALUES (113, 'aoteman', '$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', '芋道', NULL, NULL, NULL, '', '15601691300', 0, '', 0, '127.0.0.1', '2022-03-19 18:38:51', '1', '2022-03-07 21:37:58', NULL, '2022-03-19 18:38:51', 0, 122); INSERT INTO "system_users" ("id", "username", "password", "nickname", "remark", "dept_id", "post_ids", "email", "mobile", "sex", "avatar", "status", "login_ip", "login_date", "creator", "create_time", "updater", "update_time", "deleted", "tenant_id") VALUES (114, 'hrmgr', '$2a$10$TR4eybBioGRhBmDBWkqWLO6NIh3mzYa8KBKDDB5woiGYFVlRAi.fu', 'hr 小姐姐', NULL, NULL, '[3]', '', '', 0, '', 0, '127.0.0.1', '2022-03-19 22:15:43', '1', '2022-03-19 21:50:58', NULL, '2022-03-19 22:15:43', 0, 1); INSERT INTO "system_users" ("id", "username", "password", "nickname", "remark", "dept_id", "post_ids", "email", "mobile", "sex", "avatar", "status", "login_ip", "login_date", "creator", "create_time", "updater", "update_time", "deleted", "tenant_id") VALUES (115, 'aotemane', '$2a$10$/WCwGHu1eq0wOVDd/u8HweJ0gJCHyLS6T7ndCqI8UXZAQom1etk2e', '1', '11', 100, '[]', '', '', 0, '', 0, '', NULL, '1', '2022-04-30 02:55:43', '1', '2022-04-30 02:55:43', 0, 1); -INSERT INTO "system_users" ("id", "username", "password", "nickname", "remark", "dept_id", "post_ids", "email", "mobile", "sex", "avatar", "status", "login_ip", "login_date", "creator", "create_time", "updater", "update_time", "deleted", "tenant_id") VALUES (1, 'admin', '$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', '芋道源码', '管理员', 103, '[1]', 'aoteman@126.com', '15612345678', 1, 'http://test.yudao.iocoder.cn/48934f2f-92d4-4250-b917-d10d2b262c6a', 0, '127.0.0.1', '2022-05-25 23:44:33.003', 'admin', '2021-01-05 17:03:47', NULL, '2022-05-25 23:44:33.003', 0, 1); +INSERT INTO "system_users" ("id", "username", "password", "nickname", "remark", "dept_id", "post_ids", "email", "mobile", "sex", "avatar", "status", "login_ip", "login_date", "creator", "create_time", "updater", "update_time", "deleted", "tenant_id") VALUES (1, 'admin', '$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', '芋道源码', '管理员', 103, '[1]', 'aoteman@126.com', '15612345678', 1, 'http://test.fuxiaoaio.iocoder.cn/48934f2f-92d4-4250-b917-d10d2b262c6a', 0, '127.0.0.1', '2022-05-25 23:44:33.003', 'admin', '2021-01-05 17:03:47', NULL, '2022-05-25 23:44:33.003', 0, 1); COMMIT; -- ---------------------------- diff --git a/sql/sqlserver/ruoyi-vue-pro.sql b/sql/sqlserver/ruoyi-vue-pro.sql index 386e9bd2e..0c6e7a781 100644 --- a/sql/sqlserver/ruoyi-vue-pro.sql +++ b/sql/sqlserver/ruoyi-vue-pro.sql @@ -175,7 +175,7 @@ GO BEGIN TRANSACTION GO -INSERT INTO [dbo].[QRTZ_JOB_DETAILS] ([SCHED_NAME], [JOB_NAME], [JOB_GROUP], [DESCRIPTION], [JOB_CLASS_NAME], [IS_DURABLE], [IS_NONCONCURRENT], [IS_UPDATE_DATA], [REQUESTS_RECOVERY], [JOB_DATA]) VALUES (N'schedulerName', N'userSessionTimeoutJob', N'DEFAULT', NULL, N'cn.iocoder.yudao.framework.quartz.core.handler.JobHandlerInvoker', N'0', N'1', N'1', N'0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B020000787000000000000000107400104A4F425F48414E444C45525F4E414D457400157573657253657373696F6E54696D656F75744A6F627800) +INSERT INTO [dbo].[QRTZ_JOB_DETAILS] ([SCHED_NAME], [JOB_NAME], [JOB_GROUP], [DESCRIPTION], [JOB_CLASS_NAME], [IS_DURABLE], [IS_NONCONCURRENT], [IS_UPDATE_DATA], [REQUESTS_RECOVERY], [JOB_DATA]) VALUES (N'schedulerName', N'userSessionTimeoutJob', N'DEFAULT', NULL, N'cn.fuxiaoaio.ygg.framework.quartz.core.handler.JobHandlerInvoker', N'0', N'1', N'1', N'0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B020000787000000000000000107400104A4F425F48414E444C45525F4E414D457400157573657253657373696F6E54696D656F75744A6F627800) GO COMMIT @@ -2492,7 +2492,7 @@ GO INSERT INTO [dbo].[infra_config] ([id], [category], [type], [name], [config_key], [value], [visible], [remark], [creator], [create_time], [updater], [update_time], [deleted]) VALUES (N'3', N'ui', N'1', N'主框架页-侧边栏主题', N'sys.index.sideTheme', N'theme-dark', N'0', N'深色主题theme-dark，浅色主题theme-light', N'admin', N'2021-01-05 17:03:48.0000000', N'', N'2021-01-19 03:05:21.0000000', N'0') GO -INSERT INTO [dbo].[infra_config] ([id], [category], [type], [name], [config_key], [value], [visible], [remark], [creator], [create_time], [updater], [update_time], [deleted]) VALUES (N'6', N'biz', N'2', N'登陆验证码的开关', N'yudao.captcha.enable', N'true', N'1', NULL, N'1', N'2022-02-17 00:03:11.0000000', N'1', N'2022-04-04 12:51:40.0000000', N'0') +INSERT INTO [dbo].[infra_config] ([id], [category], [type], [name], [config_key], [value], [visible], [remark], [creator], [create_time], [updater], [update_time], [deleted]) VALUES (N'6', N'biz', N'2', N'登陆验证码的开关', N'fuxiaoaio.captcha.enable', N'true', N'1', NULL, N'1', N'2022-02-17 00:03:11.0000000', N'1', N'2022-04-04 12:51:40.0000000', N'0') GO COMMIT @@ -2873,13 +2873,13 @@ GO SET IDENTITY_INSERT [dbo].[infra_file_config] ON GO -INSERT INTO [dbo].[infra_file_config] ([id], [name], [storage], [remark], [master], [config], [creator], [create_time], [updater], [update_time], [deleted]) VALUES (N'4', N'数据库', N'1', N'我是数据库', N'0', N'{"@class":"cn.iocoder.yudao.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', N'1', N'2022-03-15 23:56:24.0000000', N'1', N'2022-03-26 21:39:26.0000000', N'0') +INSERT INTO [dbo].[infra_file_config] ([id], [name], [storage], [remark], [master], [config], [creator], [create_time], [updater], [update_time], [deleted]) VALUES (N'4', N'数据库', N'1', N'我是数据库', N'0', N'{"@class":"cn.fuxiaoaio.ygg.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', N'1', N'2022-03-15 23:56:24.0000000', N'1', N'2022-03-26 21:39:26.0000000', N'0') GO -INSERT INTO [dbo].[infra_file_config] ([id], [name], [storage], [remark], [master], [config], [creator], [create_time], [updater], [update_time], [deleted]) VALUES (N'5', N'本地磁盘', N'10', N'测试下本地存储', N'0', N'{"@class":"cn.iocoder.yudao.framework.file.core.client.local.LocalFileClientConfig","basePath":"/Users/yunai/file_test","domain":"http://127.0.0.1:48080"}', N'1', N'2022-03-15 23:57:00.0000000', N'1', N'2022-03-26 21:39:26.0000000', N'0') +INSERT INTO [dbo].[infra_file_config] ([id], [name], [storage], [remark], [master], [config], [creator], [create_time], [updater], [update_time], [deleted]) VALUES (N'5', N'本地磁盘', N'10', N'测试下本地存储', N'0', N'{"@class":"cn.fuxiaoaio.ygg.framework.file.core.client.local.LocalFileClientConfig","basePath":"/Users/yunai/file_test","domain":"http://127.0.0.1:48080"}', N'1', N'2022-03-15 23:57:00.0000000', N'1', N'2022-03-26 21:39:26.0000000', N'0') GO -INSERT INTO [dbo].[infra_file_config] ([id], [name], [storage], [remark], [master], [config], [creator], [create_time], [updater], [update_time], [deleted]) VALUES (N'11', N'S3 - 七牛云', N'20', NULL, N'1', N'{"@class":"cn.iocoder.yudao.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3-cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8","accessSecret":"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP"}', N'1', N'2022-03-19 18:00:03.0000000', N'1', N'2022-03-26 21:39:26.0000000', N'0') +INSERT INTO [dbo].[infra_file_config] ([id], [name], [storage], [remark], [master], [config], [creator], [create_time], [updater], [update_time], [deleted]) VALUES (N'11', N'S3 - 七牛云', N'20', NULL, N'1', N'{"@class":"cn.fuxiaoaio.ygg.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3-cn-south-1.qiniucs.com","domain":"http://test.fuxiaoaio.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8","accessSecret":"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP"}', N'1', N'2022-03-19 18:00:03.0000000', N'1', N'2022-03-26 21:39:26.0000000', N'0') GO SET IDENTITY_INSERT [dbo].[infra_file_config] OFF @@ -3876,31 +3876,31 @@ GO SET IDENTITY_INSERT [dbo].[pay_channel] ON GO -INSERT INTO [dbo].[pay_channel] ([id], [code], [status], [remark], [fee_rate], [merchant_id], [app_id], [config], [creator], [create_time], [updater], [update_time], [tenant_id], [deleted]) VALUES (N'9', N'wx_pub', N'0', NULL, N'1', N'1', N'6', N'{"@class":"cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXPayClientConfig","appId":"wx041349c6f39b268b","mchId":"1545083881","apiVersion":"v2","mchKey":"0alL64UDQdlCwiKZ73ib7ypaIjMns06p","privateKeyContent":"-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC5q2hYE3loOQoH\nl/2kh/epuj17W8VpV5vBl7ysJWAbBXux6mlq4gKTHD0QUQdiKtDEUm/bKC9Bi6VU\nuklM5Y8oCaCbhjklHRbET8jsgd9phSNGviHclYRLsQRO8oXnN89kN0y7DYKm0hYd\nmaiS12Z3v8VaImSTr4HVeHlC/z3S6mdwSr263stKt931YTcbTj/QFH7znsv9Na0u\nX6LaMBEEAsJctWdm8Ndrd1tGh9Fzf0DA5VRXsJR3kkWspy+IwiDTPV/FDKOU9NJC\nSxMmDePerTfkoZ2s1rltqBK0ykDJrXtxR+hTzEsKZ/KpNi8tyYpfNZsviHIlUsLP\nFJ5UvUhpAgMBAAECggEAd90NltazqTIxpGdeCwrwOzWNnYbIclJprlhMKIJUgf1P\nNrPTbHoOGXTAgzkcYCat8iAaMEzH/TOu/3zn92m3uqxEcEL9v1UBLqknWHAbkB6w\ngGocqDAqYUcdNe5hvbyM+fCta5C0SQgV2PQrHOlMMICwYpkTfzhtxCdreXIYMoGg\nJEIRkZWgrm/N7LTtNgizznuUjy6OURWjXaWKPcs3b3j6G1gLj9Vp++z4y0u51nqM\n4R6fcvl8M6BjlcC8zo6DbOvCW8cXtuXsnru+2TPrUnsGeybJok4fEQsfW1BvpvPo\nief38rYJn4OWxIrHcpWrhNtXtgRPeiMGFfIsEQDmVQKBgQDzXK6Nn3Nr3TFfGVTy\n8QYrzOuY2NqzH8nnsLL6qn3HoKxTv+PcFKOTPsi6f4hIYCzBP0esRrPv0ffMu9oQ\nJvFtCJvMmcKGtp0Q5hcj0y/XkbC3AWuahJtBv8lhKXVnQXSL0j3+ombljw4/8yN0\nAzgBz+j/skQQgZ3sN5h+DHGtgwKBgQDDT784/2pd4m86c/uBmrwYfqu6MJo0eHJh\n1XPtE+u8pOHyNTFk77rKobKDqN5VlrF0uEmBc/08LKhyxJ3vh/zAbcmqT1Mq778y\nAKKUtVmvcaVDrvSQHsnhj0zt4SHGmmU34U2b9hV+nocq5VszX6/jp//HJi9bs3We\ndAzfFCmaowKBgC1MmDVGc+6lCraf+X8LPFHU4Bnga70h8qxM6NPd/nG1R76DHn/t\n25DiA+0rJgwK0unZxJadxoqic9TJNssA5Lmd+5o3GM2Imm311mLVwbcHqHQ4MHZf\nrqKrd2m9lNv2hCIurVmDk1Gxsj5XHMdQfhFgSQengCHubp30r07vNA3PAoGAUEAE\nIjdQTSMs8KeXP7mEb8wcY3R05/pVhT1fVJpK0kgtTofss7yM05V88/v+3sv8Pik6\niqZN9tuimwWOn00Q3UA/DGtrkMjRlooMQ24AW8YmUZkhg9YivTtUMKnAZwopbLx2\nVw7V5iDdCRMUVheK/c+ZmQpnixZBzcmBQGfYcGECgYBjEq3Mem+Aw6pXOu6+0FwH\n9y6Xi4HhBkq0OOZZuXFtWVry7YrD3pBgzWVAZJqJCkyPKKZzCzwdbFd3u0lYBs35\nzYgx7ug4hR+wfI980a3vxjcWGOqnOUUnUJ7ucIa+KDgnYV/bBy4jqpVreXmWAJXl\nfyjG3eLWBrtrsI9YX6zeAA==\n-----END PRIVATE KEY-----\n","privateCertContent":"-----BEGIN CERTIFICATE-----\nMIID6TCCAtGgAwIBAgIUNkEHq6aQcF80NSYqWS58ybsJzI4wDQYJKoZIhvcNAQEL\nBQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT\nFFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg\nQ0EwHhcNMjExMDIxMDU0NTQxWhcNMjYxMDIwMDU0NTQxWjB7MRMwEQYDVQQDDAox\nNTQ1MDgzODgxMRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xJzAlBgNVBAsM\nHuWOhuWfjuWMuuWkp+adjuWwp+aXpeeUqOWTgeW6lzELMAkGA1UEBgwCQ04xETAP\nBgNVBAcMCFNoZW5aaGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\nuatoWBN5aDkKB5f9pIf3qbo9e1vFaVebwZe8rCVgGwV7seppauICkxw9EFEHYirQ\nxFJv2ygvQYulVLpJTOWPKAmgm4Y5JR0WxE/I7IHfaYUjRr4h3JWES7EETvKF5zfP\nZDdMuw2CptIWHZmoktdmd7/FWiJkk6+B1Xh5Qv890upncEq9ut7LSrfd9WE3G04/\n0BR+857L/TWtLl+i2jARBALCXLVnZvDXa3dbRofRc39AwOVUV7CUd5JFrKcviMIg\n0z1fxQyjlPTSQksTJg3j3q035KGdrNa5bagStMpAya17cUfoU8xLCmfyqTYvLcmK\nXzWbL4hyJVLCzxSeVL1IaQIDAQABo4GBMH8wCQYDVR0TBAIwADALBgNVHQ8EBAMC\nBPAwZQYDVR0fBF4wXDBaoFigVoZUaHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1\nYmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMw\nMUMzRThFQkQyMA0GCSqGSIb3DQEBCwUAA4IBAQBe7XgncAY/1PLbCsnMsYt11k3V\n2cdNZ+yuCxhlOEKk3nHE6WCTL6zL0qWlTKKpnw1rE/+4OS76Tg72wWXcHfHDAOgt\n9icp62cKx1WO3QweeZpSvLDmtdLgKKrqeIWh+rL8+ZhuAOxSkaRwcsMTWDaLeDOi\n0pGeqvfG8WNhPxkkaSI8xbiTK641Yg9WT/Q4yfHS7Q6wg1dj9YQdo0dvVB0S2Nir\nX9IK6PUaHDnQeFKDmKgLkDGLaKaiijEvC91wMEE6qB8b0eNhciaxq2YhGHcFmSRP\nWUyc5CmBadt7wIOH5Z3bfuwWGxqxKjNw/baM/d+nk7hlDr01YL9c0g16B9MW\n-----END CERTIFICATE-----\n","apiV3Key":"joerVi8y5DJ3o4ttA0o1uH47Xz1u2Ase"}', NULL, N'2021-10-23 17:12:10.0000000', NULL, N'2022-02-27 04:15:13.0000000', N'1', N'0') +INSERT INTO [dbo].[pay_channel] ([id], [code], [status], [remark], [fee_rate], [merchant_id], [app_id], [config], [creator], [create_time], [updater], [update_time], [tenant_id], [deleted]) VALUES (N'9', N'wx_pub', N'0', NULL, N'1', N'1', N'6', N'{"@class":"cn.fuxiaoaio.ygg.framework.pay.core.client.impl.wx.WXPayClientConfig","appId":"wx041349c6f39b268b","mchId":"1545083881","apiVersion":"v2","mchKey":"0alL64UDQdlCwiKZ73ib7ypaIjMns06p","privateKeyContent":"-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC5q2hYE3loOQoH\nl/2kh/epuj17W8VpV5vBl7ysJWAbBXux6mlq4gKTHD0QUQdiKtDEUm/bKC9Bi6VU\nuklM5Y8oCaCbhjklHRbET8jsgd9phSNGviHclYRLsQRO8oXnN89kN0y7DYKm0hYd\nmaiS12Z3v8VaImSTr4HVeHlC/z3S6mdwSr263stKt931YTcbTj/QFH7znsv9Na0u\nX6LaMBEEAsJctWdm8Ndrd1tGh9Fzf0DA5VRXsJR3kkWspy+IwiDTPV/FDKOU9NJC\nSxMmDePerTfkoZ2s1rltqBK0ykDJrXtxR+hTzEsKZ/KpNi8tyYpfNZsviHIlUsLP\nFJ5UvUhpAgMBAAECggEAd90NltazqTIxpGdeCwrwOzWNnYbIclJprlhMKIJUgf1P\nNrPTbHoOGXTAgzkcYCat8iAaMEzH/TOu/3zn92m3uqxEcEL9v1UBLqknWHAbkB6w\ngGocqDAqYUcdNe5hvbyM+fCta5C0SQgV2PQrHOlMMICwYpkTfzhtxCdreXIYMoGg\nJEIRkZWgrm/N7LTtNgizznuUjy6OURWjXaWKPcs3b3j6G1gLj9Vp++z4y0u51nqM\n4R6fcvl8M6BjlcC8zo6DbOvCW8cXtuXsnru+2TPrUnsGeybJok4fEQsfW1BvpvPo\nief38rYJn4OWxIrHcpWrhNtXtgRPeiMGFfIsEQDmVQKBgQDzXK6Nn3Nr3TFfGVTy\n8QYrzOuY2NqzH8nnsLL6qn3HoKxTv+PcFKOTPsi6f4hIYCzBP0esRrPv0ffMu9oQ\nJvFtCJvMmcKGtp0Q5hcj0y/XkbC3AWuahJtBv8lhKXVnQXSL0j3+ombljw4/8yN0\nAzgBz+j/skQQgZ3sN5h+DHGtgwKBgQDDT784/2pd4m86c/uBmrwYfqu6MJo0eHJh\n1XPtE+u8pOHyNTFk77rKobKDqN5VlrF0uEmBc/08LKhyxJ3vh/zAbcmqT1Mq778y\nAKKUtVmvcaVDrvSQHsnhj0zt4SHGmmU34U2b9hV+nocq5VszX6/jp//HJi9bs3We\ndAzfFCmaowKBgC1MmDVGc+6lCraf+X8LPFHU4Bnga70h8qxM6NPd/nG1R76DHn/t\n25DiA+0rJgwK0unZxJadxoqic9TJNssA5Lmd+5o3GM2Imm311mLVwbcHqHQ4MHZf\nrqKrd2m9lNv2hCIurVmDk1Gxsj5XHMdQfhFgSQengCHubp30r07vNA3PAoGAUEAE\nIjdQTSMs8KeXP7mEb8wcY3R05/pVhT1fVJpK0kgtTofss7yM05V88/v+3sv8Pik6\niqZN9tuimwWOn00Q3UA/DGtrkMjRlooMQ24AW8YmUZkhg9YivTtUMKnAZwopbLx2\nVw7V5iDdCRMUVheK/c+ZmQpnixZBzcmBQGfYcGECgYBjEq3Mem+Aw6pXOu6+0FwH\n9y6Xi4HhBkq0OOZZuXFtWVry7YrD3pBgzWVAZJqJCkyPKKZzCzwdbFd3u0lYBs35\nzYgx7ug4hR+wfI980a3vxjcWGOqnOUUnUJ7ucIa+KDgnYV/bBy4jqpVreXmWAJXl\nfyjG3eLWBrtrsI9YX6zeAA==\n-----END PRIVATE KEY-----\n","privateCertContent":"-----BEGIN CERTIFICATE-----\nMIID6TCCAtGgAwIBAgIUNkEHq6aQcF80NSYqWS58ybsJzI4wDQYJKoZIhvcNAQEL\nBQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT\nFFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg\nQ0EwHhcNMjExMDIxMDU0NTQxWhcNMjYxMDIwMDU0NTQxWjB7MRMwEQYDVQQDDAox\nNTQ1MDgzODgxMRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xJzAlBgNVBAsM\nHuWOhuWfjuWMuuWkp+adjuWwp+aXpeeUqOWTgeW6lzELMAkGA1UEBgwCQ04xETAP\nBgNVBAcMCFNoZW5aaGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\nuatoWBN5aDkKB5f9pIf3qbo9e1vFaVebwZe8rCVgGwV7seppauICkxw9EFEHYirQ\nxFJv2ygvQYulVLpJTOWPKAmgm4Y5JR0WxE/I7IHfaYUjRr4h3JWES7EETvKF5zfP\nZDdMuw2CptIWHZmoktdmd7/FWiJkk6+B1Xh5Qv890upncEq9ut7LSrfd9WE3G04/\n0BR+857L/TWtLl+i2jARBALCXLVnZvDXa3dbRofRc39AwOVUV7CUd5JFrKcviMIg\n0z1fxQyjlPTSQksTJg3j3q035KGdrNa5bagStMpAya17cUfoU8xLCmfyqTYvLcmK\nXzWbL4hyJVLCzxSeVL1IaQIDAQABo4GBMH8wCQYDVR0TBAIwADALBgNVHQ8EBAMC\nBPAwZQYDVR0fBF4wXDBaoFigVoZUaHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1\nYmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMw\nMUMzRThFQkQyMA0GCSqGSIb3DQEBCwUAA4IBAQBe7XgncAY/1PLbCsnMsYt11k3V\n2cdNZ+yuCxhlOEKk3nHE6WCTL6zL0qWlTKKpnw1rE/+4OS76Tg72wWXcHfHDAOgt\n9icp62cKx1WO3QweeZpSvLDmtdLgKKrqeIWh+rL8+ZhuAOxSkaRwcsMTWDaLeDOi\n0pGeqvfG8WNhPxkkaSI8xbiTK641Yg9WT/Q4yfHS7Q6wg1dj9YQdo0dvVB0S2Nir\nX9IK6PUaHDnQeFKDmKgLkDGLaKaiijEvC91wMEE6qB8b0eNhciaxq2YhGHcFmSRP\nWUyc5CmBadt7wIOH5Z3bfuwWGxqxKjNw/baM/d+nk7hlDr01YL9c0g16B9MW\n-----END CERTIFICATE-----\n","apiV3Key":"joerVi8y5DJ3o4ttA0o1uH47Xz1u2Ase"}', NULL, N'2021-10-23 17:12:10.0000000', NULL, N'2022-02-27 04:15:13.0000000', N'1', N'0') GO -INSERT INTO [dbo].[pay_channel] ([id], [code], [status], [remark], [fee_rate], [merchant_id], [app_id], [config], [creator], [create_time], [updater], [update_time], [tenant_id], [deleted]) VALUES (N'10', N'wx_pub', N'0', NULL, N'1', N'1', N'6', N'{"@class":"cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXPayClientConfig","appId":"wx041349c6f39b268b","mchId":"1545083881","apiVersion":"v2","mchKey":"0alL64UDQdlCwiKZ73ib7ypaIjMns06p","privateKeyContent":"-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC5q2hYE3loOQoH\nl/2kh/epuj17W8VpV5vBl7ysJWAbBXux6mlq4gKTHD0QUQdiKtDEUm/bKC9Bi6VU\nuklM5Y8oCaCbhjklHRbET8jsgd9phSNGviHclYRLsQRO8oXnN89kN0y7DYKm0hYd\nmaiS12Z3v8VaImSTr4HVeHlC/z3S6mdwSr263stKt931YTcbTj/QFH7znsv9Na0u\nX6LaMBEEAsJctWdm8Ndrd1tGh9Fzf0DA5VRXsJR3kkWspy+IwiDTPV/FDKOU9NJC\nSxMmDePerTfkoZ2s1rltqBK0ykDJrXtxR+hTzEsKZ/KpNi8tyYpfNZsviHIlUsLP\nFJ5UvUhpAgMBAAECggEAd90NltazqTIxpGdeCwrwOzWNnYbIclJprlhMKIJUgf1P\nNrPTbHoOGXTAgzkcYCat8iAaMEzH/TOu/3zn92m3uqxEcEL9v1UBLqknWHAbkB6w\ngGocqDAqYUcdNe5hvbyM+fCta5C0SQgV2PQrHOlMMICwYpkTfzhtxCdreXIYMoGg\nJEIRkZWgrm/N7LTtNgizznuUjy6OURWjXaWKPcs3b3j6G1gLj9Vp++z4y0u51nqM\n4R6fcvl8M6BjlcC8zo6DbOvCW8cXtuXsnru+2TPrUnsGeybJok4fEQsfW1BvpvPo\nief38rYJn4OWxIrHcpWrhNtXtgRPeiMGFfIsEQDmVQKBgQDzXK6Nn3Nr3TFfGVTy\n8QYrzOuY2NqzH8nnsLL6qn3HoKxTv+PcFKOTPsi6f4hIYCzBP0esRrPv0ffMu9oQ\nJvFtCJvMmcKGtp0Q5hcj0y/XkbC3AWuahJtBv8lhKXVnQXSL0j3+ombljw4/8yN0\nAzgBz+j/skQQgZ3sN5h+DHGtgwKBgQDDT784/2pd4m86c/uBmrwYfqu6MJo0eHJh\n1XPtE+u8pOHyNTFk77rKobKDqN5VlrF0uEmBc/08LKhyxJ3vh/zAbcmqT1Mq778y\nAKKUtVmvcaVDrvSQHsnhj0zt4SHGmmU34U2b9hV+nocq5VszX6/jp//HJi9bs3We\ndAzfFCmaowKBgC1MmDVGc+6lCraf+X8LPFHU4Bnga70h8qxM6NPd/nG1R76DHn/t\n25DiA+0rJgwK0unZxJadxoqic9TJNssA5Lmd+5o3GM2Imm311mLVwbcHqHQ4MHZf\nrqKrd2m9lNv2hCIurVmDk1Gxsj5XHMdQfhFgSQengCHubp30r07vNA3PAoGAUEAE\nIjdQTSMs8KeXP7mEb8wcY3R05/pVhT1fVJpK0kgtTofss7yM05V88/v+3sv8Pik6\niqZN9tuimwWOn00Q3UA/DGtrkMjRlooMQ24AW8YmUZkhg9YivTtUMKnAZwopbLx2\nVw7V5iDdCRMUVheK/c+ZmQpnixZBzcmBQGfYcGECgYBjEq3Mem+Aw6pXOu6+0FwH\n9y6Xi4HhBkq0OOZZuXFtWVry7YrD3pBgzWVAZJqJCkyPKKZzCzwdbFd3u0lYBs35\nzYgx7ug4hR+wfI980a3vxjcWGOqnOUUnUJ7ucIa+KDgnYV/bBy4jqpVreXmWAJXl\nfyjG3eLWBrtrsI9YX6zeAA==\n-----END PRIVATE KEY-----\n","privateCertContent":"-----BEGIN CERTIFICATE-----\nMIID6TCCAtGgAwIBAgIUNkEHq6aQcF80NSYqWS58ybsJzI4wDQYJKoZIhvcNAQEL\nBQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT\nFFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg\nQ0EwHhcNMjExMDIxMDU0NTQxWhcNMjYxMDIwMDU0NTQxWjB7MRMwEQYDVQQDDAox\nNTQ1MDgzODgxMRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xJzAlBgNVBAsM\nHuWOhuWfjuWMuuWkp+adjuWwp+aXpeeUqOWTgeW6lzELMAkGA1UEBgwCQ04xETAP\nBgNVBAcMCFNoZW5aaGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\nuatoWBN5aDkKB5f9pIf3qbo9e1vFaVebwZe8rCVgGwV7seppauICkxw9EFEHYirQ\nxFJv2ygvQYulVLpJTOWPKAmgm4Y5JR0WxE/I7IHfaYUjRr4h3JWES7EETvKF5zfP\nZDdMuw2CptIWHZmoktdmd7/FWiJkk6+B1Xh5Qv890upncEq9ut7LSrfd9WE3G04/\n0BR+857L/TWtLl+i2jARBALCXLVnZvDXa3dbRofRc39AwOVUV7CUd5JFrKcviMIg\n0z1fxQyjlPTSQksTJg3j3q035KGdrNa5bagStMpAya17cUfoU8xLCmfyqTYvLcmK\nXzWbL4hyJVLCzxSeVL1IaQIDAQABo4GBMH8wCQYDVR0TBAIwADALBgNVHQ8EBAMC\nBPAwZQYDVR0fBF4wXDBaoFigVoZUaHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1\nYmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMw\nMUMzRThFQkQyMA0GCSqGSIb3DQEBCwUAA4IBAQBe7XgncAY/1PLbCsnMsYt11k3V\n2cdNZ+yuCxhlOEKk3nHE6WCTL6zL0qWlTKKpnw1rE/+4OS76Tg72wWXcHfHDAOgt\n9icp62cKx1WO3QweeZpSvLDmtdLgKKrqeIWh+rL8+ZhuAOxSkaRwcsMTWDaLeDOi\n0pGeqvfG8WNhPxkkaSI8xbiTK641Yg9WT/Q4yfHS7Q6wg1dj9YQdo0dvVB0S2Nir\nX9IK6PUaHDnQeFKDmKgLkDGLaKaiijEvC91wMEE6qB8b0eNhciaxq2YhGHcFmSRP\nWUyc5CmBadt7wIOH5Z3bfuwWGxqxKjNw/baM/d+nk7hlDr01YL9c0g16B9MW\n-----END CERTIFICATE-----\n","apiV3Key":"joerVi8y5DJ3o4ttA0o1uH47Xz1u2Ase"}', NULL, N'2021-12-14 22:01:24.0000000', NULL, N'2022-02-27 04:15:12.0000000', N'1', N'0') +INSERT INTO [dbo].[pay_channel] ([id], [code], [status], [remark], [fee_rate], [merchant_id], [app_id], [config], [creator], [create_time], [updater], [update_time], [tenant_id], [deleted]) VALUES (N'10', N'wx_pub', N'0', NULL, N'1', N'1', N'6', N'{"@class":"cn.fuxiaoaio.ygg.framework.pay.core.client.impl.wx.WXPayClientConfig","appId":"wx041349c6f39b268b","mchId":"1545083881","apiVersion":"v2","mchKey":"0alL64UDQdlCwiKZ73ib7ypaIjMns06p","privateKeyContent":"-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC5q2hYE3loOQoH\nl/2kh/epuj17W8VpV5vBl7ysJWAbBXux6mlq4gKTHD0QUQdiKtDEUm/bKC9Bi6VU\nuklM5Y8oCaCbhjklHRbET8jsgd9phSNGviHclYRLsQRO8oXnN89kN0y7DYKm0hYd\nmaiS12Z3v8VaImSTr4HVeHlC/z3S6mdwSr263stKt931YTcbTj/QFH7znsv9Na0u\nX6LaMBEEAsJctWdm8Ndrd1tGh9Fzf0DA5VRXsJR3kkWspy+IwiDTPV/FDKOU9NJC\nSxMmDePerTfkoZ2s1rltqBK0ykDJrXtxR+hTzEsKZ/KpNi8tyYpfNZsviHIlUsLP\nFJ5UvUhpAgMBAAECggEAd90NltazqTIxpGdeCwrwOzWNnYbIclJprlhMKIJUgf1P\nNrPTbHoOGXTAgzkcYCat8iAaMEzH/TOu/3zn92m3uqxEcEL9v1UBLqknWHAbkB6w\ngGocqDAqYUcdNe5hvbyM+fCta5C0SQgV2PQrHOlMMICwYpkTfzhtxCdreXIYMoGg\nJEIRkZWgrm/N7LTtNgizznuUjy6OURWjXaWKPcs3b3j6G1gLj9Vp++z4y0u51nqM\n4R6fcvl8M6BjlcC8zo6DbOvCW8cXtuXsnru+2TPrUnsGeybJok4fEQsfW1BvpvPo\nief38rYJn4OWxIrHcpWrhNtXtgRPeiMGFfIsEQDmVQKBgQDzXK6Nn3Nr3TFfGVTy\n8QYrzOuY2NqzH8nnsLL6qn3HoKxTv+PcFKOTPsi6f4hIYCzBP0esRrPv0ffMu9oQ\nJvFtCJvMmcKGtp0Q5hcj0y/XkbC3AWuahJtBv8lhKXVnQXSL0j3+ombljw4/8yN0\nAzgBz+j/skQQgZ3sN5h+DHGtgwKBgQDDT784/2pd4m86c/uBmrwYfqu6MJo0eHJh\n1XPtE+u8pOHyNTFk77rKobKDqN5VlrF0uEmBc/08LKhyxJ3vh/zAbcmqT1Mq778y\nAKKUtVmvcaVDrvSQHsnhj0zt4SHGmmU34U2b9hV+nocq5VszX6/jp//HJi9bs3We\ndAzfFCmaowKBgC1MmDVGc+6lCraf+X8LPFHU4Bnga70h8qxM6NPd/nG1R76DHn/t\n25DiA+0rJgwK0unZxJadxoqic9TJNssA5Lmd+5o3GM2Imm311mLVwbcHqHQ4MHZf\nrqKrd2m9lNv2hCIurVmDk1Gxsj5XHMdQfhFgSQengCHubp30r07vNA3PAoGAUEAE\nIjdQTSMs8KeXP7mEb8wcY3R05/pVhT1fVJpK0kgtTofss7yM05V88/v+3sv8Pik6\niqZN9tuimwWOn00Q3UA/DGtrkMjRlooMQ24AW8YmUZkhg9YivTtUMKnAZwopbLx2\nVw7V5iDdCRMUVheK/c+ZmQpnixZBzcmBQGfYcGECgYBjEq3Mem+Aw6pXOu6+0FwH\n9y6Xi4HhBkq0OOZZuXFtWVry7YrD3pBgzWVAZJqJCkyPKKZzCzwdbFd3u0lYBs35\nzYgx7ug4hR+wfI980a3vxjcWGOqnOUUnUJ7ucIa+KDgnYV/bBy4jqpVreXmWAJXl\nfyjG3eLWBrtrsI9YX6zeAA==\n-----END PRIVATE KEY-----\n","privateCertContent":"-----BEGIN CERTIFICATE-----\nMIID6TCCAtGgAwIBAgIUNkEHq6aQcF80NSYqWS58ybsJzI4wDQYJKoZIhvcNAQEL\nBQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT\nFFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg\nQ0EwHhcNMjExMDIxMDU0NTQxWhcNMjYxMDIwMDU0NTQxWjB7MRMwEQYDVQQDDAox\nNTQ1MDgzODgxMRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xJzAlBgNVBAsM\nHuWOhuWfjuWMuuWkp+adjuWwp+aXpeeUqOWTgeW6lzELMAkGA1UEBgwCQ04xETAP\nBgNVBAcMCFNoZW5aaGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\nuatoWBN5aDkKB5f9pIf3qbo9e1vFaVebwZe8rCVgGwV7seppauICkxw9EFEHYirQ\nxFJv2ygvQYulVLpJTOWPKAmgm4Y5JR0WxE/I7IHfaYUjRr4h3JWES7EETvKF5zfP\nZDdMuw2CptIWHZmoktdmd7/FWiJkk6+B1Xh5Qv890upncEq9ut7LSrfd9WE3G04/\n0BR+857L/TWtLl+i2jARBALCXLVnZvDXa3dbRofRc39AwOVUV7CUd5JFrKcviMIg\n0z1fxQyjlPTSQksTJg3j3q035KGdrNa5bagStMpAya17cUfoU8xLCmfyqTYvLcmK\nXzWbL4hyJVLCzxSeVL1IaQIDAQABo4GBMH8wCQYDVR0TBAIwADALBgNVHQ8EBAMC\nBPAwZQYDVR0fBF4wXDBaoFigVoZUaHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1\nYmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMw\nMUMzRThFQkQyMA0GCSqGSIb3DQEBCwUAA4IBAQBe7XgncAY/1PLbCsnMsYt11k3V\n2cdNZ+yuCxhlOEKk3nHE6WCTL6zL0qWlTKKpnw1rE/+4OS76Tg72wWXcHfHDAOgt\n9icp62cKx1WO3QweeZpSvLDmtdLgKKrqeIWh+rL8+ZhuAOxSkaRwcsMTWDaLeDOi\n0pGeqvfG8WNhPxkkaSI8xbiTK641Yg9WT/Q4yfHS7Q6wg1dj9YQdo0dvVB0S2Nir\nX9IK6PUaHDnQeFKDmKgLkDGLaKaiijEvC91wMEE6qB8b0eNhciaxq2YhGHcFmSRP\nWUyc5CmBadt7wIOH5Z3bfuwWGxqxKjNw/baM/d+nk7hlDr01YL9c0g16B9MW\n-----END CERTIFICATE-----\n","apiV3Key":"joerVi8y5DJ3o4ttA0o1uH47Xz1u2Ase"}', NULL, N'2021-12-14 22:01:24.0000000', NULL, N'2022-02-27 04:15:12.0000000', N'1', N'0') GO -INSERT INTO [dbo].[pay_channel] ([id], [code], [status], [remark], [fee_rate], [merchant_id], [app_id], [config], [creator], [create_time], [updater], [update_time], [tenant_id], [deleted]) VALUES (N'11', N'wx_pub', N'0', NULL, N'1', N'1', N'6', N'{"@class":"cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXPayClientConfig","appId":"wx041349c6f39b268b","mchId":"1545083881","apiVersion":"v2","mchKey":"0alL64UDQdlCwiKZ73ib7ypaIjMns06p","privateKeyContent":"-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC5q2hYE3loOQoH\nl/2kh/epuj17W8VpV5vBl7ysJWAbBXux6mlq4gKTHD0QUQdiKtDEUm/bKC9Bi6VU\nuklM5Y8oCaCbhjklHRbET8jsgd9phSNGviHclYRLsQRO8oXnN89kN0y7DYKm0hYd\nmaiS12Z3v8VaImSTr4HVeHlC/z3S6mdwSr263stKt931YTcbTj/QFH7znsv9Na0u\nX6LaMBEEAsJctWdm8Ndrd1tGh9Fzf0DA5VRXsJR3kkWspy+IwiDTPV/FDKOU9NJC\nSxMmDePerTfkoZ2s1rltqBK0ykDJrXtxR+hTzEsKZ/KpNi8tyYpfNZsviHIlUsLP\nFJ5UvUhpAgMBAAECggEAd90NltazqTIxpGdeCwrwOzWNnYbIclJprlhMKIJUgf1P\nNrPTbHoOGXTAgzkcYCat8iAaMEzH/TOu/3zn92m3uqxEcEL9v1UBLqknWHAbkB6w\ngGocqDAqYUcdNe5hvbyM+fCta5C0SQgV2PQrHOlMMICwYpkTfzhtxCdreXIYMoGg\nJEIRkZWgrm/N7LTtNgizznuUjy6OURWjXaWKPcs3b3j6G1gLj9Vp++z4y0u51nqM\n4R6fcvl8M6BjlcC8zo6DbOvCW8cXtuXsnru+2TPrUnsGeybJok4fEQsfW1BvpvPo\nief38rYJn4OWxIrHcpWrhNtXtgRPeiMGFfIsEQDmVQKBgQDzXK6Nn3Nr3TFfGVTy\n8QYrzOuY2NqzH8nnsLL6qn3HoKxTv+PcFKOTPsi6f4hIYCzBP0esRrPv0ffMu9oQ\nJvFtCJvMmcKGtp0Q5hcj0y/XkbC3AWuahJtBv8lhKXVnQXSL0j3+ombljw4/8yN0\nAzgBz+j/skQQgZ3sN5h+DHGtgwKBgQDDT784/2pd4m86c/uBmrwYfqu6MJo0eHJh\n1XPtE+u8pOHyNTFk77rKobKDqN5VlrF0uEmBc/08LKhyxJ3vh/zAbcmqT1Mq778y\nAKKUtVmvcaVDrvSQHsnhj0zt4SHGmmU34U2b9hV+nocq5VszX6/jp//HJi9bs3We\ndAzfFCmaowKBgC1MmDVGc+6lCraf+X8LPFHU4Bnga70h8qxM6NPd/nG1R76DHn/t\n25DiA+0rJgwK0unZxJadxoqic9TJNssA5Lmd+5o3GM2Imm311mLVwbcHqHQ4MHZf\nrqKrd2m9lNv2hCIurVmDk1Gxsj5XHMdQfhFgSQengCHubp30r07vNA3PAoGAUEAE\nIjdQTSMs8KeXP7mEb8wcY3R05/pVhT1fVJpK0kgtTofss7yM05V88/v+3sv8Pik6\niqZN9tuimwWOn00Q3UA/DGtrkMjRlooMQ24AW8YmUZkhg9YivTtUMKnAZwopbLx2\nVw7V5iDdCRMUVheK/c+ZmQpnixZBzcmBQGfYcGECgYBjEq3Mem+Aw6pXOu6+0FwH\n9y6Xi4HhBkq0OOZZuXFtWVry7YrD3pBgzWVAZJqJCkyPKKZzCzwdbFd3u0lYBs35\nzYgx7ug4hR+wfI980a3vxjcWGOqnOUUnUJ7ucIa+KDgnYV/bBy4jqpVreXmWAJXl\nfyjG3eLWBrtrsI9YX6zeAA==\n-----END PRIVATE KEY-----\n","privateCertContent":"-----BEGIN CERTIFICATE-----\nMIID6TCCAtGgAwIBAgIUNkEHq6aQcF80NSYqWS58ybsJzI4wDQYJKoZIhvcNAQEL\nBQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT\nFFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg\nQ0EwHhcNMjExMDIxMDU0NTQxWhcNMjYxMDIwMDU0NTQxWjB7MRMwEQYDVQQDDAox\nNTQ1MDgzODgxMRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xJzAlBgNVBAsM\nHuWOhuWfjuWMuuWkp+adjuWwp+aXpeeUqOWTgeW6lzELMAkGA1UEBgwCQ04xETAP\nBgNVBAcMCFNoZW5aaGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\nuatoWBN5aDkKB5f9pIf3qbo9e1vFaVebwZe8rCVgGwV7seppauICkxw9EFEHYirQ\nxFJv2ygvQYulVLpJTOWPKAmgm4Y5JR0WxE/I7IHfaYUjRr4h3JWES7EETvKF5zfP\nZDdMuw2CptIWHZmoktdmd7/FWiJkk6+B1Xh5Qv890upncEq9ut7LSrfd9WE3G04/\n0BR+857L/TWtLl+i2jARBALCXLVnZvDXa3dbRofRc39AwOVUV7CUd5JFrKcviMIg\n0z1fxQyjlPTSQksTJg3j3q035KGdrNa5bagStMpAya17cUfoU8xLCmfyqTYvLcmK\nXzWbL4hyJVLCzxSeVL1IaQIDAQABo4GBMH8wCQYDVR0TBAIwADALBgNVHQ8EBAMC\nBPAwZQYDVR0fBF4wXDBaoFigVoZUaHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1\nYmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMw\nMUMzRThFQkQyMA0GCSqGSIb3DQEBCwUAA4IBAQBe7XgncAY/1PLbCsnMsYt11k3V\n2cdNZ+yuCxhlOEKk3nHE6WCTL6zL0qWlTKKpnw1rE/+4OS76Tg72wWXcHfHDAOgt\n9icp62cKx1WO3QweeZpSvLDmtdLgKKrqeIWh+rL8+ZhuAOxSkaRwcsMTWDaLeDOi\n0pGeqvfG8WNhPxkkaSI8xbiTK641Yg9WT/Q4yfHS7Q6wg1dj9YQdo0dvVB0S2Nir\nX9IK6PUaHDnQeFKDmKgLkDGLaKaiijEvC91wMEE6qB8b0eNhciaxq2YhGHcFmSRP\nWUyc5CmBadt7wIOH5Z3bfuwWGxqxKjNw/baM/d+nk7hlDr01YL9c0g16B9MW\n-----END CERTIFICATE-----\n","apiV3Key":"joerVi8y5DJ3o4ttA0o1uH47Xz1u2Ase"}', NULL, N'2021-12-14 22:02:57.0000000', NULL, N'2022-02-27 04:15:11.0000000', N'1', N'0') +INSERT INTO [dbo].[pay_channel] ([id], [code], [status], [remark], [fee_rate], [merchant_id], [app_id], [config], [creator], [create_time], [updater], [update_time], [tenant_id], [deleted]) VALUES (N'11', N'wx_pub', N'0', NULL, N'1', N'1', N'6', N'{"@class":"cn.fuxiaoaio.ygg.framework.pay.core.client.impl.wx.WXPayClientConfig","appId":"wx041349c6f39b268b","mchId":"1545083881","apiVersion":"v2","mchKey":"0alL64UDQdlCwiKZ73ib7ypaIjMns06p","privateKeyContent":"-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC5q2hYE3loOQoH\nl/2kh/epuj17W8VpV5vBl7ysJWAbBXux6mlq4gKTHD0QUQdiKtDEUm/bKC9Bi6VU\nuklM5Y8oCaCbhjklHRbET8jsgd9phSNGviHclYRLsQRO8oXnN89kN0y7DYKm0hYd\nmaiS12Z3v8VaImSTr4HVeHlC/z3S6mdwSr263stKt931YTcbTj/QFH7znsv9Na0u\nX6LaMBEEAsJctWdm8Ndrd1tGh9Fzf0DA5VRXsJR3kkWspy+IwiDTPV/FDKOU9NJC\nSxMmDePerTfkoZ2s1rltqBK0ykDJrXtxR+hTzEsKZ/KpNi8tyYpfNZsviHIlUsLP\nFJ5UvUhpAgMBAAECggEAd90NltazqTIxpGdeCwrwOzWNnYbIclJprlhMKIJUgf1P\nNrPTbHoOGXTAgzkcYCat8iAaMEzH/TOu/3zn92m3uqxEcEL9v1UBLqknWHAbkB6w\ngGocqDAqYUcdNe5hvbyM+fCta5C0SQgV2PQrHOlMMICwYpkTfzhtxCdreXIYMoGg\nJEIRkZWgrm/N7LTtNgizznuUjy6OURWjXaWKPcs3b3j6G1gLj9Vp++z4y0u51nqM\n4R6fcvl8M6BjlcC8zo6DbOvCW8cXtuXsnru+2TPrUnsGeybJok4fEQsfW1BvpvPo\nief38rYJn4OWxIrHcpWrhNtXtgRPeiMGFfIsEQDmVQKBgQDzXK6Nn3Nr3TFfGVTy\n8QYrzOuY2NqzH8nnsLL6qn3HoKxTv+PcFKOTPsi6f4hIYCzBP0esRrPv0ffMu9oQ\nJvFtCJvMmcKGtp0Q5hcj0y/XkbC3AWuahJtBv8lhKXVnQXSL0j3+ombljw4/8yN0\nAzgBz+j/skQQgZ3sN5h+DHGtgwKBgQDDT784/2pd4m86c/uBmrwYfqu6MJo0eHJh\n1XPtE+u8pOHyNTFk77rKobKDqN5VlrF0uEmBc/08LKhyxJ3vh/zAbcmqT1Mq778y\nAKKUtVmvcaVDrvSQHsnhj0zt4SHGmmU34U2b9hV+nocq5VszX6/jp//HJi9bs3We\ndAzfFCmaowKBgC1MmDVGc+6lCraf+X8LPFHU4Bnga70h8qxM6NPd/nG1R76DHn/t\n25DiA+0rJgwK0unZxJadxoqic9TJNssA5Lmd+5o3GM2Imm311mLVwbcHqHQ4MHZf\nrqKrd2m9lNv2hCIurVmDk1Gxsj5XHMdQfhFgSQengCHubp30r07vNA3PAoGAUEAE\nIjdQTSMs8KeXP7mEb8wcY3R05/pVhT1fVJpK0kgtTofss7yM05V88/v+3sv8Pik6\niqZN9tuimwWOn00Q3UA/DGtrkMjRlooMQ24AW8YmUZkhg9YivTtUMKnAZwopbLx2\nVw7V5iDdCRMUVheK/c+ZmQpnixZBzcmBQGfYcGECgYBjEq3Mem+Aw6pXOu6+0FwH\n9y6Xi4HhBkq0OOZZuXFtWVry7YrD3pBgzWVAZJqJCkyPKKZzCzwdbFd3u0lYBs35\nzYgx7ug4hR+wfI980a3vxjcWGOqnOUUnUJ7ucIa+KDgnYV/bBy4jqpVreXmWAJXl\nfyjG3eLWBrtrsI9YX6zeAA==\n-----END PRIVATE KEY-----\n","privateCertContent":"-----BEGIN CERTIFICATE-----\nMIID6TCCAtGgAwIBAgIUNkEHq6aQcF80NSYqWS58ybsJzI4wDQYJKoZIhvcNAQEL\nBQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT\nFFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg\nQ0EwHhcNMjExMDIxMDU0NTQxWhcNMjYxMDIwMDU0NTQxWjB7MRMwEQYDVQQDDAox\nNTQ1MDgzODgxMRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xJzAlBgNVBAsM\nHuWOhuWfjuWMuuWkp+adjuWwp+aXpeeUqOWTgeW6lzELMAkGA1UEBgwCQ04xETAP\nBgNVBAcMCFNoZW5aaGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\nuatoWBN5aDkKB5f9pIf3qbo9e1vFaVebwZe8rCVgGwV7seppauICkxw9EFEHYirQ\nxFJv2ygvQYulVLpJTOWPKAmgm4Y5JR0WxE/I7IHfaYUjRr4h3JWES7EETvKF5zfP\nZDdMuw2CptIWHZmoktdmd7/FWiJkk6+B1Xh5Qv890upncEq9ut7LSrfd9WE3G04/\n0BR+857L/TWtLl+i2jARBALCXLVnZvDXa3dbRofRc39AwOVUV7CUd5JFrKcviMIg\n0z1fxQyjlPTSQksTJg3j3q035KGdrNa5bagStMpAya17cUfoU8xLCmfyqTYvLcmK\nXzWbL4hyJVLCzxSeVL1IaQIDAQABo4GBMH8wCQYDVR0TBAIwADALBgNVHQ8EBAMC\nBPAwZQYDVR0fBF4wXDBaoFigVoZUaHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1\nYmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMw\nMUMzRThFQkQyMA0GCSqGSIb3DQEBCwUAA4IBAQBe7XgncAY/1PLbCsnMsYt11k3V\n2cdNZ+yuCxhlOEKk3nHE6WCTL6zL0qWlTKKpnw1rE/+4OS76Tg72wWXcHfHDAOgt\n9icp62cKx1WO3QweeZpSvLDmtdLgKKrqeIWh+rL8+ZhuAOxSkaRwcsMTWDaLeDOi\n0pGeqvfG8WNhPxkkaSI8xbiTK641Yg9WT/Q4yfHS7Q6wg1dj9YQdo0dvVB0S2Nir\nX9IK6PUaHDnQeFKDmKgLkDGLaKaiijEvC91wMEE6qB8b0eNhciaxq2YhGHcFmSRP\nWUyc5CmBadt7wIOH5Z3bfuwWGxqxKjNw/baM/d+nk7hlDr01YL9c0g16B9MW\n-----END CERTIFICATE-----\n","apiV3Key":"joerVi8y5DJ3o4ttA0o1uH47Xz1u2Ase"}', NULL, N'2021-12-14 22:02:57.0000000', NULL, N'2022-02-27 04:15:11.0000000', N'1', N'0') GO -INSERT INTO [dbo].[pay_channel] ([id], [code], [status], [remark], [fee_rate], [merchant_id], [app_id], [config], [creator], [create_time], [updater], [update_time], [tenant_id], [deleted]) VALUES (N'12', N'wx_pub', N'0', NULL, N'1', N'1', N'6', N'{"@class":"cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXPayClientConfig","appId":"wx041349c6f39b268b","mchId":"1545083881","apiVersion":"v2","mchKey":"0alL64UDQdlCwiKZ73ib7ypaIjMns06p","privateKeyContent":"-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC5q2hYE3loOQoH\nl/2kh/epuj17W8VpV5vBl7ysJWAbBXux6mlq4gKTHD0QUQdiKtDEUm/bKC9Bi6VU\nuklM5Y8oCaCbhjklHRbET8jsgd9phSNGviHclYRLsQRO8oXnN89kN0y7DYKm0hYd\nmaiS12Z3v8VaImSTr4HVeHlC/z3S6mdwSr263stKt931YTcbTj/QFH7znsv9Na0u\nX6LaMBEEAsJctWdm8Ndrd1tGh9Fzf0DA5VRXsJR3kkWspy+IwiDTPV/FDKOU9NJC\nSxMmDePerTfkoZ2s1rltqBK0ykDJrXtxR+hTzEsKZ/KpNi8tyYpfNZsviHIlUsLP\nFJ5UvUhpAgMBAAECggEAd90NltazqTIxpGdeCwrwOzWNnYbIclJprlhMKIJUgf1P\nNrPTbHoOGXTAgzkcYCat8iAaMEzH/TOu/3zn92m3uqxEcEL9v1UBLqknWHAbkB6w\ngGocqDAqYUcdNe5hvbyM+fCta5C0SQgV2PQrHOlMMICwYpkTfzhtxCdreXIYMoGg\nJEIRkZWgrm/N7LTtNgizznuUjy6OURWjXaWKPcs3b3j6G1gLj9Vp++z4y0u51nqM\n4R6fcvl8M6BjlcC8zo6DbOvCW8cXtuXsnru+2TPrUnsGeybJok4fEQsfW1BvpvPo\nief38rYJn4OWxIrHcpWrhNtXtgRPeiMGFfIsEQDmVQKBgQDzXK6Nn3Nr3TFfGVTy\n8QYrzOuY2NqzH8nnsLL6qn3HoKxTv+PcFKOTPsi6f4hIYCzBP0esRrPv0ffMu9oQ\nJvFtCJvMmcKGtp0Q5hcj0y/XkbC3AWuahJtBv8lhKXVnQXSL0j3+ombljw4/8yN0\nAzgBz+j/skQQgZ3sN5h+DHGtgwKBgQDDT784/2pd4m86c/uBmrwYfqu6MJo0eHJh\n1XPtE+u8pOHyNTFk77rKobKDqN5VlrF0uEmBc/08LKhyxJ3vh/zAbcmqT1Mq778y\nAKKUtVmvcaVDrvSQHsnhj0zt4SHGmmU34U2b9hV+nocq5VszX6/jp//HJi9bs3We\ndAzfFCmaowKBgC1MmDVGc+6lCraf+X8LPFHU4Bnga70h8qxM6NPd/nG1R76DHn/t\n25DiA+0rJgwK0unZxJadxoqic9TJNssA5Lmd+5o3GM2Imm311mLVwbcHqHQ4MHZf\nrqKrd2m9lNv2hCIurVmDk1Gxsj5XHMdQfhFgSQengCHubp30r07vNA3PAoGAUEAE\nIjdQTSMs8KeXP7mEb8wcY3R05/pVhT1fVJpK0kgtTofss7yM05V88/v+3sv8Pik6\niqZN9tuimwWOn00Q3UA/DGtrkMjRlooMQ24AW8YmUZkhg9YivTtUMKnAZwopbLx2\nVw7V5iDdCRMUVheK/c+ZmQpnixZBzcmBQGfYcGECgYBjEq3Mem+Aw6pXOu6+0FwH\n9y6Xi4HhBkq0OOZZuXFtWVry7YrD3pBgzWVAZJqJCkyPKKZzCzwdbFd3u0lYBs35\nzYgx7ug4hR+wfI980a3vxjcWGOqnOUUnUJ7ucIa+KDgnYV/bBy4jqpVreXmWAJXl\nfyjG3eLWBrtrsI9YX6zeAA==\n-----END PRIVATE KEY-----\n","privateCertContent":"-----BEGIN CERTIFICATE-----\nMIID6TCCAtGgAwIBAgIUNkEHq6aQcF80NSYqWS58ybsJzI4wDQYJKoZIhvcNAQEL\nBQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT\nFFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg\nQ0EwHhcNMjExMDIxMDU0NTQxWhcNMjYxMDIwMDU0NTQxWjB7MRMwEQYDVQQDDAox\nNTQ1MDgzODgxMRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xJzAlBgNVBAsM\nHuWOhuWfjuWMuuWkp+adjuWwp+aXpeeUqOWTgeW6lzELMAkGA1UEBgwCQ04xETAP\nBgNVBAcMCFNoZW5aaGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\nuatoWBN5aDkKB5f9pIf3qbo9e1vFaVebwZe8rCVgGwV7seppauICkxw9EFEHYirQ\nxFJv2ygvQYulVLpJTOWPKAmgm4Y5JR0WxE/I7IHfaYUjRr4h3JWES7EETvKF5zfP\nZDdMuw2CptIWHZmoktdmd7/FWiJkk6+B1Xh5Qv890upncEq9ut7LSrfd9WE3G04/\n0BR+857L/TWtLl+i2jARBALCXLVnZvDXa3dbRofRc39AwOVUV7CUd5JFrKcviMIg\n0z1fxQyjlPTSQksTJg3j3q035KGdrNa5bagStMpAya17cUfoU8xLCmfyqTYvLcmK\nXzWbL4hyJVLCzxSeVL1IaQIDAQABo4GBMH8wCQYDVR0TBAIwADALBgNVHQ8EBAMC\nBPAwZQYDVR0fBF4wXDBaoFigVoZUaHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1\nYmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMw\nMUMzRThFQkQyMA0GCSqGSIb3DQEBCwUAA4IBAQBe7XgncAY/1PLbCsnMsYt11k3V\n2cdNZ+yuCxhlOEKk3nHE6WCTL6zL0qWlTKKpnw1rE/+4OS76Tg72wWXcHfHDAOgt\n9icp62cKx1WO3QweeZpSvLDmtdLgKKrqeIWh+rL8+ZhuAOxSkaRwcsMTWDaLeDOi\n0pGeqvfG8WNhPxkkaSI8xbiTK641Yg9WT/Q4yfHS7Q6wg1dj9YQdo0dvVB0S2Nir\nX9IK6PUaHDnQeFKDmKgLkDGLaKaiijEvC91wMEE6qB8b0eNhciaxq2YhGHcFmSRP\nWUyc5CmBadt7wIOH5Z3bfuwWGxqxKjNw/baM/d+nk7hlDr01YL9c0g16B9MW\n-----END CERTIFICATE-----\n","apiV3Key":"joerVi8y5DJ3o4ttA0o1uH47Xz1u2Ase"}', NULL, N'2021-12-14 22:06:10.0000000', NULL, N'2022-02-27 04:15:09.0000000', N'1', N'0') +INSERT INTO [dbo].[pay_channel] ([id], [code], [status], [remark], [fee_rate], [merchant_id], [app_id], [config], [creator], [create_time], [updater], [update_time], [tenant_id], [deleted]) VALUES (N'12', N'wx_pub', N'0', NULL, N'1', N'1', N'6', N'{"@class":"cn.fuxiaoaio.ygg.framework.pay.core.client.impl.wx.WXPayClientConfig","appId":"wx041349c6f39b268b","mchId":"1545083881","apiVersion":"v2","mchKey":"0alL64UDQdlCwiKZ73ib7ypaIjMns06p","privateKeyContent":"-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC5q2hYE3loOQoH\nl/2kh/epuj17W8VpV5vBl7ysJWAbBXux6mlq4gKTHD0QUQdiKtDEUm/bKC9Bi6VU\nuklM5Y8oCaCbhjklHRbET8jsgd9phSNGviHclYRLsQRO8oXnN89kN0y7DYKm0hYd\nmaiS12Z3v8VaImSTr4HVeHlC/z3S6mdwSr263stKt931YTcbTj/QFH7znsv9Na0u\nX6LaMBEEAsJctWdm8Ndrd1tGh9Fzf0DA5VRXsJR3kkWspy+IwiDTPV/FDKOU9NJC\nSxMmDePerTfkoZ2s1rltqBK0ykDJrXtxR+hTzEsKZ/KpNi8tyYpfNZsviHIlUsLP\nFJ5UvUhpAgMBAAECggEAd90NltazqTIxpGdeCwrwOzWNnYbIclJprlhMKIJUgf1P\nNrPTbHoOGXTAgzkcYCat8iAaMEzH/TOu/3zn92m3uqxEcEL9v1UBLqknWHAbkB6w\ngGocqDAqYUcdNe5hvbyM+fCta5C0SQgV2PQrHOlMMICwYpkTfzhtxCdreXIYMoGg\nJEIRkZWgrm/N7LTtNgizznuUjy6OURWjXaWKPcs3b3j6G1gLj9Vp++z4y0u51nqM\n4R6fcvl8M6BjlcC8zo6DbOvCW8cXtuXsnru+2TPrUnsGeybJok4fEQsfW1BvpvPo\nief38rYJn4OWxIrHcpWrhNtXtgRPeiMGFfIsEQDmVQKBgQDzXK6Nn3Nr3TFfGVTy\n8QYrzOuY2NqzH8nnsLL6qn3HoKxTv+PcFKOTPsi6f4hIYCzBP0esRrPv0ffMu9oQ\nJvFtCJvMmcKGtp0Q5hcj0y/XkbC3AWuahJtBv8lhKXVnQXSL0j3+ombljw4/8yN0\nAzgBz+j/skQQgZ3sN5h+DHGtgwKBgQDDT784/2pd4m86c/uBmrwYfqu6MJo0eHJh\n1XPtE+u8pOHyNTFk77rKobKDqN5VlrF0uEmBc/08LKhyxJ3vh/zAbcmqT1Mq778y\nAKKUtVmvcaVDrvSQHsnhj0zt4SHGmmU34U2b9hV+nocq5VszX6/jp//HJi9bs3We\ndAzfFCmaowKBgC1MmDVGc+6lCraf+X8LPFHU4Bnga70h8qxM6NPd/nG1R76DHn/t\n25DiA+0rJgwK0unZxJadxoqic9TJNssA5Lmd+5o3GM2Imm311mLVwbcHqHQ4MHZf\nrqKrd2m9lNv2hCIurVmDk1Gxsj5XHMdQfhFgSQengCHubp30r07vNA3PAoGAUEAE\nIjdQTSMs8KeXP7mEb8wcY3R05/pVhT1fVJpK0kgtTofss7yM05V88/v+3sv8Pik6\niqZN9tuimwWOn00Q3UA/DGtrkMjRlooMQ24AW8YmUZkhg9YivTtUMKnAZwopbLx2\nVw7V5iDdCRMUVheK/c+ZmQpnixZBzcmBQGfYcGECgYBjEq3Mem+Aw6pXOu6+0FwH\n9y6Xi4HhBkq0OOZZuXFtWVry7YrD3pBgzWVAZJqJCkyPKKZzCzwdbFd3u0lYBs35\nzYgx7ug4hR+wfI980a3vxjcWGOqnOUUnUJ7ucIa+KDgnYV/bBy4jqpVreXmWAJXl\nfyjG3eLWBrtrsI9YX6zeAA==\n-----END PRIVATE KEY-----\n","privateCertContent":"-----BEGIN CERTIFICATE-----\nMIID6TCCAtGgAwIBAgIUNkEHq6aQcF80NSYqWS58ybsJzI4wDQYJKoZIhvcNAQEL\nBQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT\nFFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg\nQ0EwHhcNMjExMDIxMDU0NTQxWhcNMjYxMDIwMDU0NTQxWjB7MRMwEQYDVQQDDAox\nNTQ1MDgzODgxMRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xJzAlBgNVBAsM\nHuWOhuWfjuWMuuWkp+adjuWwp+aXpeeUqOWTgeW6lzELMAkGA1UEBgwCQ04xETAP\nBgNVBAcMCFNoZW5aaGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\nuatoWBN5aDkKB5f9pIf3qbo9e1vFaVebwZe8rCVgGwV7seppauICkxw9EFEHYirQ\nxFJv2ygvQYulVLpJTOWPKAmgm4Y5JR0WxE/I7IHfaYUjRr4h3JWES7EETvKF5zfP\nZDdMuw2CptIWHZmoktdmd7/FWiJkk6+B1Xh5Qv890upncEq9ut7LSrfd9WE3G04/\n0BR+857L/TWtLl+i2jARBALCXLVnZvDXa3dbRofRc39AwOVUV7CUd5JFrKcviMIg\n0z1fxQyjlPTSQksTJg3j3q035KGdrNa5bagStMpAya17cUfoU8xLCmfyqTYvLcmK\nXzWbL4hyJVLCzxSeVL1IaQIDAQABo4GBMH8wCQYDVR0TBAIwADALBgNVHQ8EBAMC\nBPAwZQYDVR0fBF4wXDBaoFigVoZUaHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1\nYmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMw\nMUMzRThFQkQyMA0GCSqGSIb3DQEBCwUAA4IBAQBe7XgncAY/1PLbCsnMsYt11k3V\n2cdNZ+yuCxhlOEKk3nHE6WCTL6zL0qWlTKKpnw1rE/+4OS76Tg72wWXcHfHDAOgt\n9icp62cKx1WO3QweeZpSvLDmtdLgKKrqeIWh+rL8+ZhuAOxSkaRwcsMTWDaLeDOi\n0pGeqvfG8WNhPxkkaSI8xbiTK641Yg9WT/Q4yfHS7Q6wg1dj9YQdo0dvVB0S2Nir\nX9IK6PUaHDnQeFKDmKgLkDGLaKaiijEvC91wMEE6qB8b0eNhciaxq2YhGHcFmSRP\nWUyc5CmBadt7wIOH5Z3bfuwWGxqxKjNw/baM/d+nk7hlDr01YL9c0g16B9MW\n-----END CERTIFICATE-----\n","apiV3Key":"joerVi8y5DJ3o4ttA0o1uH47Xz1u2Ase"}', NULL, N'2021-12-14 22:06:10.0000000', NULL, N'2022-02-27 04:15:09.0000000', N'1', N'0') GO -INSERT INTO [dbo].[pay_channel] ([id], [code], [status], [remark], [fee_rate], [merchant_id], [app_id], [config], [creator], [create_time], [updater], [update_time], [tenant_id], [deleted]) VALUES (N'13', N'wx_pub', N'0', NULL, N'1', N'1', N'6', N'{"@class":"cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXPayClientConfig","appId":"wx041349c6f39b268b","mchId":"1545083881","apiVersion":"v2","mchKey":"0alL64UDQdlCwiKZ73ib7ypaIjMns06p","privateKeyContent":"-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC5q2hYE3loOQoH\nl/2kh/epuj17W8VpV5vBl7ysJWAbBXux6mlq4gKTHD0QUQdiKtDEUm/bKC9Bi6VU\nuklM5Y8oCaCbhjklHRbET8jsgd9phSNGviHclYRLsQRO8oXnN89kN0y7DYKm0hYd\nmaiS12Z3v8VaImSTr4HVeHlC/z3S6mdwSr263stKt931YTcbTj/QFH7znsv9Na0u\nX6LaMBEEAsJctWdm8Ndrd1tGh9Fzf0DA5VRXsJR3kkWspy+IwiDTPV/FDKOU9NJC\nSxMmDePerTfkoZ2s1rltqBK0ykDJrXtxR+hTzEsKZ/KpNi8tyYpfNZsviHIlUsLP\nFJ5UvUhpAgMBAAECggEAd90NltazqTIxpGdeCwrwOzWNnYbIclJprlhMKIJUgf1P\nNrPTbHoOGXTAgzkcYCat8iAaMEzH/TOu/3zn92m3uqxEcEL9v1UBLqknWHAbkB6w\ngGocqDAqYUcdNe5hvbyM+fCta5C0SQgV2PQrHOlMMICwYpkTfzhtxCdreXIYMoGg\nJEIRkZWgrm/N7LTtNgizznuUjy6OURWjXaWKPcs3b3j6G1gLj9Vp++z4y0u51nqM\n4R6fcvl8M6BjlcC8zo6DbOvCW8cXtuXsnru+2TPrUnsGeybJok4fEQsfW1BvpvPo\nief38rYJn4OWxIrHcpWrhNtXtgRPeiMGFfIsEQDmVQKBgQDzXK6Nn3Nr3TFfGVTy\n8QYrzOuY2NqzH8nnsLL6qn3HoKxTv+PcFKOTPsi6f4hIYCzBP0esRrPv0ffMu9oQ\nJvFtCJvMmcKGtp0Q5hcj0y/XkbC3AWuahJtBv8lhKXVnQXSL0j3+ombljw4/8yN0\nAzgBz+j/skQQgZ3sN5h+DHGtgwKBgQDDT784/2pd4m86c/uBmrwYfqu6MJo0eHJh\n1XPtE+u8pOHyNTFk77rKobKDqN5VlrF0uEmBc/08LKhyxJ3vh/zAbcmqT1Mq778y\nAKKUtVmvcaVDrvSQHsnhj0zt4SHGmmU34U2b9hV+nocq5VszX6/jp//HJi9bs3We\ndAzfFCmaowKBgC1MmDVGc+6lCraf+X8LPFHU4Bnga70h8qxM6NPd/nG1R76DHn/t\n25DiA+0rJgwK0unZxJadxoqic9TJNssA5Lmd+5o3GM2Imm311mLVwbcHqHQ4MHZf\nrqKrd2m9lNv2hCIurVmDk1Gxsj5XHMdQfhFgSQengCHubp30r07vNA3PAoGAUEAE\nIjdQTSMs8KeXP7mEb8wcY3R05/pVhT1fVJpK0kgtTofss7yM05V88/v+3sv8Pik6\niqZN9tuimwWOn00Q3UA/DGtrkMjRlooMQ24AW8YmUZkhg9YivTtUMKnAZwopbLx2\nVw7V5iDdCRMUVheK/c+ZmQpnixZBzcmBQGfYcGECgYBjEq3Mem+Aw6pXOu6+0FwH\n9y6Xi4HhBkq0OOZZuXFtWVry7YrD3pBgzWVAZJqJCkyPKKZzCzwdbFd3u0lYBs35\nzYgx7ug4hR+wfI980a3vxjcWGOqnOUUnUJ7ucIa+KDgnYV/bBy4jqpVreXmWAJXl\nfyjG3eLWBrtrsI9YX6zeAA==\n-----END PRIVATE KEY-----\n","privateCertContent":"-----BEGIN CERTIFICATE-----\nMIID6TCCAtGgAwIBAgIUNkEHq6aQcF80NSYqWS58ybsJzI4wDQYJKoZIhvcNAQEL\nBQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT\nFFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg\nQ0EwHhcNMjExMDIxMDU0NTQxWhcNMjYxMDIwMDU0NTQxWjB7MRMwEQYDVQQDDAox\nNTQ1MDgzODgxMRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xJzAlBgNVBAsM\nHuWOhuWfjuWMuuWkp+adjuWwp+aXpeeUqOWTgeW6lzELMAkGA1UEBgwCQ04xETAP\nBgNVBAcMCFNoZW5aaGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\nuatoWBN5aDkKB5f9pIf3qbo9e1vFaVebwZe8rCVgGwV7seppauICkxw9EFEHYirQ\nxFJv2ygvQYulVLpJTOWPKAmgm4Y5JR0WxE/I7IHfaYUjRr4h3JWES7EETvKF5zfP\nZDdMuw2CptIWHZmoktdmd7/FWiJkk6+B1Xh5Qv890upncEq9ut7LSrfd9WE3G04/\n0BR+857L/TWtLl+i2jARBALCXLVnZvDXa3dbRofRc39AwOVUV7CUd5JFrKcviMIg\n0z1fxQyjlPTSQksTJg3j3q035KGdrNa5bagStMpAya17cUfoU8xLCmfyqTYvLcmK\nXzWbL4hyJVLCzxSeVL1IaQIDAQABo4GBMH8wCQYDVR0TBAIwADALBgNVHQ8EBAMC\nBPAwZQYDVR0fBF4wXDBaoFigVoZUaHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1\nYmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMw\nMUMzRThFQkQyMA0GCSqGSIb3DQEBCwUAA4IBAQBe7XgncAY/1PLbCsnMsYt11k3V\n2cdNZ+yuCxhlOEKk3nHE6WCTL6zL0qWlTKKpnw1rE/+4OS76Tg72wWXcHfHDAOgt\n9icp62cKx1WO3QweeZpSvLDmtdLgKKrqeIWh+rL8+ZhuAOxSkaRwcsMTWDaLeDOi\n0pGeqvfG8WNhPxkkaSI8xbiTK641Yg9WT/Q4yfHS7Q6wg1dj9YQdo0dvVB0S2Nir\nX9IK6PUaHDnQeFKDmKgLkDGLaKaiijEvC91wMEE6qB8b0eNhciaxq2YhGHcFmSRP\nWUyc5CmBadt7wIOH5Z3bfuwWGxqxKjNw/baM/d+nk7hlDr01YL9c0g16B9MW\n-----END CERTIFICATE-----\n","apiV3Key":"joerVi8y5DJ3o4ttA0o1uH47Xz1u2Ase"}', NULL, N'2021-12-14 22:09:39.0000000', NULL, N'2022-02-27 04:15:08.0000000', N'1', N'0') +INSERT INTO [dbo].[pay_channel] ([id], [code], [status], [remark], [fee_rate], [merchant_id], [app_id], [config], [creator], [create_time], [updater], [update_time], [tenant_id], [deleted]) VALUES (N'13', N'wx_pub', N'0', NULL, N'1', N'1', N'6', N'{"@class":"cn.fuxiaoaio.ygg.framework.pay.core.client.impl.wx.WXPayClientConfig","appId":"wx041349c6f39b268b","mchId":"1545083881","apiVersion":"v2","mchKey":"0alL64UDQdlCwiKZ73ib7ypaIjMns06p","privateKeyContent":"-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC5q2hYE3loOQoH\nl/2kh/epuj17W8VpV5vBl7ysJWAbBXux6mlq4gKTHD0QUQdiKtDEUm/bKC9Bi6VU\nuklM5Y8oCaCbhjklHRbET8jsgd9phSNGviHclYRLsQRO8oXnN89kN0y7DYKm0hYd\nmaiS12Z3v8VaImSTr4HVeHlC/z3S6mdwSr263stKt931YTcbTj/QFH7znsv9Na0u\nX6LaMBEEAsJctWdm8Ndrd1tGh9Fzf0DA5VRXsJR3kkWspy+IwiDTPV/FDKOU9NJC\nSxMmDePerTfkoZ2s1rltqBK0ykDJrXtxR+hTzEsKZ/KpNi8tyYpfNZsviHIlUsLP\nFJ5UvUhpAgMBAAECggEAd90NltazqTIxpGdeCwrwOzWNnYbIclJprlhMKIJUgf1P\nNrPTbHoOGXTAgzkcYCat8iAaMEzH/TOu/3zn92m3uqxEcEL9v1UBLqknWHAbkB6w\ngGocqDAqYUcdNe5hvbyM+fCta5C0SQgV2PQrHOlMMICwYpkTfzhtxCdreXIYMoGg\nJEIRkZWgrm/N7LTtNgizznuUjy6OURWjXaWKPcs3b3j6G1gLj9Vp++z4y0u51nqM\n4R6fcvl8M6BjlcC8zo6DbOvCW8cXtuXsnru+2TPrUnsGeybJok4fEQsfW1BvpvPo\nief38rYJn4OWxIrHcpWrhNtXtgRPeiMGFfIsEQDmVQKBgQDzXK6Nn3Nr3TFfGVTy\n8QYrzOuY2NqzH8nnsLL6qn3HoKxTv+PcFKOTPsi6f4hIYCzBP0esRrPv0ffMu9oQ\nJvFtCJvMmcKGtp0Q5hcj0y/XkbC3AWuahJtBv8lhKXVnQXSL0j3+ombljw4/8yN0\nAzgBz+j/skQQgZ3sN5h+DHGtgwKBgQDDT784/2pd4m86c/uBmrwYfqu6MJo0eHJh\n1XPtE+u8pOHyNTFk77rKobKDqN5VlrF0uEmBc/08LKhyxJ3vh/zAbcmqT1Mq778y\nAKKUtVmvcaVDrvSQHsnhj0zt4SHGmmU34U2b9hV+nocq5VszX6/jp//HJi9bs3We\ndAzfFCmaowKBgC1MmDVGc+6lCraf+X8LPFHU4Bnga70h8qxM6NPd/nG1R76DHn/t\n25DiA+0rJgwK0unZxJadxoqic9TJNssA5Lmd+5o3GM2Imm311mLVwbcHqHQ4MHZf\nrqKrd2m9lNv2hCIurVmDk1Gxsj5XHMdQfhFgSQengCHubp30r07vNA3PAoGAUEAE\nIjdQTSMs8KeXP7mEb8wcY3R05/pVhT1fVJpK0kgtTofss7yM05V88/v+3sv8Pik6\niqZN9tuimwWOn00Q3UA/DGtrkMjRlooMQ24AW8YmUZkhg9YivTtUMKnAZwopbLx2\nVw7V5iDdCRMUVheK/c+ZmQpnixZBzcmBQGfYcGECgYBjEq3Mem+Aw6pXOu6+0FwH\n9y6Xi4HhBkq0OOZZuXFtWVry7YrD3pBgzWVAZJqJCkyPKKZzCzwdbFd3u0lYBs35\nzYgx7ug4hR+wfI980a3vxjcWGOqnOUUnUJ7ucIa+KDgnYV/bBy4jqpVreXmWAJXl\nfyjG3eLWBrtrsI9YX6zeAA==\n-----END PRIVATE KEY-----\n","privateCertContent":"-----BEGIN CERTIFICATE-----\nMIID6TCCAtGgAwIBAgIUNkEHq6aQcF80NSYqWS58ybsJzI4wDQYJKoZIhvcNAQEL\nBQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT\nFFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg\nQ0EwHhcNMjExMDIxMDU0NTQxWhcNMjYxMDIwMDU0NTQxWjB7MRMwEQYDVQQDDAox\nNTQ1MDgzODgxMRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xJzAlBgNVBAsM\nHuWOhuWfjuWMuuWkp+adjuWwp+aXpeeUqOWTgeW6lzELMAkGA1UEBgwCQ04xETAP\nBgNVBAcMCFNoZW5aaGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\nuatoWBN5aDkKB5f9pIf3qbo9e1vFaVebwZe8rCVgGwV7seppauICkxw9EFEHYirQ\nxFJv2ygvQYulVLpJTOWPKAmgm4Y5JR0WxE/I7IHfaYUjRr4h3JWES7EETvKF5zfP\nZDdMuw2CptIWHZmoktdmd7/FWiJkk6+B1Xh5Qv890upncEq9ut7LSrfd9WE3G04/\n0BR+857L/TWtLl+i2jARBALCXLVnZvDXa3dbRofRc39AwOVUV7CUd5JFrKcviMIg\n0z1fxQyjlPTSQksTJg3j3q035KGdrNa5bagStMpAya17cUfoU8xLCmfyqTYvLcmK\nXzWbL4hyJVLCzxSeVL1IaQIDAQABo4GBMH8wCQYDVR0TBAIwADALBgNVHQ8EBAMC\nBPAwZQYDVR0fBF4wXDBaoFigVoZUaHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1\nYmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMw\nMUMzRThFQkQyMA0GCSqGSIb3DQEBCwUAA4IBAQBe7XgncAY/1PLbCsnMsYt11k3V\n2cdNZ+yuCxhlOEKk3nHE6WCTL6zL0qWlTKKpnw1rE/+4OS76Tg72wWXcHfHDAOgt\n9icp62cKx1WO3QweeZpSvLDmtdLgKKrqeIWh+rL8+ZhuAOxSkaRwcsMTWDaLeDOi\n0pGeqvfG8WNhPxkkaSI8xbiTK641Yg9WT/Q4yfHS7Q6wg1dj9YQdo0dvVB0S2Nir\nX9IK6PUaHDnQeFKDmKgLkDGLaKaiijEvC91wMEE6qB8b0eNhciaxq2YhGHcFmSRP\nWUyc5CmBadt7wIOH5Z3bfuwWGxqxKjNw/baM/d+nk7hlDr01YL9c0g16B9MW\n-----END CERTIFICATE-----\n","apiV3Key":"joerVi8y5DJ3o4ttA0o1uH47Xz1u2Ase"}', NULL, N'2021-12-14 22:09:39.0000000', NULL, N'2022-02-27 04:15:08.0000000', N'1', N'0') GO -INSERT INTO [dbo].[pay_channel] ([id], [code], [status], [remark], [fee_rate], [merchant_id], [app_id], [config], [creator], [create_time], [updater], [update_time], [tenant_id], [deleted]) VALUES (N'14', N'wx_pub', N'0', NULL, N'1', N'1', N'6', N'{"@class":"cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXPayClientConfig","appId":"wx041349c6f39b268b","mchId":"1545083881","apiVersion":"v2","mchKey":"0alL64UDQdlCwiKZ73ib7ypaIjMns06p","privateKeyContent":"-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC5q2hYE3loOQoH\nl/2kh/epuj17W8VpV5vBl7ysJWAbBXux6mlq4gKTHD0QUQdiKtDEUm/bKC9Bi6VU\nuklM5Y8oCaCbhjklHRbET8jsgd9phSNGviHclYRLsQRO8oXnN89kN0y7DYKm0hYd\nmaiS12Z3v8VaImSTr4HVeHlC/z3S6mdwSr263stKt931YTcbTj/QFH7znsv9Na0u\nX6LaMBEEAsJctWdm8Ndrd1tGh9Fzf0DA5VRXsJR3kkWspy+IwiDTPV/FDKOU9NJC\nSxMmDePerTfkoZ2s1rltqBK0ykDJrXtxR+hTzEsKZ/KpNi8tyYpfNZsviHIlUsLP\nFJ5UvUhpAgMBAAECggEAd90NltazqTIxpGdeCwrwOzWNnYbIclJprlhMKIJUgf1P\nNrPTbHoOGXTAgzkcYCat8iAaMEzH/TOu/3zn92m3uqxEcEL9v1UBLqknWHAbkB6w\ngGocqDAqYUcdNe5hvbyM+fCta5C0SQgV2PQrHOlMMICwYpkTfzhtxCdreXIYMoGg\nJEIRkZWgrm/N7LTtNgizznuUjy6OURWjXaWKPcs3b3j6G1gLj9Vp++z4y0u51nqM\n4R6fcvl8M6BjlcC8zo6DbOvCW8cXtuXsnru+2TPrUnsGeybJok4fEQsfW1BvpvPo\nief38rYJn4OWxIrHcpWrhNtXtgRPeiMGFfIsEQDmVQKBgQDzXK6Nn3Nr3TFfGVTy\n8QYrzOuY2NqzH8nnsLL6qn3HoKxTv+PcFKOTPsi6f4hIYCzBP0esRrPv0ffMu9oQ\nJvFtCJvMmcKGtp0Q5hcj0y/XkbC3AWuahJtBv8lhKXVnQXSL0j3+ombljw4/8yN0\nAzgBz+j/skQQgZ3sN5h+DHGtgwKBgQDDT784/2pd4m86c/uBmrwYfqu6MJo0eHJh\n1XPtE+u8pOHyNTFk77rKobKDqN5VlrF0uEmBc/08LKhyxJ3vh/zAbcmqT1Mq778y\nAKKUtVmvcaVDrvSQHsnhj0zt4SHGmmU34U2b9hV+nocq5VszX6/jp//HJi9bs3We\ndAzfFCmaowKBgC1MmDVGc+6lCraf+X8LPFHU4Bnga70h8qxM6NPd/nG1R76DHn/t\n25DiA+0rJgwK0unZxJadxoqic9TJNssA5Lmd+5o3GM2Imm311mLVwbcHqHQ4MHZf\nrqKrd2m9lNv2hCIurVmDk1Gxsj5XHMdQfhFgSQengCHubp30r07vNA3PAoGAUEAE\nIjdQTSMs8KeXP7mEb8wcY3R05/pVhT1fVJpK0kgtTofss7yM05V88/v+3sv8Pik6\niqZN9tuimwWOn00Q3UA/DGtrkMjRlooMQ24AW8YmUZkhg9YivTtUMKnAZwopbLx2\nVw7V5iDdCRMUVheK/c+ZmQpnixZBzcmBQGfYcGECgYBjEq3Mem+Aw6pXOu6+0FwH\n9y6Xi4HhBkq0OOZZuXFtWVry7YrD3pBgzWVAZJqJCkyPKKZzCzwdbFd3u0lYBs35\nzYgx7ug4hR+wfI980a3vxjcWGOqnOUUnUJ7ucIa+KDgnYV/bBy4jqpVreXmWAJXl\nfyjG3eLWBrtrsI9YX6zeAA==\n-----END PRIVATE KEY-----\n","privateCertContent":"-----BEGIN CERTIFICATE-----\nMIID6TCCAtGgAwIBAgIUNkEHq6aQcF80NSYqWS58ybsJzI4wDQYJKoZIhvcNAQEL\nBQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT\nFFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg\nQ0EwHhcNMjExMDIxMDU0NTQxWhcNMjYxMDIwMDU0NTQxWjB7MRMwEQYDVQQDDAox\nNTQ1MDgzODgxMRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xJzAlBgNVBAsM\nHuWOhuWfjuWMuuWkp+adjuWwp+aXpeeUqOWTgeW6lzELMAkGA1UEBgwCQ04xETAP\nBgNVBAcMCFNoZW5aaGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\nuatoWBN5aDkKB5f9pIf3qbo9e1vFaVebwZe8rCVgGwV7seppauICkxw9EFEHYirQ\nxFJv2ygvQYulVLpJTOWPKAmgm4Y5JR0WxE/I7IHfaYUjRr4h3JWES7EETvKF5zfP\nZDdMuw2CptIWHZmoktdmd7/FWiJkk6+B1Xh5Qv890upncEq9ut7LSrfd9WE3G04/\n0BR+857L/TWtLl+i2jARBALCXLVnZvDXa3dbRofRc39AwOVUV7CUd5JFrKcviMIg\n0z1fxQyjlPTSQksTJg3j3q035KGdrNa5bagStMpAya17cUfoU8xLCmfyqTYvLcmK\nXzWbL4hyJVLCzxSeVL1IaQIDAQABo4GBMH8wCQYDVR0TBAIwADALBgNVHQ8EBAMC\nBPAwZQYDVR0fBF4wXDBaoFigVoZUaHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1\nYmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMw\nMUMzRThFQkQyMA0GCSqGSIb3DQEBCwUAA4IBAQBe7XgncAY/1PLbCsnMsYt11k3V\n2cdNZ+yuCxhlOEKk3nHE6WCTL6zL0qWlTKKpnw1rE/+4OS76Tg72wWXcHfHDAOgt\n9icp62cKx1WO3QweeZpSvLDmtdLgKKrqeIWh+rL8+ZhuAOxSkaRwcsMTWDaLeDOi\n0pGeqvfG8WNhPxkkaSI8xbiTK641Yg9WT/Q4yfHS7Q6wg1dj9YQdo0dvVB0S2Nir\nX9IK6PUaHDnQeFKDmKgLkDGLaKaiijEvC91wMEE6qB8b0eNhciaxq2YhGHcFmSRP\nWUyc5CmBadt7wIOH5Z3bfuwWGxqxKjNw/baM/d+nk7hlDr01YL9c0g16B9MW\n-----END CERTIFICATE-----\n","apiV3Key":"joerVi8y5DJ3o4ttA0o1uH47Xz1u2Ase"}', NULL, N'2021-12-14 22:38:49.0000000', NULL, N'2022-02-27 04:15:05.0000000', N'1', N'0') +INSERT INTO [dbo].[pay_channel] ([id], [code], [status], [remark], [fee_rate], [merchant_id], [app_id], [config], [creator], [create_time], [updater], [update_time], [tenant_id], [deleted]) VALUES (N'14', N'wx_pub', N'0', NULL, N'1', N'1', N'6', N'{"@class":"cn.fuxiaoaio.ygg.framework.pay.core.client.impl.wx.WXPayClientConfig","appId":"wx041349c6f39b268b","mchId":"1545083881","apiVersion":"v2","mchKey":"0alL64UDQdlCwiKZ73ib7ypaIjMns06p","privateKeyContent":"-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC5q2hYE3loOQoH\nl/2kh/epuj17W8VpV5vBl7ysJWAbBXux6mlq4gKTHD0QUQdiKtDEUm/bKC9Bi6VU\nuklM5Y8oCaCbhjklHRbET8jsgd9phSNGviHclYRLsQRO8oXnN89kN0y7DYKm0hYd\nmaiS12Z3v8VaImSTr4HVeHlC/z3S6mdwSr263stKt931YTcbTj/QFH7znsv9Na0u\nX6LaMBEEAsJctWdm8Ndrd1tGh9Fzf0DA5VRXsJR3kkWspy+IwiDTPV/FDKOU9NJC\nSxMmDePerTfkoZ2s1rltqBK0ykDJrXtxR+hTzEsKZ/KpNi8tyYpfNZsviHIlUsLP\nFJ5UvUhpAgMBAAECggEAd90NltazqTIxpGdeCwrwOzWNnYbIclJprlhMKIJUgf1P\nNrPTbHoOGXTAgzkcYCat8iAaMEzH/TOu/3zn92m3uqxEcEL9v1UBLqknWHAbkB6w\ngGocqDAqYUcdNe5hvbyM+fCta5C0SQgV2PQrHOlMMICwYpkTfzhtxCdreXIYMoGg\nJEIRkZWgrm/N7LTtNgizznuUjy6OURWjXaWKPcs3b3j6G1gLj9Vp++z4y0u51nqM\n4R6fcvl8M6BjlcC8zo6DbOvCW8cXtuXsnru+2TPrUnsGeybJok4fEQsfW1BvpvPo\nief38rYJn4OWxIrHcpWrhNtXtgRPeiMGFfIsEQDmVQKBgQDzXK6Nn3Nr3TFfGVTy\n8QYrzOuY2NqzH8nnsLL6qn3HoKxTv+PcFKOTPsi6f4hIYCzBP0esRrPv0ffMu9oQ\nJvFtCJvMmcKGtp0Q5hcj0y/XkbC3AWuahJtBv8lhKXVnQXSL0j3+ombljw4/8yN0\nAzgBz+j/skQQgZ3sN5h+DHGtgwKBgQDDT784/2pd4m86c/uBmrwYfqu6MJo0eHJh\n1XPtE+u8pOHyNTFk77rKobKDqN5VlrF0uEmBc/08LKhyxJ3vh/zAbcmqT1Mq778y\nAKKUtVmvcaVDrvSQHsnhj0zt4SHGmmU34U2b9hV+nocq5VszX6/jp//HJi9bs3We\ndAzfFCmaowKBgC1MmDVGc+6lCraf+X8LPFHU4Bnga70h8qxM6NPd/nG1R76DHn/t\n25DiA+0rJgwK0unZxJadxoqic9TJNssA5Lmd+5o3GM2Imm311mLVwbcHqHQ4MHZf\nrqKrd2m9lNv2hCIurVmDk1Gxsj5XHMdQfhFgSQengCHubp30r07vNA3PAoGAUEAE\nIjdQTSMs8KeXP7mEb8wcY3R05/pVhT1fVJpK0kgtTofss7yM05V88/v+3sv8Pik6\niqZN9tuimwWOn00Q3UA/DGtrkMjRlooMQ24AW8YmUZkhg9YivTtUMKnAZwopbLx2\nVw7V5iDdCRMUVheK/c+ZmQpnixZBzcmBQGfYcGECgYBjEq3Mem+Aw6pXOu6+0FwH\n9y6Xi4HhBkq0OOZZuXFtWVry7YrD3pBgzWVAZJqJCkyPKKZzCzwdbFd3u0lYBs35\nzYgx7ug4hR+wfI980a3vxjcWGOqnOUUnUJ7ucIa+KDgnYV/bBy4jqpVreXmWAJXl\nfyjG3eLWBrtrsI9YX6zeAA==\n-----END PRIVATE KEY-----\n","privateCertContent":"-----BEGIN CERTIFICATE-----\nMIID6TCCAtGgAwIBAgIUNkEHq6aQcF80NSYqWS58ybsJzI4wDQYJKoZIhvcNAQEL\nBQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT\nFFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg\nQ0EwHhcNMjExMDIxMDU0NTQxWhcNMjYxMDIwMDU0NTQxWjB7MRMwEQYDVQQDDAox\nNTQ1MDgzODgxMRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xJzAlBgNVBAsM\nHuWOhuWfjuWMuuWkp+adjuWwp+aXpeeUqOWTgeW6lzELMAkGA1UEBgwCQ04xETAP\nBgNVBAcMCFNoZW5aaGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\nuatoWBN5aDkKB5f9pIf3qbo9e1vFaVebwZe8rCVgGwV7seppauICkxw9EFEHYirQ\nxFJv2ygvQYulVLpJTOWPKAmgm4Y5JR0WxE/I7IHfaYUjRr4h3JWES7EETvKF5zfP\nZDdMuw2CptIWHZmoktdmd7/FWiJkk6+B1Xh5Qv890upncEq9ut7LSrfd9WE3G04/\n0BR+857L/TWtLl+i2jARBALCXLVnZvDXa3dbRofRc39AwOVUV7CUd5JFrKcviMIg\n0z1fxQyjlPTSQksTJg3j3q035KGdrNa5bagStMpAya17cUfoU8xLCmfyqTYvLcmK\nXzWbL4hyJVLCzxSeVL1IaQIDAQABo4GBMH8wCQYDVR0TBAIwADALBgNVHQ8EBAMC\nBPAwZQYDVR0fBF4wXDBaoFigVoZUaHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1\nYmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMw\nMUMzRThFQkQyMA0GCSqGSIb3DQEBCwUAA4IBAQBe7XgncAY/1PLbCsnMsYt11k3V\n2cdNZ+yuCxhlOEKk3nHE6WCTL6zL0qWlTKKpnw1rE/+4OS76Tg72wWXcHfHDAOgt\n9icp62cKx1WO3QweeZpSvLDmtdLgKKrqeIWh+rL8+ZhuAOxSkaRwcsMTWDaLeDOi\n0pGeqvfG8WNhPxkkaSI8xbiTK641Yg9WT/Q4yfHS7Q6wg1dj9YQdo0dvVB0S2Nir\nX9IK6PUaHDnQeFKDmKgLkDGLaKaiijEvC91wMEE6qB8b0eNhciaxq2YhGHcFmSRP\nWUyc5CmBadt7wIOH5Z3bfuwWGxqxKjNw/baM/d+nk7hlDr01YL9c0g16B9MW\n-----END CERTIFICATE-----\n","apiV3Key":"joerVi8y5DJ3o4ttA0o1uH47Xz1u2Ase"}', NULL, N'2021-12-14 22:38:49.0000000', NULL, N'2022-02-27 04:15:05.0000000', N'1', N'0') GO -INSERT INTO [dbo].[pay_channel] ([id], [code], [status], [remark], [fee_rate], [merchant_id], [app_id], [config], [creator], [create_time], [updater], [update_time], [tenant_id], [deleted]) VALUES (N'15', N'wx_pub', N'0', NULL, N'1', N'1', N'6', N'{"@class":"cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXPayClientConfig","appId":"wx041349c6f39b268b","mchId":"1545083881","apiVersion":"v2","mchKey":"0alL64UDQdlCwiKZ73ib7ypaIjMns06p","privateKeyContent":"-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC5q2hYE3loOQoH\nl/2kh/epuj17W8VpV5vBl7ysJWAbBXux6mlq4gKTHD0QUQdiKtDEUm/bKC9Bi6VU\nuklM5Y8oCaCbhjklHRbET8jsgd9phSNGviHclYRLsQRO8oXnN89kN0y7DYKm0hYd\nmaiS12Z3v8VaImSTr4HVeHlC/z3S6mdwSr263stKt931YTcbTj/QFH7znsv9Na0u\nX6LaMBEEAsJctWdm8Ndrd1tGh9Fzf0DA5VRXsJR3kkWspy+IwiDTPV/FDKOU9NJC\nSxMmDePerTfkoZ2s1rltqBK0ykDJrXtxR+hTzEsKZ/KpNi8tyYpfNZsviHIlUsLP\nFJ5UvUhpAgMBAAECggEAd90NltazqTIxpGdeCwrwOzWNnYbIclJprlhMKIJUgf1P\nNrPTbHoOGXTAgzkcYCat8iAaMEzH/TOu/3zn92m3uqxEcEL9v1UBLqknWHAbkB6w\ngGocqDAqYUcdNe5hvbyM+fCta5C0SQgV2PQrHOlMMICwYpkTfzhtxCdreXIYMoGg\nJEIRkZWgrm/N7LTtNgizznuUjy6OURWjXaWKPcs3b3j6G1gLj9Vp++z4y0u51nqM\n4R6fcvl8M6BjlcC8zo6DbOvCW8cXtuXsnru+2TPrUnsGeybJok4fEQsfW1BvpvPo\nief38rYJn4OWxIrHcpWrhNtXtgRPeiMGFfIsEQDmVQKBgQDzXK6Nn3Nr3TFfGVTy\n8QYrzOuY2NqzH8nnsLL6qn3HoKxTv+PcFKOTPsi6f4hIYCzBP0esRrPv0ffMu9oQ\nJvFtCJvMmcKGtp0Q5hcj0y/XkbC3AWuahJtBv8lhKXVnQXSL0j3+ombljw4/8yN0\nAzgBz+j/skQQgZ3sN5h+DHGtgwKBgQDDT784/2pd4m86c/uBmrwYfqu6MJo0eHJh\n1XPtE+u8pOHyNTFk77rKobKDqN5VlrF0uEmBc/08LKhyxJ3vh/zAbcmqT1Mq778y\nAKKUtVmvcaVDrvSQHsnhj0zt4SHGmmU34U2b9hV+nocq5VszX6/jp//HJi9bs3We\ndAzfFCmaowKBgC1MmDVGc+6lCraf+X8LPFHU4Bnga70h8qxM6NPd/nG1R76DHn/t\n25DiA+0rJgwK0unZxJadxoqic9TJNssA5Lmd+5o3GM2Imm311mLVwbcHqHQ4MHZf\nrqKrd2m9lNv2hCIurVmDk1Gxsj5XHMdQfhFgSQengCHubp30r07vNA3PAoGAUEAE\nIjdQTSMs8KeXP7mEb8wcY3R05/pVhT1fVJpK0kgtTofss7yM05V88/v+3sv8Pik6\niqZN9tuimwWOn00Q3UA/DGtrkMjRlooMQ24AW8YmUZkhg9YivTtUMKnAZwopbLx2\nVw7V5iDdCRMUVheK/c+ZmQpnixZBzcmBQGfYcGECgYBjEq3Mem+Aw6pXOu6+0FwH\n9y6Xi4HhBkq0OOZZuXFtWVry7YrD3pBgzWVAZJqJCkyPKKZzCzwdbFd3u0lYBs35\nzYgx7ug4hR+wfI980a3vxjcWGOqnOUUnUJ7ucIa+KDgnYV/bBy4jqpVreXmWAJXl\nfyjG3eLWBrtrsI9YX6zeAA==\n-----END PRIVATE KEY-----\n","privateCertContent":"-----BEGIN CERTIFICATE-----\nMIID6TCCAtGgAwIBAgIUNkEHq6aQcF80NSYqWS58ybsJzI4wDQYJKoZIhvcNAQEL\nBQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT\nFFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg\nQ0EwHhcNMjExMDIxMDU0NTQxWhcNMjYxMDIwMDU0NTQxWjB7MRMwEQYDVQQDDAox\nNTQ1MDgzODgxMRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xJzAlBgNVBAsM\nHuWOhuWfjuWMuuWkp+adjuWwp+aXpeeUqOWTgeW6lzELMAkGA1UEBgwCQ04xETAP\nBgNVBAcMCFNoZW5aaGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\nuatoWBN5aDkKB5f9pIf3qbo9e1vFaVebwZe8rCVgGwV7seppauICkxw9EFEHYirQ\nxFJv2ygvQYulVLpJTOWPKAmgm4Y5JR0WxE/I7IHfaYUjRr4h3JWES7EETvKF5zfP\nZDdMuw2CptIWHZmoktdmd7/FWiJkk6+B1Xh5Qv890upncEq9ut7LSrfd9WE3G04/\n0BR+857L/TWtLl+i2jARBALCXLVnZvDXa3dbRofRc39AwOVUV7CUd5JFrKcviMIg\n0z1fxQyjlPTSQksTJg3j3q035KGdrNa5bagStMpAya17cUfoU8xLCmfyqTYvLcmK\nXzWbL4hyJVLCzxSeVL1IaQIDAQABo4GBMH8wCQYDVR0TBAIwADALBgNVHQ8EBAMC\nBPAwZQYDVR0fBF4wXDBaoFigVoZUaHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1\nYmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMw\nMUMzRThFQkQyMA0GCSqGSIb3DQEBCwUAA4IBAQBe7XgncAY/1PLbCsnMsYt11k3V\n2cdNZ+yuCxhlOEKk3nHE6WCTL6zL0qWlTKKpnw1rE/+4OS76Tg72wWXcHfHDAOgt\n9icp62cKx1WO3QweeZpSvLDmtdLgKKrqeIWh+rL8+ZhuAOxSkaRwcsMTWDaLeDOi\n0pGeqvfG8WNhPxkkaSI8xbiTK641Yg9WT/Q4yfHS7Q6wg1dj9YQdo0dvVB0S2Nir\nX9IK6PUaHDnQeFKDmKgLkDGLaKaiijEvC91wMEE6qB8b0eNhciaxq2YhGHcFmSRP\nWUyc5CmBadt7wIOH5Z3bfuwWGxqxKjNw/baM/d+nk7hlDr01YL9c0g16B9MW\n-----END CERTIFICATE-----\n","apiV3Key":"joerVi8y5DJ3o4ttA0o1uH47Xz1u2Ase"}', NULL, N'2021-12-15 09:32:26.0000000', NULL, N'2022-02-27 04:15:04.0000000', N'1', N'0') +INSERT INTO [dbo].[pay_channel] ([id], [code], [status], [remark], [fee_rate], [merchant_id], [app_id], [config], [creator], [create_time], [updater], [update_time], [tenant_id], [deleted]) VALUES (N'15', N'wx_pub', N'0', NULL, N'1', N'1', N'6', N'{"@class":"cn.fuxiaoaio.ygg.framework.pay.core.client.impl.wx.WXPayClientConfig","appId":"wx041349c6f39b268b","mchId":"1545083881","apiVersion":"v2","mchKey":"0alL64UDQdlCwiKZ73ib7ypaIjMns06p","privateKeyContent":"-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC5q2hYE3loOQoH\nl/2kh/epuj17W8VpV5vBl7ysJWAbBXux6mlq4gKTHD0QUQdiKtDEUm/bKC9Bi6VU\nuklM5Y8oCaCbhjklHRbET8jsgd9phSNGviHclYRLsQRO8oXnN89kN0y7DYKm0hYd\nmaiS12Z3v8VaImSTr4HVeHlC/z3S6mdwSr263stKt931YTcbTj/QFH7znsv9Na0u\nX6LaMBEEAsJctWdm8Ndrd1tGh9Fzf0DA5VRXsJR3kkWspy+IwiDTPV/FDKOU9NJC\nSxMmDePerTfkoZ2s1rltqBK0ykDJrXtxR+hTzEsKZ/KpNi8tyYpfNZsviHIlUsLP\nFJ5UvUhpAgMBAAECggEAd90NltazqTIxpGdeCwrwOzWNnYbIclJprlhMKIJUgf1P\nNrPTbHoOGXTAgzkcYCat8iAaMEzH/TOu/3zn92m3uqxEcEL9v1UBLqknWHAbkB6w\ngGocqDAqYUcdNe5hvbyM+fCta5C0SQgV2PQrHOlMMICwYpkTfzhtxCdreXIYMoGg\nJEIRkZWgrm/N7LTtNgizznuUjy6OURWjXaWKPcs3b3j6G1gLj9Vp++z4y0u51nqM\n4R6fcvl8M6BjlcC8zo6DbOvCW8cXtuXsnru+2TPrUnsGeybJok4fEQsfW1BvpvPo\nief38rYJn4OWxIrHcpWrhNtXtgRPeiMGFfIsEQDmVQKBgQDzXK6Nn3Nr3TFfGVTy\n8QYrzOuY2NqzH8nnsLL6qn3HoKxTv+PcFKOTPsi6f4hIYCzBP0esRrPv0ffMu9oQ\nJvFtCJvMmcKGtp0Q5hcj0y/XkbC3AWuahJtBv8lhKXVnQXSL0j3+ombljw4/8yN0\nAzgBz+j/skQQgZ3sN5h+DHGtgwKBgQDDT784/2pd4m86c/uBmrwYfqu6MJo0eHJh\n1XPtE+u8pOHyNTFk77rKobKDqN5VlrF0uEmBc/08LKhyxJ3vh/zAbcmqT1Mq778y\nAKKUtVmvcaVDrvSQHsnhj0zt4SHGmmU34U2b9hV+nocq5VszX6/jp//HJi9bs3We\ndAzfFCmaowKBgC1MmDVGc+6lCraf+X8LPFHU4Bnga70h8qxM6NPd/nG1R76DHn/t\n25DiA+0rJgwK0unZxJadxoqic9TJNssA5Lmd+5o3GM2Imm311mLVwbcHqHQ4MHZf\nrqKrd2m9lNv2hCIurVmDk1Gxsj5XHMdQfhFgSQengCHubp30r07vNA3PAoGAUEAE\nIjdQTSMs8KeXP7mEb8wcY3R05/pVhT1fVJpK0kgtTofss7yM05V88/v+3sv8Pik6\niqZN9tuimwWOn00Q3UA/DGtrkMjRlooMQ24AW8YmUZkhg9YivTtUMKnAZwopbLx2\nVw7V5iDdCRMUVheK/c+ZmQpnixZBzcmBQGfYcGECgYBjEq3Mem+Aw6pXOu6+0FwH\n9y6Xi4HhBkq0OOZZuXFtWVry7YrD3pBgzWVAZJqJCkyPKKZzCzwdbFd3u0lYBs35\nzYgx7ug4hR+wfI980a3vxjcWGOqnOUUnUJ7ucIa+KDgnYV/bBy4jqpVreXmWAJXl\nfyjG3eLWBrtrsI9YX6zeAA==\n-----END PRIVATE KEY-----\n","privateCertContent":"-----BEGIN CERTIFICATE-----\nMIID6TCCAtGgAwIBAgIUNkEHq6aQcF80NSYqWS58ybsJzI4wDQYJKoZIhvcNAQEL\nBQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT\nFFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg\nQ0EwHhcNMjExMDIxMDU0NTQxWhcNMjYxMDIwMDU0NTQxWjB7MRMwEQYDVQQDDAox\nNTQ1MDgzODgxMRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xJzAlBgNVBAsM\nHuWOhuWfjuWMuuWkp+adjuWwp+aXpeeUqOWTgeW6lzELMAkGA1UEBgwCQ04xETAP\nBgNVBAcMCFNoZW5aaGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\nuatoWBN5aDkKB5f9pIf3qbo9e1vFaVebwZe8rCVgGwV7seppauICkxw9EFEHYirQ\nxFJv2ygvQYulVLpJTOWPKAmgm4Y5JR0WxE/I7IHfaYUjRr4h3JWES7EETvKF5zfP\nZDdMuw2CptIWHZmoktdmd7/FWiJkk6+B1Xh5Qv890upncEq9ut7LSrfd9WE3G04/\n0BR+857L/TWtLl+i2jARBALCXLVnZvDXa3dbRofRc39AwOVUV7CUd5JFrKcviMIg\n0z1fxQyjlPTSQksTJg3j3q035KGdrNa5bagStMpAya17cUfoU8xLCmfyqTYvLcmK\nXzWbL4hyJVLCzxSeVL1IaQIDAQABo4GBMH8wCQYDVR0TBAIwADALBgNVHQ8EBAMC\nBPAwZQYDVR0fBF4wXDBaoFigVoZUaHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1\nYmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMw\nMUMzRThFQkQyMA0GCSqGSIb3DQEBCwUAA4IBAQBe7XgncAY/1PLbCsnMsYt11k3V\n2cdNZ+yuCxhlOEKk3nHE6WCTL6zL0qWlTKKpnw1rE/+4OS76Tg72wWXcHfHDAOgt\n9icp62cKx1WO3QweeZpSvLDmtdLgKKrqeIWh+rL8+ZhuAOxSkaRwcsMTWDaLeDOi\n0pGeqvfG8WNhPxkkaSI8xbiTK641Yg9WT/Q4yfHS7Q6wg1dj9YQdo0dvVB0S2Nir\nX9IK6PUaHDnQeFKDmKgLkDGLaKaiijEvC91wMEE6qB8b0eNhciaxq2YhGHcFmSRP\nWUyc5CmBadt7wIOH5Z3bfuwWGxqxKjNw/baM/d+nk7hlDr01YL9c0g16B9MW\n-----END CERTIFICATE-----\n","apiV3Key":"joerVi8y5DJ3o4ttA0o1uH47Xz1u2Ase"}', NULL, N'2021-12-15 09:32:26.0000000', NULL, N'2022-02-27 04:15:04.0000000', N'1', N'0') GO -INSERT INTO [dbo].[pay_channel] ([id], [code], [status], [remark], [fee_rate], [merchant_id], [app_id], [config], [creator], [create_time], [updater], [update_time], [tenant_id], [deleted]) VALUES (N'16', N'wx_pub', N'0', NULL, N'1', N'1', N'6', N'{"@class":"cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXPayClientConfig","appId":"wx041349c6f39b268b","mchId":"1545083881","apiVersion":"v2","mchKey":"0alL64UDQdlCwiKZ73ib7ypaIjMns06p","privateKeyContent":"-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC5q2hYE3loOQoH\nl/2kh/epuj17W8VpV5vBl7ysJWAbBXux6mlq4gKTHD0QUQdiKtDEUm/bKC9Bi6VU\nuklM5Y8oCaCbhjklHRbET8jsgd9phSNGviHclYRLsQRO8oXnN89kN0y7DYKm0hYd\nmaiS12Z3v8VaImSTr4HVeHlC/z3S6mdwSr263stKt931YTcbTj/QFH7znsv9Na0u\nX6LaMBEEAsJctWdm8Ndrd1tGh9Fzf0DA5VRXsJR3kkWspy+IwiDTPV/FDKOU9NJC\nSxMmDePerTfkoZ2s1rltqBK0ykDJrXtxR+hTzEsKZ/KpNi8tyYpfNZsviHIlUsLP\nFJ5UvUhpAgMBAAECggEAd90NltazqTIxpGdeCwrwOzWNnYbIclJprlhMKIJUgf1P\nNrPTbHoOGXTAgzkcYCat8iAaMEzH/TOu/3zn92m3uqxEcEL9v1UBLqknWHAbkB6w\ngGocqDAqYUcdNe5hvbyM+fCta5C0SQgV2PQrHOlMMICwYpkTfzhtxCdreXIYMoGg\nJEIRkZWgrm/N7LTtNgizznuUjy6OURWjXaWKPcs3b3j6G1gLj9Vp++z4y0u51nqM\n4R6fcvl8M6BjlcC8zo6DbOvCW8cXtuXsnru+2TPrUnsGeybJok4fEQsfW1BvpvPo\nief38rYJn4OWxIrHcpWrhNtXtgRPeiMGFfIsEQDmVQKBgQDzXK6Nn3Nr3TFfGVTy\n8QYrzOuY2NqzH8nnsLL6qn3HoKxTv+PcFKOTPsi6f4hIYCzBP0esRrPv0ffMu9oQ\nJvFtCJvMmcKGtp0Q5hcj0y/XkbC3AWuahJtBv8lhKXVnQXSL0j3+ombljw4/8yN0\nAzgBz+j/skQQgZ3sN5h+DHGtgwKBgQDDT784/2pd4m86c/uBmrwYfqu6MJo0eHJh\n1XPtE+u8pOHyNTFk77rKobKDqN5VlrF0uEmBc/08LKhyxJ3vh/zAbcmqT1Mq778y\nAKKUtVmvcaVDrvSQHsnhj0zt4SHGmmU34U2b9hV+nocq5VszX6/jp//HJi9bs3We\ndAzfFCmaowKBgC1MmDVGc+6lCraf+X8LPFHU4Bnga70h8qxM6NPd/nG1R76DHn/t\n25DiA+0rJgwK0unZxJadxoqic9TJNssA5Lmd+5o3GM2Imm311mLVwbcHqHQ4MHZf\nrqKrd2m9lNv2hCIurVmDk1Gxsj5XHMdQfhFgSQengCHubp30r07vNA3PAoGAUEAE\nIjdQTSMs8KeXP7mEb8wcY3R05/pVhT1fVJpK0kgtTofss7yM05V88/v+3sv8Pik6\niqZN9tuimwWOn00Q3UA/DGtrkMjRlooMQ24AW8YmUZkhg9YivTtUMKnAZwopbLx2\nVw7V5iDdCRMUVheK/c+ZmQpnixZBzcmBQGfYcGECgYBjEq3Mem+Aw6pXOu6+0FwH\n9y6Xi4HhBkq0OOZZuXFtWVry7YrD3pBgzWVAZJqJCkyPKKZzCzwdbFd3u0lYBs35\nzYgx7ug4hR+wfI980a3vxjcWGOqnOUUnUJ7ucIa+KDgnYV/bBy4jqpVreXmWAJXl\nfyjG3eLWBrtrsI9YX6zeAA==\n-----END PRIVATE KEY-----\n","privateCertContent":"-----BEGIN CERTIFICATE-----\nMIID6TCCAtGgAwIBAgIUNkEHq6aQcF80NSYqWS58ybsJzI4wDQYJKoZIhvcNAQEL\nBQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT\nFFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg\nQ0EwHhcNMjExMDIxMDU0NTQxWhcNMjYxMDIwMDU0NTQxWjB7MRMwEQYDVQQDDAox\nNTQ1MDgzODgxMRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xJzAlBgNVBAsM\nHuWOhuWfjuWMuuWkp+adjuWwp+aXpeeUqOWTgeW6lzELMAkGA1UEBgwCQ04xETAP\nBgNVBAcMCFNoZW5aaGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\nuatoWBN5aDkKB5f9pIf3qbo9e1vFaVebwZe8rCVgGwV7seppauICkxw9EFEHYirQ\nxFJv2ygvQYulVLpJTOWPKAmgm4Y5JR0WxE/I7IHfaYUjRr4h3JWES7EETvKF5zfP\nZDdMuw2CptIWHZmoktdmd7/FWiJkk6+B1Xh5Qv890upncEq9ut7LSrfd9WE3G04/\n0BR+857L/TWtLl+i2jARBALCXLVnZvDXa3dbRofRc39AwOVUV7CUd5JFrKcviMIg\n0z1fxQyjlPTSQksTJg3j3q035KGdrNa5bagStMpAya17cUfoU8xLCmfyqTYvLcmK\nXzWbL4hyJVLCzxSeVL1IaQIDAQABo4GBMH8wCQYDVR0TBAIwADALBgNVHQ8EBAMC\nBPAwZQYDVR0fBF4wXDBaoFigVoZUaHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1\nYmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMw\nMUMzRThFQkQyMA0GCSqGSIb3DQEBCwUAA4IBAQBe7XgncAY/1PLbCsnMsYt11k3V\n2cdNZ+yuCxhlOEKk3nHE6WCTL6zL0qWlTKKpnw1rE/+4OS76Tg72wWXcHfHDAOgt\n9icp62cKx1WO3QweeZpSvLDmtdLgKKrqeIWh+rL8+ZhuAOxSkaRwcsMTWDaLeDOi\n0pGeqvfG8WNhPxkkaSI8xbiTK641Yg9WT/Q4yfHS7Q6wg1dj9YQdo0dvVB0S2Nir\nX9IK6PUaHDnQeFKDmKgLkDGLaKaiijEvC91wMEE6qB8b0eNhciaxq2YhGHcFmSRP\nWUyc5CmBadt7wIOH5Z3bfuwWGxqxKjNw/baM/d+nk7hlDr01YL9c0g16B9MW\n-----END CERTIFICATE-----\n","apiV3Key":"joerVi8y5DJ3o4ttA0o1uH47Xz1u2Ase"}', NULL, N'2022-01-31 22:13:25.0000000', NULL, N'2022-02-27 04:15:03.0000000', N'1', N'0') +INSERT INTO [dbo].[pay_channel] ([id], [code], [status], [remark], [fee_rate], [merchant_id], [app_id], [config], [creator], [create_time], [updater], [update_time], [tenant_id], [deleted]) VALUES (N'16', N'wx_pub', N'0', NULL, N'1', N'1', N'6', N'{"@class":"cn.fuxiaoaio.ygg.framework.pay.core.client.impl.wx.WXPayClientConfig","appId":"wx041349c6f39b268b","mchId":"1545083881","apiVersion":"v2","mchKey":"0alL64UDQdlCwiKZ73ib7ypaIjMns06p","privateKeyContent":"-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC5q2hYE3loOQoH\nl/2kh/epuj17W8VpV5vBl7ysJWAbBXux6mlq4gKTHD0QUQdiKtDEUm/bKC9Bi6VU\nuklM5Y8oCaCbhjklHRbET8jsgd9phSNGviHclYRLsQRO8oXnN89kN0y7DYKm0hYd\nmaiS12Z3v8VaImSTr4HVeHlC/z3S6mdwSr263stKt931YTcbTj/QFH7znsv9Na0u\nX6LaMBEEAsJctWdm8Ndrd1tGh9Fzf0DA5VRXsJR3kkWspy+IwiDTPV/FDKOU9NJC\nSxMmDePerTfkoZ2s1rltqBK0ykDJrXtxR+hTzEsKZ/KpNi8tyYpfNZsviHIlUsLP\nFJ5UvUhpAgMBAAECggEAd90NltazqTIxpGdeCwrwOzWNnYbIclJprlhMKIJUgf1P\nNrPTbHoOGXTAgzkcYCat8iAaMEzH/TOu/3zn92m3uqxEcEL9v1UBLqknWHAbkB6w\ngGocqDAqYUcdNe5hvbyM+fCta5C0SQgV2PQrHOlMMICwYpkTfzhtxCdreXIYMoGg\nJEIRkZWgrm/N7LTtNgizznuUjy6OURWjXaWKPcs3b3j6G1gLj9Vp++z4y0u51nqM\n4R6fcvl8M6BjlcC8zo6DbOvCW8cXtuXsnru+2TPrUnsGeybJok4fEQsfW1BvpvPo\nief38rYJn4OWxIrHcpWrhNtXtgRPeiMGFfIsEQDmVQKBgQDzXK6Nn3Nr3TFfGVTy\n8QYrzOuY2NqzH8nnsLL6qn3HoKxTv+PcFKOTPsi6f4hIYCzBP0esRrPv0ffMu9oQ\nJvFtCJvMmcKGtp0Q5hcj0y/XkbC3AWuahJtBv8lhKXVnQXSL0j3+ombljw4/8yN0\nAzgBz+j/skQQgZ3sN5h+DHGtgwKBgQDDT784/2pd4m86c/uBmrwYfqu6MJo0eHJh\n1XPtE+u8pOHyNTFk77rKobKDqN5VlrF0uEmBc/08LKhyxJ3vh/zAbcmqT1Mq778y\nAKKUtVmvcaVDrvSQHsnhj0zt4SHGmmU34U2b9hV+nocq5VszX6/jp//HJi9bs3We\ndAzfFCmaowKBgC1MmDVGc+6lCraf+X8LPFHU4Bnga70h8qxM6NPd/nG1R76DHn/t\n25DiA+0rJgwK0unZxJadxoqic9TJNssA5Lmd+5o3GM2Imm311mLVwbcHqHQ4MHZf\nrqKrd2m9lNv2hCIurVmDk1Gxsj5XHMdQfhFgSQengCHubp30r07vNA3PAoGAUEAE\nIjdQTSMs8KeXP7mEb8wcY3R05/pVhT1fVJpK0kgtTofss7yM05V88/v+3sv8Pik6\niqZN9tuimwWOn00Q3UA/DGtrkMjRlooMQ24AW8YmUZkhg9YivTtUMKnAZwopbLx2\nVw7V5iDdCRMUVheK/c+ZmQpnixZBzcmBQGfYcGECgYBjEq3Mem+Aw6pXOu6+0FwH\n9y6Xi4HhBkq0OOZZuXFtWVry7YrD3pBgzWVAZJqJCkyPKKZzCzwdbFd3u0lYBs35\nzYgx7ug4hR+wfI980a3vxjcWGOqnOUUnUJ7ucIa+KDgnYV/bBy4jqpVreXmWAJXl\nfyjG3eLWBrtrsI9YX6zeAA==\n-----END PRIVATE KEY-----\n","privateCertContent":"-----BEGIN CERTIFICATE-----\nMIID6TCCAtGgAwIBAgIUNkEHq6aQcF80NSYqWS58ybsJzI4wDQYJKoZIhvcNAQEL\nBQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT\nFFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg\nQ0EwHhcNMjExMDIxMDU0NTQxWhcNMjYxMDIwMDU0NTQxWjB7MRMwEQYDVQQDDAox\nNTQ1MDgzODgxMRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xJzAlBgNVBAsM\nHuWOhuWfjuWMuuWkp+adjuWwp+aXpeeUqOWTgeW6lzELMAkGA1UEBgwCQ04xETAP\nBgNVBAcMCFNoZW5aaGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\nuatoWBN5aDkKB5f9pIf3qbo9e1vFaVebwZe8rCVgGwV7seppauICkxw9EFEHYirQ\nxFJv2ygvQYulVLpJTOWPKAmgm4Y5JR0WxE/I7IHfaYUjRr4h3JWES7EETvKF5zfP\nZDdMuw2CptIWHZmoktdmd7/FWiJkk6+B1Xh5Qv890upncEq9ut7LSrfd9WE3G04/\n0BR+857L/TWtLl+i2jARBALCXLVnZvDXa3dbRofRc39AwOVUV7CUd5JFrKcviMIg\n0z1fxQyjlPTSQksTJg3j3q035KGdrNa5bagStMpAya17cUfoU8xLCmfyqTYvLcmK\nXzWbL4hyJVLCzxSeVL1IaQIDAQABo4GBMH8wCQYDVR0TBAIwADALBgNVHQ8EBAMC\nBPAwZQYDVR0fBF4wXDBaoFigVoZUaHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1\nYmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMw\nMUMzRThFQkQyMA0GCSqGSIb3DQEBCwUAA4IBAQBe7XgncAY/1PLbCsnMsYt11k3V\n2cdNZ+yuCxhlOEKk3nHE6WCTL6zL0qWlTKKpnw1rE/+4OS76Tg72wWXcHfHDAOgt\n9icp62cKx1WO3QweeZpSvLDmtdLgKKrqeIWh+rL8+ZhuAOxSkaRwcsMTWDaLeDOi\n0pGeqvfG8WNhPxkkaSI8xbiTK641Yg9WT/Q4yfHS7Q6wg1dj9YQdo0dvVB0S2Nir\nX9IK6PUaHDnQeFKDmKgLkDGLaKaiijEvC91wMEE6qB8b0eNhciaxq2YhGHcFmSRP\nWUyc5CmBadt7wIOH5Z3bfuwWGxqxKjNw/baM/d+nk7hlDr01YL9c0g16B9MW\n-----END CERTIFICATE-----\n","apiV3Key":"joerVi8y5DJ3o4ttA0o1uH47Xz1u2Ase"}', NULL, N'2022-01-31 22:13:25.0000000', NULL, N'2022-02-27 04:15:03.0000000', N'1', N'0') GO -INSERT INTO [dbo].[pay_channel] ([id], [code], [status], [remark], [fee_rate], [merchant_id], [app_id], [config], [creator], [create_time], [updater], [update_time], [tenant_id], [deleted]) VALUES (N'17', N'alipay_qr', N'0', NULL, N'1', N'1', N'6', N'{"@class":"cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayPayClientConfig","serverUrl":"https://openapi.alipaydev.com/gateway.do","appId":"2021000118634035","signType":"RSA2","mode":null,"privateKey":"MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCHsEV1cDupwJv890x84qbppUtRIfhaKSwSVN0thCcsDCaAsGR5MZslDkO8NCT9V4r2SVXjyY7eJUZlZd1M0C8T01Tg4UOx5LUbic0O3A1uJMy6V1n9IyYwbAW3AEZhBd5bSbPgrqvmv3NeWSTQT6Anxnllf+2iDH6zyA2fPl7cYyQtbZoDJQFGqr4F+cGh2R6akzRKNoBkAeMYwoY6es2lX8sJxCVPWUmxNUoL3tScwlSpd7Bxw0q9c/X01jMwuQ0+Va358zgFiGERTE6yD01eu40OBDXOYO3z++y+TAYHlQQ2toMO63trepo88X3xV3R44/1DH+k2pAm2IF5ixiLrAgMBAAECggEAPx3SoXcseaD7rmcGcE0p4SMfbsUDdkUSmBBbtfF0GzwnqNLkWa+mgE0rWt9SmXngTQH97vByAYmLPl1s3G82ht1V7Sk7yQMe74lhFllr8eEyTjeVx3dTK1EEM4TwN+936DTXdFsr4TELJEcJJdD0KaxcCcfBLRDs2wnitEFZ9N+GoZybVmY8w0e0MI7PLObUZ2l0X4RurQnfG9ZxjXjC7PkeMVv7cGGylpNFi3BbvkRhdhLPDC2E6wqnr9e7zk+hiENivAezXrtxtwKovzCtnWJ1r0IO14Rh47H509Ic0wFnj+o5YyUL4LdmpL7yaaH6fM7zcSLFjNZPHvZCKPwYcQKBgQDQFho98QvnL8ex4v6cry4VitGpjSXm1qP3vmMQk4rTsn8iPWtcxPjqGEqOQJjdi4Mi0VZKQOLFwlH0kl95wNrD/isJ4O1yeYfX7YAXApzHqYNINzM79HemO3Yx1qLMW3okRFJ9pPRzbQ9qkTpsaegsmyX316zOBhzGRYjKbutTYwKBgQCm7phr9XdFW5Vh+XR90mVs483nrLmMiDKg7YKxSLJ8amiDjzPejCn7i95Hah08P+2MIZLIPbh2VLacczR6ltRRzN5bg5etFuqSgfkuHyxpoDmpjbe08+Q2h8JBYqcC5Nhv1AKU4iOUhVLHo/FBAQliMcGc/J3eiYTFC7EsNx382QKBgClb20doe7cttgFTXswBvaUmfFm45kmla924B7SpvrQpDD/f+VDtDZRp05fGmxuduSjYdtA3aVtpLiTwWu22OUUvZZqHDGruYOO4Hvdz23mL5b4ayqImCwoNU4bAZIc9v18p/UNf3/55NNE3oGcf/bev9rH2OjCQ4nM+Ktwhg8CFAoGACSgvbkShzUkv0ZcIf9ppu+ZnJh1AdGgINvGwaJ8vQ0nm/8h8NOoFZ4oNoGc+wU5Ubops7dUM6FjPR5e+OjdJ4E7Xp7d5O4J1TaIZlCEbo5OpdhaTDDcQvrkFu+Z4eN0qzj+YAKjDAOOrXc4tbr5q0FsgXscwtcNfaBuzFVTUrUkCgYEAwzPnMNhWG3zOWLUs2QFA2GP4Y+J8cpUYfj6pbKKzeLwyG9qBwF1NJpN8m+q9q7V9P2LY+9Lp9e1mGsGeqt5HMEA3P6vIpcqLJLqE/4PBLLRzfccTcmqb1m71+erxTRhHBRkGS+I7dZEb3olQfnS1Y1tpMBxiwYwR3LW4oXuJwj8=","alipayPublicKey":"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnq90KnF4dTnlzzmxpujbI05OYqi5WxAS6cL0gnZFv2gK51HExF8v/BaP7P979PhFMgWTqmOOI+Dtno5s+yD09XTY1WkshbLk6i4g2Xlr8fyW9ODnkU88RI2w9UdPhQU4cPPwBNlrsYhKkVK2OxwM3kFqjoBBY0CZoZCsSQ3LDH5WeZqPArlsS6xa2zqJBuuoKjMrdpELl3eXSjP8K54eDJCbeetCZNKWLL3DPahTPB7LZikfYmslb0QUvCgGapD0xkS7eVq70NaL1G57MWABs4tbfWgxike4Daj3EfUrzIVspQxj7w8HEj9WozJPgL88kSJSits0pqD3n5r8HSuseQIDAQAB","appCertContent":null,"alipayPublicCertContent":null,"rootCertContent":null}', NULL, N'2022-01-31 22:13:25.0000000', NULL, N'2022-02-27 04:15:02.0000000', N'1', N'0') +INSERT INTO [dbo].[pay_channel] ([id], [code], [status], [remark], [fee_rate], [merchant_id], [app_id], [config], [creator], [create_time], [updater], [update_time], [tenant_id], [deleted]) VALUES (N'17', N'alipay_qr', N'0', NULL, N'1', N'1', N'6', N'{"@class":"cn.fuxiaoaio.ygg.framework.pay.core.client.impl.alipay.AlipayPayClientConfig","serverUrl":"https://openapi.alipaydev.com/gateway.do","appId":"2021000118634035","signType":"RSA2","mode":null,"privateKey":"MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCHsEV1cDupwJv890x84qbppUtRIfhaKSwSVN0thCcsDCaAsGR5MZslDkO8NCT9V4r2SVXjyY7eJUZlZd1M0C8T01Tg4UOx5LUbic0O3A1uJMy6V1n9IyYwbAW3AEZhBd5bSbPgrqvmv3NeWSTQT6Anxnllf+2iDH6zyA2fPl7cYyQtbZoDJQFGqr4F+cGh2R6akzRKNoBkAeMYwoY6es2lX8sJxCVPWUmxNUoL3tScwlSpd7Bxw0q9c/X01jMwuQ0+Va358zgFiGERTE6yD01eu40OBDXOYO3z++y+TAYHlQQ2toMO63trepo88X3xV3R44/1DH+k2pAm2IF5ixiLrAgMBAAECggEAPx3SoXcseaD7rmcGcE0p4SMfbsUDdkUSmBBbtfF0GzwnqNLkWa+mgE0rWt9SmXngTQH97vByAYmLPl1s3G82ht1V7Sk7yQMe74lhFllr8eEyTjeVx3dTK1EEM4TwN+936DTXdFsr4TELJEcJJdD0KaxcCcfBLRDs2wnitEFZ9N+GoZybVmY8w0e0MI7PLObUZ2l0X4RurQnfG9ZxjXjC7PkeMVv7cGGylpNFi3BbvkRhdhLPDC2E6wqnr9e7zk+hiENivAezXrtxtwKovzCtnWJ1r0IO14Rh47H509Ic0wFnj+o5YyUL4LdmpL7yaaH6fM7zcSLFjNZPHvZCKPwYcQKBgQDQFho98QvnL8ex4v6cry4VitGpjSXm1qP3vmMQk4rTsn8iPWtcxPjqGEqOQJjdi4Mi0VZKQOLFwlH0kl95wNrD/isJ4O1yeYfX7YAXApzHqYNINzM79HemO3Yx1qLMW3okRFJ9pPRzbQ9qkTpsaegsmyX316zOBhzGRYjKbutTYwKBgQCm7phr9XdFW5Vh+XR90mVs483nrLmMiDKg7YKxSLJ8amiDjzPejCn7i95Hah08P+2MIZLIPbh2VLacczR6ltRRzN5bg5etFuqSgfkuHyxpoDmpjbe08+Q2h8JBYqcC5Nhv1AKU4iOUhVLHo/FBAQliMcGc/J3eiYTFC7EsNx382QKBgClb20doe7cttgFTXswBvaUmfFm45kmla924B7SpvrQpDD/f+VDtDZRp05fGmxuduSjYdtA3aVtpLiTwWu22OUUvZZqHDGruYOO4Hvdz23mL5b4ayqImCwoNU4bAZIc9v18p/UNf3/55NNE3oGcf/bev9rH2OjCQ4nM+Ktwhg8CFAoGACSgvbkShzUkv0ZcIf9ppu+ZnJh1AdGgINvGwaJ8vQ0nm/8h8NOoFZ4oNoGc+wU5Ubops7dUM6FjPR5e+OjdJ4E7Xp7d5O4J1TaIZlCEbo5OpdhaTDDcQvrkFu+Z4eN0qzj+YAKjDAOOrXc4tbr5q0FsgXscwtcNfaBuzFVTUrUkCgYEAwzPnMNhWG3zOWLUs2QFA2GP4Y+J8cpUYfj6pbKKzeLwyG9qBwF1NJpN8m+q9q7V9P2LY+9Lp9e1mGsGeqt5HMEA3P6vIpcqLJLqE/4PBLLRzfccTcmqb1m71+erxTRhHBRkGS+I7dZEb3olQfnS1Y1tpMBxiwYwR3LW4oXuJwj8=","alipayPublicKey":"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnq90KnF4dTnlzzmxpujbI05OYqi5WxAS6cL0gnZFv2gK51HExF8v/BaP7P979PhFMgWTqmOOI+Dtno5s+yD09XTY1WkshbLk6i4g2Xlr8fyW9ODnkU88RI2w9UdPhQU4cPPwBNlrsYhKkVK2OxwM3kFqjoBBY0CZoZCsSQ3LDH5WeZqPArlsS6xa2zqJBuuoKjMrdpELl3eXSjP8K54eDJCbeetCZNKWLL3DPahTPB7LZikfYmslb0QUvCgGapD0xkS7eVq70NaL1G57MWABs4tbfWgxike4Daj3EfUrzIVspQxj7w8HEj9WozJPgL88kSJSits0pqD3n5r8HSuseQIDAQAB","appCertContent":null,"alipayPublicCertContent":null,"rootCertContent":null}', NULL, N'2022-01-31 22:13:25.0000000', NULL, N'2022-02-27 04:15:02.0000000', N'1', N'0') GO SET IDENTITY_INSERT [dbo].[pay_channel] OFF @@ -7846,7 +7846,7 @@ GO SET IDENTITY_INSERT [dbo].[system_oauth2_client] ON GO -INSERT INTO [dbo].[system_oauth2_client] ([id], [client_id], [secret], [name], [logo], [description], [status], [access_token_validity_seconds], [refresh_token_validity_seconds], [redirect_uris], [auto_approve_scopes], [authorized_grant_types], [scopes], [authorities], [resource_ids], [additional_information], [creator], [create_time], [updater], [update_time], [deleted]) VALUES (N'1', N'default', N'admin123', N'芋道源码', N'http://test.yudao.iocoder.cn/a5e2e244368878a366b516805a4aabf1.png', N'我是描述', N'0', N'180', N'8640', N'["https://www.iocoder.cn","https://doc.iocoder.cn"]', N'', N'["password","authorization_code","implicit","refresh_token"]', N'["user.read", "user.write"]', N'["system:user:query"]', N'[]', N'{}', N'1', N'2022-05-11 21:47:12.0000000', N'1', N'2022-05-13 10:50:16.9620000', N'0') +INSERT INTO [dbo].[system_oauth2_client] ([id], [client_id], [secret], [name], [logo], [description], [status], [access_token_validity_seconds], [refresh_token_validity_seconds], [redirect_uris], [auto_approve_scopes], [authorized_grant_types], [scopes], [authorities], [resource_ids], [additional_information], [creator], [create_time], [updater], [update_time], [deleted]) VALUES (N'1', N'default', N'admin123', N'芋道源码', N'http://test.fuxiaoaio.iocoder.cn/a5e2e244368878a366b516805a4aabf1.png', N'我是描述', N'0', N'180', N'8640', N'["https://www.iocoder.cn","https://doc.iocoder.cn"]', N'', N'["password","authorization_code","implicit","refresh_token"]', N'["user.read", "user.write"]', N'["system:user:query"]', N'[]', N'{}', N'1', N'2022-05-11 21:47:12.0000000', N'1', N'2022-05-13 10:50:16.9620000', N'0') GO SET IDENTITY_INSERT [dbo].[system_oauth2_client] OFF @@ -11327,10 +11327,10 @@ GO SET IDENTITY_INSERT [dbo].[system_users] ON GO -INSERT INTO [dbo].[system_users] ([id], [username], [password], [nickname], [remark], [dept_id], [post_ids], [email], [mobile], [sex], [avatar], [status], [login_ip], [login_date], [creator], [create_time], [updater], [update_time], [tenant_id], [deleted]) VALUES (N'1', N'admin', N'$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', N'芋道源码', N'管理员', N'103', N'[1]', N'aoteman@126.com', N'15612345678', N'1', N'http://test.yudao.iocoder.cn/48934f2f-92d4-4250-b917-d10d2b262c6a', N'0', N'127.0.0.1', N'2022-05-26 00:51:15.3820000', N'admin', N'2021-01-05 17:03:47.0000000', NULL, N'2022-05-26 00:51:15.3870000', N'1', N'0') +INSERT INTO [dbo].[system_users] ([id], [username], [password], [nickname], [remark], [dept_id], [post_ids], [email], [mobile], [sex], [avatar], [status], [login_ip], [login_date], [creator], [create_time], [updater], [update_time], [tenant_id], [deleted]) VALUES (N'1', N'admin', N'$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', N'芋道源码', N'管理员', N'103', N'[1]', N'aoteman@126.com', N'15612345678', N'1', N'http://test.fuxiaoaio.iocoder.cn/48934f2f-92d4-4250-b917-d10d2b262c6a', N'0', N'127.0.0.1', N'2022-05-26 00:51:15.3820000', N'admin', N'2021-01-05 17:03:47.0000000', NULL, N'2022-05-26 00:51:15.3870000', N'1', N'0') GO -INSERT INTO [dbo].[system_users] ([id], [username], [password], [nickname], [remark], [dept_id], [post_ids], [email], [mobile], [sex], [avatar], [status], [login_ip], [login_date], [creator], [create_time], [updater], [update_time], [tenant_id], [deleted]) VALUES (N'100', N'yudao', N'$2a$10$11U48RhyJ5pSBYWSn12AD./ld671.ycSzJHbyrtpeoMeYiw31eo8a', N'芋道', N'不要吓我', N'104', N'[1]', N'yudao@iocoder.cn', N'15601691300', N'1', N'', N'1', N'127.0.0.1', N'2022-05-03 16:49:24.6860000', N'', N'2021-01-07 09:07:17.0000000', NULL, N'2022-05-03 16:49:24.6860000', N'1', N'0') +INSERT INTO [dbo].[system_users] ([id], [username], [password], [nickname], [remark], [dept_id], [post_ids], [email], [mobile], [sex], [avatar], [status], [login_ip], [login_date], [creator], [create_time], [updater], [update_time], [tenant_id], [deleted]) VALUES (N'100', N'fuxiaoaio', N'$2a$10$11U48RhyJ5pSBYWSn12AD./ld671.ycSzJHbyrtpeoMeYiw31eo8a', N'芋道', N'不要吓我', N'104', N'[1]', N'fuxiaoaio@iocoder.cn', N'15601691300', N'1', N'', N'1', N'127.0.0.1', N'2022-05-03 16:49:24.6860000', N'', N'2021-01-07 09:07:17.0000000', NULL, N'2022-05-03 16:49:24.6860000', N'1', N'0') GO INSERT INTO [dbo].[system_users] ([id], [username], [password], [nickname], [remark], [dept_id], [post_ids], [email], [mobile], [sex], [avatar], [status], [login_ip], [login_date], [creator], [create_time], [updater], [update_time], [tenant_id], [deleted]) VALUES (N'103', N'yuanma', N'$2a$10$wWoPT7sqriM2O1YXRL.je.GiL538OR6ZTN8aQZr9JAGdnpCH2tpYe', N'源码', NULL, N'106', NULL, N'yuanma@iocoder.cn', N'15601701300', N'0', N'', N'0', N'127.0.0.1', N'2022-01-18 00:33:40.0000000', N'', N'2021-01-13 23:50:35.0000000', NULL, N'2022-01-18 00:33:40.0000000', N'1', N'0') diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml deleted file mode 100644 index c2e7d6123..000000000 --- a/yudao-framework/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - 4.0.0 - - yudao - cn.iocoder.cloud - ${revision} - - pom - - yudao-common - yudao-spring-boot-starter-env - yudao-spring-boot-starter-banner - yudao-spring-boot-starter-mybatis - yudao-spring-boot-starter-redis - yudao-spring-boot-starter-web - yudao-spring-boot-starter-security - - yudao-spring-boot-starter-file - yudao-spring-boot-starter-monitor - yudao-spring-boot-starter-protection - - yudao-spring-boot-starter-job - yudao-spring-boot-starter-mq - yudao-spring-boot-starter-rpc - - yudao-spring-boot-starter-excel - yudao-spring-boot-starter-test - - yudao-spring-boot-starter-biz-operatelog - yudao-spring-boot-starter-biz-dict - yudao-spring-boot-starter-biz-sms - - yudao-spring-boot-starter-biz-pay - yudao-spring-boot-starter-biz-weixin - yudao-spring-boot-starter-biz-social - yudao-spring-boot-starter-biz-tenant - yudao-spring-boot-starter-biz-data-permission - yudao-spring-boot-starter-biz-error-code - yudao-spring-boot-starter-biz-ip - - yudao-spring-boot-starter-flowable - yudao-spring-boot-starter-captcha - yudao-spring-boot-starter-desensitize - - - yudao-framework - - 该包是技术组件，每个子包，代表一个组件。每个组件包括两部分： - 1. core 包：是该组件的核心封装 - 2. config 包：是该组件基于 Spring 的配置 - - 技术组件，也分成两类： - 1. 框架组件：和我们熟悉的 MyBatis、Redis 等等的拓展 - 2. 业务组件：和业务相关的组件的封装，例如说数据字典、操作日志等等。 - 如果是业务组件，Maven 名字会包含 biz - - https://github.com/YunaiV/ruoyi-vue-pro - - diff --git a/yudao-framework/yudao-common/《芋道 Spring Boot 参数校验 Validation 入门》.md b/yudao-framework/yudao-common/《芋道 Spring Boot 参数校验 Validation 入门》.md deleted file mode 100644 index b2c2cf8f5..000000000 --- a/yudao-framework/yudao-common/《芋道 Spring Boot 参数校验 Validation 入门》.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/yudao-framework/yudao-spring-boot-starter-banner/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-banner/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index e04c9b42c..000000000 --- a/yudao-framework/yudao-spring-boot-starter-banner/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -cn.iocoder.yudao.framework.banner.config.YudaoBannerAutoConfiguration \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index bd0e97a86..000000000 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -cn.iocoder.yudao.framework.datapermission.config.YudaoDataPermissionAutoConfiguration -cn.iocoder.yudao.framework.datapermission.config.YudaoDeptDataPermissionAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/core/package-info.java b/yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/core/package-info.java deleted file mode 100644 index 7ba720a9d..000000000 --- a/yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/core/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位 - */ -package cn.iocoder.yudao.framework.dict.core; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index c1353684a..000000000 --- a/yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -cn.iocoder.yudao.framework.dict.config.YudaoDictRpcAutoConfiguration -cn.iocoder.yudao.framework.dict.config.YudaoDictAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 6e0ebb4d8..000000000 --- a/yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -cn.iocoder.yudao.framework.errorcode.config.YudaoErrorCodeRpcAutoConfiguration -cn.iocoder.yudao.framework.errorcode.config.YudaoErrorCodeAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/resources/ip2region.xdb b/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/resources/ip2region.xdb deleted file mode 100644 index 58596a591..000000000 Binary files a/yudao-framework/yudao-spring-boot-starter-biz-ip/src/main/resources/ip2region.xdb and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/package-info.java b/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/package-info.java deleted file mode 100644 index 58aa3d59e..000000000 --- a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.yudao.framework.operatelog.core; diff --git a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index d68cf1c00..000000000 --- a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -cn.iocoder.yudao.framework.operatelog.config.YudaoOperateLogRpcAutoConfiguration -cn.iocoder.yudao.framework.operatelog.config.YudaoOperateLogAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 6fd198210..000000000 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -cn.iocoder.yudao.framework.pay.config.YudaoPayAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 8eb45ac98..000000000 --- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -cn.iocoder.yudao.framework.sms.config.YudaoSmsAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-biz-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-biz-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index c7ca9cf4e..000000000 --- a/yudao-framework/yudao-spring-boot-starter-biz-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -cn.iocoder.yudao.framework.social.config.YudaoSocialAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 1a18bae89..000000000 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,3 +0,0 @@ -cn.iocoder.yudao.framework.tenant.config.YudaoTenantRpcAutoConfiguration -cn.iocoder.yudao.framework.tenant.config.YudaoTenantAutoConfiguration -cn.iocoder.yudao.framework.tenant.config.YudaoTenantMQAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService deleted file mode 100644 index afede97de..000000000 --- a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService +++ /dev/null @@ -1 +0,0 @@ -cn.iocoder.yudao.framework.captcha.core.service.RedisCaptchaServiceImpl diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 8411d2cc3..000000000 --- a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -cn.iocoder.yudao.framework.captcha.config.YudaoCaptchaConfiguration \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/package-info.java b/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/package-info.java deleted file mode 100644 index 9ef9a1d63..000000000 --- a/yudao-framework/yudao-spring-boot-starter-env/src/main/java/cn/iocoder/yudao/framework/env/core/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.yudao.framework.env.core; diff --git a/yudao-framework/yudao-spring-boot-starter-env/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter b/yudao-framework/yudao-spring-boot-starter-env/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter deleted file mode 100644 index c0984fdb5..000000000 --- a/yudao-framework/yudao-spring-boot-starter-env/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter +++ /dev/null @@ -1 +0,0 @@ -dubboProviderRouterTagFilter=cn.iocoder.yudao.framework.env.core.dubbo.DubboProviderRouterTagFilter diff --git a/yudao-framework/yudao-spring-boot-starter-env/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.cluster.interceptor.ClusterInterceptor b/yudao-framework/yudao-spring-boot-starter-env/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.cluster.interceptor.ClusterInterceptor deleted file mode 100644 index 03d7a5765..000000000 --- a/yudao-framework/yudao-spring-boot-starter-env/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.cluster.interceptor.ClusterInterceptor +++ /dev/null @@ -1 +0,0 @@ -dubboConsumerRouterTagClusterInterceptor=cn.iocoder.yudao.framework.env.core.dubbo.DubboConsumerRouterTagClusterInterceptor diff --git a/yudao-framework/yudao-spring-boot-starter-env/src/main/resources/META-INF/spring.factories b/yudao-framework/yudao-spring-boot-starter-env/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 6df960118..000000000 --- a/yudao-framework/yudao-spring-boot-starter-env/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.env.EnvironmentPostProcessor=\ - cn.iocoder.yudao.framework.env.config.EnvEnvironmentPostProcessor diff --git a/yudao-framework/yudao-spring-boot-starter-env/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-env/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 8bb162e04..000000000 --- a/yudao-framework/yudao-spring-boot-starter-env/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -cn.iocoder.yudao.framework.env.config.YudaoEnvWebAutoConfiguration -cn.iocoder.yudao.framework.env.config.YudaoEnvRpcAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-file/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index f1536687e..000000000 --- a/yudao-framework/yudao-spring-boot-starter-file/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -cn.iocoder.yudao.framework.file.config.YudaoFileAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/package-info.java b/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/package-info.java deleted file mode 100644 index de8d6279d..000000000 --- a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.yudao.framework.flowable.core; diff --git a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/package-info.java b/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/package-info.java deleted file mode 100644 index 324d3de0e..000000000 --- a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.yudao.framework.flowable; diff --git a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-flowable/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 0782c499f..000000000 --- a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -cn.iocoder.yudao.framework.flowable.config.YudaoFlowableConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index a3a316d58..000000000 --- a/yudao-framework/yudao-spring-boot-starter-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -cn.iocoder.yudao.framework.quartz.config.YudaoXxlJobAutoConfiguration -cn.iocoder.yudao.framework.quartz.config.YudaoAsyncAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-job/《芋道 Spring Boot 定时任务入门》.md b/yudao-framework/yudao-spring-boot-starter-job/《芋道 Spring Boot 定时任务入门》.md deleted file mode 100644 index 65647011c..000000000 --- a/yudao-framework/yudao-spring-boot-starter-job/《芋道 Spring Boot 定时任务入门》.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/yudao-framework/yudao-spring-boot-starter-job/《芋道 Spring Boot 异步任务入门》.md b/yudao-framework/yudao-spring-boot-starter-job/《芋道 Spring Boot 异步任务入门》.md deleted file mode 100644 index 5822b838c..000000000 --- a/yudao-framework/yudao-spring-boot-starter-job/《芋道 Spring Boot 异步任务入门》.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/yudao-framework/yudao-spring-boot-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 581832fbc..000000000 --- a/yudao-framework/yudao-spring-boot-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -cn.iocoder.yudao.framework.tracer.config.YudaoTracerAutoConfiguration -cn.iocoder.yudao.framework.tracer.config.YudaoMetricsAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md b/yudao-framework/yudao-spring-boot-starter-monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md deleted file mode 100644 index 7f898b9ce..000000000 --- a/yudao-framework/yudao-spring-boot-starter-monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/yudao-framework/yudao-spring-boot-starter-monitor/《芋道 Spring Boot 监控端点 Actuator 入门》.md b/yudao-framework/yudao-spring-boot-starter-monitor/《芋道 Spring Boot 监控端点 Actuator 入门》.md deleted file mode 100644 index b73a460c1..000000000 --- a/yudao-framework/yudao-spring-boot-starter-monitor/《芋道 Spring Boot 监控端点 Actuator 入门》.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/yudao-framework/yudao-spring-boot-starter-monitor/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md b/yudao-framework/yudao-spring-boot-starter-monitor/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md deleted file mode 100644 index ed9d4fe47..000000000 --- a/yudao-framework/yudao-spring-boot-starter-monitor/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/yudao-framework/yudao-spring-boot-starter-mq/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-mq/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index c45ba7600..000000000 --- a/yudao-framework/yudao-spring-boot-starter-mq/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -cn.iocoder.yudao.framework.mq.config.YudaoMQAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/package-info.java b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/package-info.java deleted file mode 100644 index 8c69219d0..000000000 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.yudao.framework; diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index c4aee8a93..000000000 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration -cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/《芋道 Spring Boot MyBatis 入门》.md b/yudao-framework/yudao-spring-boot-starter-mybatis/《芋道 Spring Boot MyBatis 入门》.md deleted file mode 100644 index d684e1dd6..000000000 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/《芋道 Spring Boot MyBatis 入门》.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/《芋道 Spring Boot 多数据源（读写分离）入门》.md b/yudao-framework/yudao-spring-boot-starter-mybatis/《芋道 Spring Boot 多数据源（读写分离）入门》.md deleted file mode 100644 index 21133741e..000000000 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/《芋道 Spring Boot 多数据源（读写分离）入门》.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/《芋道 Spring Boot 数据库连接池入门》.md b/yudao-framework/yudao-spring-boot-starter-mybatis/《芋道 Spring Boot 数据库连接池入门》.md deleted file mode 100644 index 21b5075d5..000000000 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/《芋道 Spring Boot 数据库连接池入门》.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/resilience4j/《芋道 Spring Boot 服务容错 Resilience4j 入门》.md b/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/resilience4j/《芋道 Spring Boot 服务容错 Resilience4j 入门》.md deleted file mode 100644 index 8d6d0335b..000000000 --- a/yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/resilience4j/《芋道 Spring Boot 服务容错 Resilience4j 入门》.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/yudao-framework/yudao-spring-boot-starter-protection/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-protection/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 563a5316f..000000000 --- a/yudao-framework/yudao-spring-boot-starter-protection/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -cn.iocoder.yudao.framework.idempotent.config.YudaoIdempotentConfiguration -cn.iocoder.yudao.framework.lock4j.config.YudaoLock4jConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 49724a49f..000000000 --- a/yudao-framework/yudao-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration -cn.iocoder.yudao.framework.redis.config.YudaoCacheAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-redis/《芋道 Spring Boot Cache 入门》.md b/yudao-framework/yudao-spring-boot-starter-redis/《芋道 Spring Boot Cache 入门》.md deleted file mode 100644 index 5c2708316..000000000 --- a/yudao-framework/yudao-spring-boot-starter-redis/《芋道 Spring Boot Cache 入门》.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/yudao-framework/yudao-spring-boot-starter-redis/《芋道 Spring Boot Redis 入门》.md b/yudao-framework/yudao-spring-boot-starter-redis/《芋道 Spring Boot Redis 入门》.md deleted file mode 100644 index 80c544590..000000000 --- a/yudao-framework/yudao-spring-boot-starter-redis/《芋道 Spring Boot Redis 入门》.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/config/package-info.java b/yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/config/package-info.java deleted file mode 100644 index 516acc537..000000000 --- a/yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/config/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占坑 TODO - */ -package cn.iocoder.yudao.framework.rpc.config; diff --git a/yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/core/package-info.java b/yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/core/package-info.java deleted file mode 100644 index e8e494628..000000000 --- a/yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/core/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占坑 TODO - */ -package cn.iocoder.yudao.framework.rpc.core; diff --git a/yudao-framework/yudao-spring-boot-starter-rpc/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter b/yudao-framework/yudao-spring-boot-starter-rpc/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter deleted file mode 100644 index 20b1251b4..000000000 --- a/yudao-framework/yudao-spring-boot-starter-rpc/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter +++ /dev/null @@ -1 +0,0 @@ -dubboExceptionFilter=cn.iocoder.yudao.framework.rpc.core.dubbo.DubboProviderExceptionFilter diff --git a/yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Boot Dubbo 入门》.md b/yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Boot Dubbo 入门》.md deleted file mode 100644 index b799667ba..000000000 --- a/yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Boot Dubbo 入门》.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Boot 声明式调用 Feign 入门》.md b/yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Boot 声明式调用 Feign 入门》.md deleted file mode 100644 index 6df6a3801..000000000 --- a/yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Boot 声明式调用 Feign 入门》.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Cloud Alibaba 服务调用 Dubbo 入门》.md b/yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Cloud Alibaba 服务调用 Dubbo 入门》.md deleted file mode 100644 index 8e4566c15..000000000 --- a/yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Cloud Alibaba 服务调用 Dubbo 入门》.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Cloud 声明式调用 Feign 入门》.md b/yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Cloud 声明式调用 Feign 入门》.md deleted file mode 100644 index b419fd006..000000000 --- a/yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Cloud 声明式调用 Feign 入门》.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 0e30c5ea1..000000000 --- a/yudao-framework/yudao-spring-boot-starter-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,3 +0,0 @@ -cn.iocoder.yudao.framework.security.config.YudaoSecurityRpcAutoConfiguration -cn.iocoder.yudao.framework.security.config.YudaoSecurityAutoConfiguration -cn.iocoder.yudao.framework.security.config.YudaoWebSecurityConfigurerAdapter diff --git a/yudao-framework/yudao-spring-boot-starter-test/《芋道 Spring Boot 单元测试 Test 入门》.md b/yudao-framework/yudao-spring-boot-starter-test/《芋道 Spring Boot 单元测试 Test 入门》.md deleted file mode 100644 index c6d0e9a90..000000000 --- a/yudao-framework/yudao-spring-boot-starter-test/《芋道 Spring Boot 单元测试 Test 入门》.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/core/package-info.java b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/core/package-info.java deleted file mode 100644 index 261b5087c..000000000 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/core/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.yudao.framework.jackson.core; diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/package-info.java b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/package-info.java deleted file mode 100644 index 8c69219d0..000000000 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.yudao.framework; diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 5e14783a4..000000000 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,5 +0,0 @@ -cn.iocoder.yudao.framework.apilog.config.YudaoApiLogAutoConfiguration -cn.iocoder.yudao.framework.jackson.config.YudaoJacksonAutoConfiguration -cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration -cn.iocoder.yudao.framework.web.config.YudaoWebAutoConfiguration -cn.iocoder.yudao.framework.apilog.config.YudaoApiLogRpcAutoConfiguration diff --git a/yudao-framework/yudao-spring-boot-starter-web/《芋道 Spring Boot API 接口文档 Swagger 入门》.md b/yudao-framework/yudao-spring-boot-starter-web/《芋道 Spring Boot API 接口文档 Swagger 入门》.md deleted file mode 100644 index 7ed5ebd1b..000000000 --- a/yudao-framework/yudao-spring-boot-starter-web/《芋道 Spring Boot API 接口文档 Swagger 入门》.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/yudao-framework/yudao-spring-boot-starter-web/《芋道 Spring Boot SpringMVC 入门》.md b/yudao-framework/yudao-spring-boot-starter-web/《芋道 Spring Boot SpringMVC 入门》.md deleted file mode 100644 index 7c36a1591..000000000 --- a/yudao-framework/yudao-spring-boot-starter-web/《芋道 Spring Boot SpringMVC 入门》.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/route/package-info.java b/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/route/package-info.java deleted file mode 100644 index 04bf5868b..000000000 --- a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/route/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位符 - */ -package cn.iocoder.yudao.gateway.route; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/app/package-info.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/app/package-info.java deleted file mode 100644 index e8d285e35..000000000 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/app/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位 - */ -package cn.iocoder.yudao.module.bpm.controller.app; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/package-info.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/package-info.java deleted file mode 100644 index d1930bd6a..000000000 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * 提供 RESTful API 给前端： - * 1. admin 包：提供给管理后台 yudao-ui-admin 前端项目 - * 2. app 包：提供给用户 APP yudao-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分 - */ -package cn.iocoder.yudao.module.bpm.controller; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/package-info.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/package-info.java deleted file mode 100644 index 6a53114a8..000000000 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.yudao.module.bpm.convert.task; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md deleted file mode 100644 index 8153487b7..000000000 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/core/package-info.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/core/package-info.java deleted file mode 100644 index b97cb4c8a..000000000 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/core/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位 - */ -package cn.iocoder.yudao.module.bpm.framework.bpm.core; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/rpc/config/RpcConfiguration.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/rpc/config/RpcConfiguration.java deleted file mode 100644 index 6459263cb..000000000 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/rpc/config/RpcConfiguration.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.iocoder.yudao.module.bpm.framework.rpc.config; - -import cn.iocoder.yudao.module.system.api.dept.DeptApi; -import cn.iocoder.yudao.module.system.api.dept.PostApi; -import cn.iocoder.yudao.module.system.api.dict.DictDataApi; -import cn.iocoder.yudao.module.system.api.permission.RoleApi; -import cn.iocoder.yudao.module.system.api.sms.SmsSendApi; -import cn.iocoder.yudao.module.system.api.user.AdminUserApi; -import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.context.annotation.Configuration; - -@Configuration(proxyBeanMethods = false) -@EnableFeignClients(clients = {RoleApi.class, DeptApi.class, PostApi.class, AdminUserApi.class, SmsSendApi.class, DictDataApi.class}) -public class RpcConfiguration { -} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/rpc/package-info.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/rpc/package-info.java deleted file mode 100644 index d34205cec..000000000 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/rpc/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位 - */ -package cn.iocoder.yudao.module.bpm.framework.rpc; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/security/core/package-info.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/security/core/package-info.java deleted file mode 100644 index 6d9f5a508..000000000 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/security/core/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位 - */ -package cn.iocoder.yudao.module.bpm.framework.security.core; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/package-info.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/package-info.java deleted file mode 100644 index eaa615302..000000000 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.yudao.module.bpm.service.task; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/package-info.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/package-info.java deleted file mode 100644 index af01680f6..000000000 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.yudao.module.infra.api; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/app/package-info.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/app/package-info.java deleted file mode 100644 index d0f921f5c..000000000 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/app/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位 - */ -package cn.iocoder.yudao.module.infra.controller.app; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/package-info.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/package-info.java deleted file mode 100644 index 04fde2f43..000000000 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * 提供 RESTful API 给前端： - * 1. admin 包：提供给管理后台 yudao-ui-admin 前端项目 - * 2. app 包：提供给用户 APP yudao-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分 - */ -package cn.iocoder.yudao.module.infra.controller; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md deleted file mode 100644 index 8153487b7..000000000 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/package-info.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/package-info.java deleted file mode 100644 index 0749e8ec4..000000000 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位 - */ -package cn.iocoder.yudao.module.infra.enums; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/codegen/package-info.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/codegen/package-info.java deleted file mode 100644 index cf1d22c08..000000000 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/codegen/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 代码生成器 - */ -package cn.iocoder.yudao.module.infra.framework.codegen; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md deleted file mode 100644 index a1e367684..000000000 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/rpc/package-info.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/rpc/package-info.java deleted file mode 100644 index e671fc945..000000000 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/rpc/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位 - */ -package cn.iocoder.yudao.module.infra.framework.rpc; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/security/core/package-info.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/security/core/package-info.java deleted file mode 100644 index 7762626c9..000000000 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/security/core/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位 - */ -package cn.iocoder.yudao.module.infra.framework.security.core; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/enums/errorcode.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/enums/errorcode.vm deleted file mode 100644 index a9a6daf25..000000000 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/enums/errorcode.vm +++ /dev/null @@ -1,3 +0,0 @@ -// TODO 待办：请将下面的错误码复制到 yudao-module-${table.moduleName}-api 模块的 ErrorCodeConstants 类中。注意，请给“TODO 补充编号”设置一个错误码编号！！！ -// ========== ${table.classComment} TODO 补充编号 ========== -ErrorCode ${simpleClassName_underlineCase.toUpperCase()}_NOT_EXISTS = new ErrorCode(TODO 补充编号, "${table.classComment}不存在"); diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test-integration/java/cn/iocoder/yudao/module/infra/dal/mysql/package-info.java b/yudao-module-infra/yudao-module-infra-biz/src/test-integration/java/cn/iocoder/yudao/module/infra/dal/mysql/package-info.java deleted file mode 100644 index c6016c265..000000000 --- a/yudao-module-infra/yudao-module-infra-biz/src/test-integration/java/cn/iocoder/yudao/module/infra/dal/mysql/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位 - */ -package cn.iocoder.yudao.module.infra.dal.mysql; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test-integration/java/cn/iocoder/yudao/module/infra/dal/package-info.java b/yudao-module-infra/yudao-module-infra-biz/src/test-integration/java/cn/iocoder/yudao/module/infra/dal/package-info.java deleted file mode 100644 index 0054e06b5..000000000 --- a/yudao-module-infra/yudao-module-infra-biz/src/test-integration/java/cn/iocoder/yudao/module/infra/dal/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位 - */ -package cn.iocoder.yudao.module.infra.dal; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test-integration/java/cn/iocoder/yudao/module/infra/service/package-info.java b/yudao-module-infra/yudao-module-infra-biz/src/test-integration/java/cn/iocoder/yudao/module/infra/service/package-info.java deleted file mode 100644 index f6a3c5aa9..000000000 --- a/yudao-module-infra/yudao-module-infra-biz/src/test-integration/java/cn/iocoder/yudao/module/infra/service/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位 - */ -package cn.iocoder.yudao.module.infra.service; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ajreport/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ajreport/package-info.java deleted file mode 100644 index e32b8b916..000000000 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ajreport/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.yudao.module.report.controller.admin.ajreport; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/package-info.java deleted file mode 100644 index ccbf9bb19..000000000 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * 提供 RESTful API 给前端： - * 1. admin 包：提供给管理后台 yudao-ui-admin 前端项目 - * 2. app 包：提供给用户 APP yudao-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分 - */ -package cn.iocoder.yudao.module.report.controller; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/convert/ajreport/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/convert/ajreport/package-info.java deleted file mode 100644 index 72860791f..000000000 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/convert/ajreport/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * TODO 占位，后续删除 - */ -package cn.iocoder.yudao.module.report.convert.ajreport; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/dataobject/ajreport/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/dataobject/ajreport/package-info.java deleted file mode 100644 index 922ec6fd4..000000000 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/dataobject/ajreport/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * TODO 芋艿：占位，待删除 - */ -package cn.iocoder.yudao.module.report.dal.dataobject.ajreport; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/mysql/ajreport/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/mysql/ajreport/package-info.java deleted file mode 100644 index 0fb86173d..000000000 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/mysql/ajreport/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * TODO 芋艿：占位，待删除 - */ -package cn.iocoder.yudao.module.report.dal.mysql.ajreport; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/web/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/web/package-info.java deleted file mode 100644 index e082e3bdc..000000000 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/web/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位，后续会基于 Filter 实现积木报表的认证等功能，替代 {@link cn.iocoder.yudao.module.report.framework.jmreport.core.service.JmReportTokenServiceImpl} - */ -package cn.iocoder.yudao.module.report.framework.jmreport.core.web; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/core/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/core/package-info.java deleted file mode 100644 index 61083268f..000000000 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/core/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位 - */ -package cn.iocoder.yudao.module.report.framework.security.core; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/ajreport/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/ajreport/package-info.java deleted file mode 100644 index 2512e50ed..000000000 --- a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/ajreport/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * TODO 芋艿：占位，待删除 - */ -package cn.iocoder.yudao.module.report.service.ajreport; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/dict/AppDictDataController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/dict/AppDictDataController.java deleted file mode 100644 index c4946c371..000000000 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/dict/AppDictDataController.java +++ /dev/null @@ -1,4 +0,0 @@ -package cn.iocoder.yudao.module.system.controller.app.dict; - -public class AppDictDataController { -} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/package-info.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/package-info.java deleted file mode 100644 index 659a90947..000000000 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * 提供 RESTful API 给前端： - * 1. admin 包：提供给管理后台 yudao-ui-admin 前端项目 - * 2. app 包：提供给用户 APP yudao-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分 - */ -package cn.iocoder.yudao.module.system.controller; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md deleted file mode 100644 index 8153487b7..000000000 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/datapermission/package-info.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/datapermission/package-info.java deleted file mode 100644 index a66684551..000000000 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/datapermission/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * system 模块的数据权限配置 - */ -package cn.iocoder.yudao.module.system.framework.datapermission; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/rpc/package-info.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/rpc/package-info.java deleted file mode 100644 index 61228c231..000000000 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/rpc/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位 - */ -package cn.iocoder.yudao.module.system.framework.rpc; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/security/core/package-info.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/security/core/package-info.java deleted file mode 100644 index 04a8d8b37..000000000 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/security/core/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位 - */ -package cn.iocoder.yudao.module.system.framework.security.core; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/package-info.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/package-info.java deleted file mode 100644 index a7f595417..000000000 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.yudao.module.system.job; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/package-info.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/package-info.java deleted file mode 100644 index 255ab310c..000000000 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位 - */ -package cn.iocoder.yudao.module.system.mq.producer; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/member/package-info.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/member/package-info.java deleted file mode 100644 index ce080b410..000000000 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/member/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * yudao-module-member 模块的适配，解除 yudao-module-system 对它们的依赖 - */ -package cn.iocoder.yudao.module.system.service.member; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/logback-spring.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/logback-spring.xml deleted file mode 100644 index 5f4b30d04..000000000 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/logback-spring.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - 　　　　　 - - - ${PATTERN_DEFAULT} - - - - - - - - - - ${PATTERN_DEFAULT} - - - - ${LOG_FILE} - - - ${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz} - - ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false} - - ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB} - - ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0} - - ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30} - - - - - - 0 - - 256 - - - - - - - - ${PATTERN_DEFAULT} - - - - - - - - - - - - - - - - - - - - - - diff --git a/yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/service/package-info.java b/yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/service/package-info.java deleted file mode 100644 index 7b475e53e..000000000 --- a/yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/service/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位 - */ -package cn.iocoder.yudao.module.system.service;