From ae6a78bacf0b406f97e2628abf4e3676bee33fa2 Mon Sep 17 00:00:00 2001 From: huangge1199 Date: Tue, 22 Oct 2024 16:08:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 +- script/docker/docker-compose.yml | 2 +- script/docker/docker.env | 2 +- sql/dm/ruoyi-vue-pro-dm8.sql | 4 +- sql/kingbase/ruoyi-vue-pro.sql | 4 +- sql/mysql/quartz.sql | 2 +- sql/mysql/ruoyi-vue-pro.sql | 4 +- sql/opengauss/ruoyi-vue-pro.sql | 4 +- sql/oracle/ruoyi-vue-pro.sql | 4 +- sql/postgresql/ruoyi-vue-pro.sql | 4 +- sql/sqlserver/ruoyi-vue-pro.sql | 4 +- yudao-dependencies/pom.xml | 32 +++++----- yudao-framework/pom.xml | 2 +- yudao-framework/yudao-common/pom.xml | 2 +- .../pom.xml | 12 ++-- ...ot.autoconfigure.AutoConfiguration.imports | 4 +- .../yudao-spring-boot-starter-biz-ip/pom.xml | 6 +- .../pom.xml | 16 ++--- .../invocation/InvocableHandlerMethod.java | 6 +- .../main/resources/META-INF/spring.factories | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../yudao-spring-boot-starter-excel/pom.xml | 10 +-- .../yudao/framework/dict/package-info.java | 6 ++ .../yudao/framework/dict/package-info.java | 6 -- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../yudao-spring-boot-starter-job/pom.xml | 4 +- ...ot.autoconfigure.AutoConfiguration.imports | 4 +- .../yudao-spring-boot-starter-monitor/pom.xml | 4 +- ...ot.autoconfigure.AutoConfiguration.imports | 4 +- .../yudao-spring-boot-starter-mq/pom.xml | 4 +- .../mq/rabbitmq/core/package-info.java | 4 ++ .../mq/rabbitmq/core/package-info.java | 4 -- ...ot.autoconfigure.AutoConfiguration.imports | 6 +- .../yudao-spring-boot-starter-mybatis/pom.xml | 6 +- .../main/resources/META-INF/spring.factories | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 6 +- .../pom.xml | 8 +-- ...ot.autoconfigure.AutoConfiguration.imports | 8 +-- .../yudao-spring-boot-starter-redis/pom.xml | 4 +- ...ot.autoconfigure.AutoConfiguration.imports | 4 +- .../pom.xml | 8 +-- .../operatelog/core/package-info.java | 4 ++ .../operatelog/core/package-info.java | 4 -- ...ot.autoconfigure.AutoConfiguration.imports | 6 +- .../yudao-spring-boot-starter-test/pom.xml | 8 +-- .../yudao-spring-boot-starter-web/pom.xml | 8 +-- .../framework/jackson/core/package-info.java | 1 + .../framework/jackson/core/package-info.java | 1 - ...ot.autoconfigure.AutoConfiguration.imports | 12 ++-- .../pom.xml | 10 +-- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- yudao-module-ai/pom.xml | 2 +- yudao-module-ai/yudao-module-ai-api/pom.xml | 4 +- yudao-module-ai/yudao-module-ai-biz/pom.xml | 16 ++--- .../module/ai/framework/web/package-info.java | 4 ++ .../module/ai/framework/web/package-info.java | 4 -- .../yudao-spring-boot-starter-ai/pom.xml | 6 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- yudao-module-bpm/pom.xml | 2 +- yudao-module-bpm/yudao-module-bpm-api/pom.xml | 4 +- yudao-module-bpm/yudao-module-bpm-biz/pom.xml | 20 +++--- .../controller/admin/base/package-info.java | 4 ++ .../bpm/controller/app/package-info.java | 4 ++ .../bpm/framework/web/package-info.java | 4 ++ .../controller/admin/base/package-info.java | 4 -- .../bpm/controller/app/package-info.java | 4 -- .../bpm/framework/web/package-info.java | 4 -- .../test/resources/application-unit-test.yaml | 2 +- yudao-module-crm/pom.xml | 2 +- yudao-module-crm/yudao-module-crm-api/pom.xml | 4 +- yudao-module-crm/yudao-module-crm-biz/pom.xml | 22 +++---- .../crm/controller/app/package-info.java | 4 ++ .../crm/dal/dataobject/clue/package-info.java | 4 ++ .../dal/dataobject/contact/package-info.java | 4 ++ .../dal/dataobject/product/package-info.java | 4 ++ .../crm/dal/mysql/clue/package-info.java | 4 ++ .../dal/mysql/permission/package-info.java | 1 + .../crm/framework/excel/package-info.java | 4 ++ .../framework/operatelog/package-info.java | 4 ++ .../permission/core/package-info.java | 1 + .../framework/permission/package-info.java | 4 ++ .../crm/framework/web/package-info.java | 4 ++ .../yudao/module/crm/job/package-info.java | 4 ++ .../crm/controller/app/package-info.java | 4 -- .../crm/dal/dataobject/clue/package-info.java | 4 -- .../dal/dataobject/contact/package-info.java | 4 -- .../dal/dataobject/product/package-info.java | 4 -- .../crm/dal/mysql/clue/package-info.java | 4 -- .../dal/mysql/permission/package-info.java | 1 - .../crm/framework/excel/package-info.java | 4 -- .../framework/operatelog/package-info.java | 4 -- .../permission/core/package-info.java | 1 - .../framework/permission/package-info.java | 4 -- .../crm/framework/web/package-info.java | 4 -- .../yudao/module/crm/job/package-info.java | 4 -- .../CrmStatisticsCustomerMapper.xml | 62 +++++++++---------- .../statistics/CrmStatisticsFunnelMapper.xml | 8 +-- .../CrmStatisticsPerformanceMapper.xml | 14 ++--- .../CrmStatisticsPortraitMapper.xml | 10 +-- .../statistics/CrmStatisticsRankMapper.xml | 26 ++++---- .../test/resources/application-unit-test.yaml | 2 +- yudao-module-erp/pom.xml | 2 +- yudao-module-erp/yudao-module-erp-api/pom.xml | 4 +- yudao-module-erp/yudao-module-erp-biz/pom.xml | 18 +++--- .../erp/framework/web/package-info.java | 4 ++ .../erp/framework/web/package-info.java | 4 -- .../ErpPurchaseStatisticsMapper.xml | 6 +- .../statistics/ErpSaleStatisticsMapper.xml | 6 +- yudao-module-infra/pom.xml | 2 +- .../yudao-module-infra-api/pom.xml | 4 +- .../yudao-module-infra-biz/pom.xml | 26 ++++---- .../yudao/module/infra/api/package-info.java | 1 + .../admin/demo/demo03/package-info.java | 1 + .../infra/controller/app/package-info.java | 4 ++ .../module/infra/controller/package-info.java | 2 +- .../module/infra/enums/package-info.java | 4 ++ .../infra/framework/codegen/package-info.java | 4 ++ .../framework/security/core/package-info.java | 4 ++ .../infra/framework/web/package-info.java | 4 ++ .../infra/mq/consumer/package-info.java | 4 ++ .../module/infra/mq/message/package-info.java | 4 ++ .../infra/mq/producer/package-info.java | 4 ++ .../yudao/module/infra/api/package-info.java | 1 - .../admin/demo/demo03/package-info.java | 1 - .../infra/controller/app/package-info.java | 4 -- .../module/infra/enums/package-info.java | 4 -- .../infra/framework/codegen/package-info.java | 4 -- .../framework/security/core/package-info.java | 4 -- .../infra/framework/web/package-info.java | 4 -- .../infra/mq/consumer/package-info.java | 4 -- .../module/infra/mq/message/package-info.java | 4 -- .../infra/mq/producer/package-info.java | 4 -- .../test/resources/application-unit-test.yaml | 2 +- .../windows10/vue2_master_erp/assert.json | 28 ++++----- .../java/InfraStudentContactDO | 4 +- .../java/InfraStudentContactMapper | 12 ++-- .../java/InfraStudentController | 28 ++++----- .../vue2_master_erp/java/InfraStudentDO | 4 +- .../vue2_master_erp/java/InfraStudentMapper | 12 ++-- .../java/InfraStudentPageReqVO | 6 +- .../vue2_master_erp/java/InfraStudentRespVO | 6 +- .../java/InfraStudentSaveReqVO | 6 +- .../vue2_master_erp/java/InfraStudentService | 14 ++--- .../java/InfraStudentServiceImpl | 26 ++++---- .../java/InfraStudentServiceImplTest | 24 +++---- .../java/InfraStudentTeacherDO | 4 +- .../java/InfraStudentTeacherMapper | 12 ++-- .../vue2_master_erp/xml/InfraStudentMapper | 2 +- .../windows10/vue2_master_inner/assert.json | 28 ++++----- .../java/InfraStudentContactDO | 4 +- .../java/InfraStudentContactMapper | 12 ++-- .../java/InfraStudentController | 28 ++++----- .../vue2_master_inner/java/InfraStudentDO | 4 +- .../vue2_master_inner/java/InfraStudentMapper | 12 ++-- .../java/InfraStudentPageReqVO | 6 +- .../vue2_master_inner/java/InfraStudentRespVO | 6 +- .../java/InfraStudentSaveReqVO | 6 +- .../java/InfraStudentService | 14 ++--- .../java/InfraStudentServiceImpl | 26 ++++---- .../java/InfraStudentServiceImplTest | 24 +++---- .../java/InfraStudentTeacherDO | 4 +- .../java/InfraStudentTeacherMapper | 12 ++-- .../vue2_master_inner/xml/InfraStudentMapper | 2 +- .../windows10/vue2_master_normal/assert.json | 28 ++++----- .../java/InfraStudentContactDO | 4 +- .../java/InfraStudentContactMapper | 12 ++-- .../java/InfraStudentController | 28 ++++----- .../vue2_master_normal/java/InfraStudentDO | 4 +- .../java/InfraStudentMapper | 12 ++-- .../java/InfraStudentPageReqVO | 6 +- .../java/InfraStudentRespVO | 6 +- .../java/InfraStudentSaveReqVO | 6 +- .../java/InfraStudentService | 14 ++--- .../java/InfraStudentServiceImpl | 26 ++++---- .../java/InfraStudentServiceImplTest | 24 +++---- .../java/InfraStudentTeacherDO | 4 +- .../java/InfraStudentTeacherMapper | 12 ++-- .../vue2_master_normal/xml/InfraStudentMapper | 2 +- .../codegen/windows10/vue2_one/assert.json | 20 +++--- .../vue2_one/java/InfraStudentController | 24 +++---- .../windows10/vue2_one/java/InfraStudentDO | 4 +- .../vue2_one/java/InfraStudentMapper | 12 ++-- .../vue2_one/java/InfraStudentPageReqVO | 6 +- .../vue2_one/java/InfraStudentRespVO | 6 +- .../vue2_one/java/InfraStudentSaveReqVO | 2 +- .../vue2_one/java/InfraStudentService | 10 +-- .../vue2_one/java/InfraStudentServiceImpl | 18 +++--- .../vue2_one/java/InfraStudentServiceImplTest | 24 +++---- .../windows10/vue2_one/xml/InfraStudentMapper | 2 +- .../codegen/windows10/vue2_tree/assert.json | 20 +++--- .../vue2_tree/java/InfraCategoryController | 24 +++---- .../windows10/vue2_tree/java/InfraCategoryDO | 4 +- .../vue2_tree/java/InfraCategoryListReqVO | 4 +- .../vue2_tree/java/InfraCategoryMapper | 12 ++-- .../vue2_tree/java/InfraCategoryRespVO | 2 +- .../vue2_tree/java/InfraCategorySaveReqVO | 2 +- .../vue2_tree/java/InfraCategoryService | 10 +-- .../vue2_tree/java/InfraCategoryServiceImpl | 18 +++--- .../java/InfraCategoryServiceImplTest | 24 +++---- .../vue2_tree/xml/InfraCategoryMapper | 2 +- .../windows10/vue3_master_erp/assert.json | 28 ++++----- .../java/InfraStudentContactDO | 4 +- .../java/InfraStudentContactMapper | 12 ++-- .../java/InfraStudentController | 28 ++++----- .../vue3_master_erp/java/InfraStudentDO | 4 +- .../vue3_master_erp/java/InfraStudentMapper | 12 ++-- .../java/InfraStudentPageReqVO | 6 +- .../vue3_master_erp/java/InfraStudentRespVO | 6 +- .../java/InfraStudentSaveReqVO | 6 +- .../vue3_master_erp/java/InfraStudentService | 14 ++--- .../java/InfraStudentServiceImpl | 26 ++++---- .../java/InfraStudentServiceImplTest | 24 +++---- .../java/InfraStudentTeacherDO | 4 +- .../java/InfraStudentTeacherMapper | 12 ++-- .../vue3_master_erp/xml/InfraStudentMapper | 2 +- .../windows10/vue3_master_inner/assert.json | 28 ++++----- .../java/InfraStudentContactDO | 4 +- .../java/InfraStudentContactMapper | 12 ++-- .../java/InfraStudentController | 28 ++++----- .../vue3_master_inner/java/InfraStudentDO | 4 +- .../vue3_master_inner/java/InfraStudentMapper | 12 ++-- .../java/InfraStudentPageReqVO | 6 +- .../vue3_master_inner/java/InfraStudentRespVO | 6 +- .../java/InfraStudentSaveReqVO | 6 +- .../java/InfraStudentService | 14 ++--- .../java/InfraStudentServiceImpl | 26 ++++---- .../java/InfraStudentServiceImplTest | 24 +++---- .../java/InfraStudentTeacherDO | 4 +- .../java/InfraStudentTeacherMapper | 12 ++-- .../vue3_master_inner/xml/InfraStudentMapper | 2 +- .../windows10/vue3_master_normal/assert.json | 28 ++++----- .../java/InfraStudentContactDO | 4 +- .../java/InfraStudentContactMapper | 12 ++-- .../java/InfraStudentController | 28 ++++----- .../vue3_master_normal/java/InfraStudentDO | 4 +- .../java/InfraStudentMapper | 12 ++-- .../java/InfraStudentPageReqVO | 6 +- .../java/InfraStudentRespVO | 6 +- .../java/InfraStudentSaveReqVO | 6 +- .../java/InfraStudentService | 14 ++--- .../java/InfraStudentServiceImpl | 26 ++++---- .../java/InfraStudentServiceImplTest | 24 +++---- .../java/InfraStudentTeacherDO | 4 +- .../java/InfraStudentTeacherMapper | 12 ++-- .../vue3_master_normal/xml/InfraStudentMapper | 2 +- .../codegen/windows10/vue3_one/assert.json | 20 +++--- .../vue3_one/java/InfraStudentController | 24 +++---- .../windows10/vue3_one/java/InfraStudentDO | 4 +- .../vue3_one/java/InfraStudentMapper | 12 ++-- .../vue3_one/java/InfraStudentPageReqVO | 6 +- .../vue3_one/java/InfraStudentRespVO | 6 +- .../vue3_one/java/InfraStudentSaveReqVO | 2 +- .../vue3_one/java/InfraStudentService | 10 +-- .../vue3_one/java/InfraStudentServiceImpl | 18 +++--- .../vue3_one/java/InfraStudentServiceImplTest | 24 +++---- .../windows10/vue3_one/xml/InfraStudentMapper | 2 +- .../codegen/windows10/vue3_tree/assert.json | 20 +++--- .../vue3_tree/java/InfraCategoryController | 24 +++---- .../windows10/vue3_tree/java/InfraCategoryDO | 4 +- .../vue3_tree/java/InfraCategoryListReqVO | 4 +- .../vue3_tree/java/InfraCategoryMapper | 12 ++-- .../vue3_tree/java/InfraCategoryRespVO | 2 +- .../vue3_tree/java/InfraCategorySaveReqVO | 2 +- .../vue3_tree/java/InfraCategoryService | 10 +-- .../vue3_tree/java/InfraCategoryServiceImpl | 18 +++--- .../java/InfraCategoryServiceImplTest | 24 +++---- .../vue3_tree/xml/InfraCategoryMapper | 2 +- yudao-module-iot/pom.xml | 2 +- yudao-module-iot/yudao-module-iot-api/pom.xml | 4 +- yudao-module-iot/yudao-module-iot-biz/pom.xml | 14 ++--- .../module/iot}/controller/package-info.java | 2 +- .../module/iot/convert/package-info.java | 1 + .../iot/framework/web/package-info.java | 4 ++ .../module/iot/convert/package-info.java | 1 - .../iot/framework/web/package-info.java | 4 -- yudao-module-mall/pom.xml | 2 +- .../yudao-module-product-api/pom.xml | 4 +- .../module/product/api/package-info.java | 4 ++ .../module/product/api/package-info.java | 4 -- .../yudao-module-product-biz/pom.xml | 16 ++--- .../module/product/api/package-info.java | 1 + .../product/framework/web/package-info.java | 4 ++ .../module/product/api/package-info.java | 1 - .../product/framework/web/package-info.java | 4 -- .../test/resources/application-unit-test.yaml | 2 +- .../yudao-module-promotion-api/pom.xml | 4 +- .../yudao-module-promotion-biz/pom.xml | 22 +++---- .../controller/app/kefu/vo/package-info.java | 1 + .../promotion/framework/web/package-info.java | 4 ++ .../module/promotion/job/package-info.java | 4 ++ .../promotion/mq/consumer/package-info.java | 4 ++ .../promotion/mq/message/package-info.java | 4 ++ .../promotion/mq/producer/package-info.java | 4 ++ .../controller/app/kefu/vo/package-info.java | 1 - .../promotion/framework/web/package-info.java | 4 -- .../module/promotion/job/package-info.java | 4 -- .../promotion/mq/consumer/package-info.java | 4 -- .../promotion/mq/message/package-info.java | 4 -- .../promotion/mq/producer/package-info.java | 4 -- .../test/resources/application-unit-test.yaml | 2 +- .../yudao-module-statistics-api/pom.xml | 4 +- .../module/statistics/api/package-info.java | 4 ++ .../module/statistics/enums/package-info.java | 4 ++ .../module/statistics/api/package-info.java | 4 -- .../module/statistics/enums/package-info.java | 4 -- .../yudao-module-statistics-biz/pom.xml | 28 ++++----- .../controller/app/package-info.java | 4 ++ .../dal/dataobject/package-info.java | 4 ++ .../controller/app/package-info.java | 4 -- .../dal/dataobject/package-info.java | 4 -- .../infra/ApiAccessLogStatisticsMapper.xml | 2 +- .../mapper/member/MemberStatisticsMapper.xml | 10 +-- .../mapper/pay/PayWalletStatisticsMapper.xml | 8 +-- .../product/ProductStatisticsMapper.xml | 4 +- .../trade/AfterSaleStatisticsMapper.xml | 4 +- .../trade/BrokerageStatisticsMapper.xml | 2 +- .../trade/TradeOrderStatisticsMapper.xml | 10 +-- .../mapper/trade/TradeStatisticsMapper.xml | 6 +- .../yudao-module-trade-api/pom.xml | 4 +- .../yudao/module/trade/api/package-info.java | 1 + .../yudao/module/trade/api/package-info.java | 1 - .../yudao-module-trade-biz/pom.xml | 30 ++++----- .../yudao/module/trade/api/package-info.java | 1 + .../admin/base/member/package-info.java | 4 ++ .../controller/admin/base/package-info.java | 4 ++ .../controller/app/base/package-info.java | 4 ++ .../module/trade/controller/package-info.java | 2 +- .../trade/framework/web/package-info.java | 4 ++ .../yudao/module/trade/api/package-info.java | 1 - .../admin/base/member/package-info.java | 4 -- .../controller/admin/base/package-info.java | 4 -- .../controller/app/base/package-info.java | 4 -- .../trade/framework/web/package-info.java | 4 -- .../mapper/brokerage/BrokerageUserMapper.xml | 4 +- .../test/resources/application-unit-test.yaml | 2 +- yudao-module-member/pom.xml | 2 +- .../yudao-module-member-api/pom.xml | 4 +- .../module/member/message/package-info.java | 4 ++ .../module/member/message/package-info.java | 4 -- .../yudao-module-member-biz/pom.xml | 24 +++---- .../yudao/module/member/api/package-info.java | 1 + .../admin/address/package-info.java | 1 + .../member/controller/package-info.java | 2 +- .../member/framework/web/package-info.java | 4 ++ .../member/mq/consumer/package-info.java | 4 ++ .../member/mq/message/package-info.java | 4 ++ .../member/mq/producer/package-info.java | 4 ++ .../yudao/module/member/api/package-info.java | 1 - .../admin/address/package-info.java | 1 - .../member/framework/web/package-info.java | 4 -- .../member/mq/consumer/package-info.java | 4 -- .../member/mq/message/package-info.java | 4 -- .../member/mq/producer/package-info.java | 4 -- .../test/resources/application-unit-test.yaml | 2 +- yudao-module-mp/pom.xml | 2 +- yudao-module-mp/yudao-module-mp-api/pom.xml | 4 +- yudao-module-mp/yudao-module-mp-biz/pom.xml | 22 +++---- .../module/mp/framework/web/package-info.java | 4 ++ .../module/mp/framework/web/package-info.java | 4 -- yudao-module-pay/pom.xml | 2 +- yudao-module-pay/yudao-module-pay-api/pom.xml | 4 +- .../module/pay/api/notify/package-info.java | 4 ++ .../module/pay/api/notify/package-info.java | 4 -- yudao-module-pay/yudao-module-pay-biz/pom.xml | 20 +++--- .../module/pay}/controller/package-info.java | 2 +- .../pay/framework/job/core/package-info.java | 4 ++ .../pay/framework/web/package-info.java | 4 ++ .../pay/framework/job/core/package-info.java | 4 -- .../pay/framework/web/package-info.java | 4 -- .../test/resources/application-unit-test.yaml | 2 +- .../yudao-spring-boot-starter-biz-pay/pom.xml | 6 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- yudao-module-report/pom.xml | 2 +- .../yudao-module-report-api/pom.xml | 4 +- .../yudao-module-report-biz/pom.xml | 18 +++--- .../admin/ajreport/package-info.java | 1 + .../report/controller/package-info.java | 6 ++ .../report/convert/ajreport/package-info.java | 4 ++ .../dal/dataobject/ajreport/package-info.java | 4 ++ .../dal/mysql/ajreport/package-info.java | 4 ++ .../jmreport/core/web/package-info.java | 4 ++ .../framework/security/core/package-info.java | 4 ++ .../report/service/ajreport/package-info.java | 4 ++ .../admin/ajreport/package-info.java | 1 - .../report/controller/package-info.java | 6 -- .../report/convert/ajreport/package-info.java | 4 -- .../dal/dataobject/ajreport/package-info.java | 4 -- .../dal/mysql/ajreport/package-info.java | 4 -- .../jmreport/core/web/package-info.java | 4 -- .../framework/security/core/package-info.java | 4 -- .../report/service/ajreport/package-info.java | 4 -- .../test/resources/application-unit-test.yaml | 2 +- yudao-module-system/pom.xml | 2 +- .../yudao-module-system-api/pom.xml | 4 +- .../yudao-module-system-biz/pom.xml | 26 ++++---- .../system/controller/package-info.java | 6 ++ .../module/system/convert/package-info.java | 2 +- .../datapermission/package-info.java | 4 ++ .../framework/operatelog/package-info.java | 4 ++ .../system/framework/web/package-info.java | 4 ++ .../yudao/module/system/job/package-info.java | 1 + .../system/controller/package-info.java | 6 -- .../datapermission/package-info.java | 4 -- .../framework/operatelog/package-info.java | 4 -- .../system/framework/web/package-info.java | 4 -- .../yudao/module/system/job/package-info.java | 1 - ...ingyuv.captcha.service.CaptchaCacheService | 2 +- .../test/resources/application-unit-test.yaml | 2 +- yudao-server/pom.xml | 34 +++++----- .../src/main/resources/application-local.yaml | 48 +++++++------- .../src/main/resources/application.yaml | 2 +- 411 files changed, 1569 insertions(+), 1569 deletions(-) create mode 100644 yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/huangge/yudao/framework/dict/package-info.java delete mode 100644 yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/dict/package-info.java create mode 100644 yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/huangge/yudao/framework/mq/rabbitmq/core/package-info.java delete mode 100644 yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/rabbitmq/core/package-info.java create mode 100644 yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/huangge/yudao/framework/operatelog/core/package-info.java delete mode 100644 yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/operatelog/core/package-info.java create mode 100644 yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/huangge/yudao/framework/jackson/core/package-info.java delete mode 100644 yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/core/package-info.java create mode 100644 yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/huangge/yudao/module/ai/framework/web/package-info.java delete mode 100644 yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/framework/web/package-info.java create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/huangge/yudao/module/bpm/controller/admin/base/package-info.java create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/huangge/yudao/module/bpm/controller/app/package-info.java create mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/huangge/yudao/module/bpm/framework/web/package-info.java delete mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/base/package-info.java delete mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/app/package-info.java delete mode 100644 yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/web/package-info.java create mode 100644 yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/controller/app/package-info.java create mode 100644 yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/dal/dataobject/clue/package-info.java create mode 100644 yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/dal/dataobject/contact/package-info.java create mode 100644 yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/dal/dataobject/product/package-info.java create mode 100644 yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/dal/mysql/clue/package-info.java create mode 100644 yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/dal/mysql/permission/package-info.java create mode 100644 yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/framework/excel/package-info.java create mode 100644 yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/framework/operatelog/package-info.java create mode 100644 yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/framework/permission/core/package-info.java create mode 100644 yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/framework/permission/package-info.java create mode 100644 yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/framework/web/package-info.java create mode 100644 yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/job/package-info.java delete mode 100644 yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/app/package-info.java delete mode 100644 yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/clue/package-info.java delete mode 100644 yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/contact/package-info.java delete mode 100644 yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/product/package-info.java delete mode 100644 yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/clue/package-info.java delete mode 100644 yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/permission/package-info.java delete mode 100644 yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/excel/package-info.java delete mode 100644 yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/operatelog/package-info.java delete mode 100644 yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/core/package-info.java delete mode 100644 yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/package-info.java delete mode 100644 yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/web/package-info.java delete mode 100644 yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/job/package-info.java create mode 100644 yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/huangge/yudao/module/erp/framework/web/package-info.java delete mode 100644 yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/framework/web/package-info.java create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/api/package-info.java create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/controller/admin/demo/demo03/package-info.java create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/controller/app/package-info.java rename yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/{iocoder => huangge}/yudao/module/infra/controller/package-info.java (83%) create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/enums/package-info.java create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/framework/codegen/package-info.java create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/framework/security/core/package-info.java create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/framework/web/package-info.java create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/mq/consumer/package-info.java create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/mq/message/package-info.java create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/mq/producer/package-info.java delete mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/package-info.java delete mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/package-info.java delete mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/app/package-info.java delete mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/enums/package-info.java delete mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/codegen/package-info.java delete mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/security/core/package-info.java delete mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/web/package-info.java delete mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/mq/consumer/package-info.java delete mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/mq/message/package-info.java delete mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/mq/producer/package-info.java rename {yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay => yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/huangge/yudao/module/iot}/controller/package-info.java (84%) create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/huangge/yudao/module/iot/convert/package-info.java create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/huangge/yudao/module/iot/framework/web/package-info.java delete mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/convert/package-info.java delete mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/web/package-info.java create mode 100644 yudao-module-mall/yudao-module-product-api/src/main/java/cn/huangge/yudao/module/product/api/package-info.java delete mode 100644 yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/package-info.java create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/huangge/yudao/module/product/api/package-info.java create mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/huangge/yudao/module/product/framework/web/package-info.java delete mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/package-info.java delete mode 100644 yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/framework/web/package-info.java create mode 100644 yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/huangge/yudao/module/promotion/controller/app/kefu/vo/package-info.java create mode 100644 yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/huangge/yudao/module/promotion/framework/web/package-info.java create mode 100644 yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/huangge/yudao/module/promotion/job/package-info.java create mode 100644 yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/huangge/yudao/module/promotion/mq/consumer/package-info.java create mode 100644 yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/huangge/yudao/module/promotion/mq/message/package-info.java create mode 100644 yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/huangge/yudao/module/promotion/mq/producer/package-info.java delete mode 100644 yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/vo/package-info.java delete mode 100644 yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/framework/web/package-info.java delete mode 100644 yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/job/package-info.java delete mode 100644 yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/mq/consumer/package-info.java delete mode 100644 yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/mq/message/package-info.java delete mode 100644 yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/mq/producer/package-info.java create mode 100644 yudao-module-mall/yudao-module-statistics-api/src/main/java/cn/huangge/yudao/module/statistics/api/package-info.java create mode 100644 yudao-module-mall/yudao-module-statistics-api/src/main/java/cn/huangge/yudao/module/statistics/enums/package-info.java delete mode 100644 yudao-module-mall/yudao-module-statistics-api/src/main/java/cn/iocoder/yudao/module/statistics/api/package-info.java delete mode 100644 yudao-module-mall/yudao-module-statistics-api/src/main/java/cn/iocoder/yudao/module/statistics/enums/package-info.java create mode 100644 yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/huangge/yudao/module/statistics/controller/app/package-info.java create mode 100644 yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/huangge/yudao/module/statistics/dal/dataobject/package-info.java delete mode 100644 yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/app/package-info.java delete mode 100644 yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/dal/dataobject/package-info.java create mode 100644 yudao-module-mall/yudao-module-trade-api/src/main/java/cn/huangge/yudao/module/trade/api/package-info.java delete mode 100644 yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/package-info.java create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/huangge/yudao/module/trade/api/package-info.java create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/huangge/yudao/module/trade/controller/admin/base/member/package-info.java create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/huangge/yudao/module/trade/controller/admin/base/package-info.java create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/huangge/yudao/module/trade/controller/app/base/package-info.java rename yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/{iocoder => huangge}/yudao/module/trade/controller/package-info.java (83%) create mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/huangge/yudao/module/trade/framework/web/package-info.java delete mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/package-info.java delete mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/base/member/package-info.java delete mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/base/package-info.java delete mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/package-info.java delete mode 100644 yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/web/package-info.java create mode 100644 yudao-module-member/yudao-module-member-api/src/main/java/cn/huangge/yudao/module/member/message/package-info.java delete mode 100644 yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/message/package-info.java create mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/api/package-info.java create mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/controller/admin/address/package-info.java rename yudao-module-member/yudao-module-member-biz/src/main/java/cn/{iocoder => huangge}/yudao/module/member/controller/package-info.java (83%) create mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/framework/web/package-info.java create mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/mq/consumer/package-info.java create mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/mq/message/package-info.java create mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/mq/producer/package-info.java delete mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/package-info.java delete mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/package-info.java delete mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/framework/web/package-info.java delete mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/mq/consumer/package-info.java delete mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/mq/message/package-info.java delete mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/mq/producer/package-info.java create mode 100644 yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/huangge/yudao/module/mp/framework/web/package-info.java delete mode 100644 yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/framework/web/package-info.java create mode 100644 yudao-module-pay/yudao-module-pay-api/src/main/java/cn/huangge/yudao/module/pay/api/notify/package-info.java delete mode 100644 yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/notify/package-info.java rename {yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot => yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/huangge/yudao/module/pay}/controller/package-info.java (84%) create mode 100644 yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/huangge/yudao/module/pay/framework/job/core/package-info.java create mode 100644 yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/huangge/yudao/module/pay/framework/web/package-info.java delete mode 100644 yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/framework/job/core/package-info.java delete mode 100644 yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/framework/web/package-info.java create mode 100644 yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/controller/admin/ajreport/package-info.java create mode 100644 yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/controller/package-info.java create mode 100644 yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/convert/ajreport/package-info.java create mode 100644 yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/dal/dataobject/ajreport/package-info.java create mode 100644 yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/dal/mysql/ajreport/package-info.java create mode 100644 yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/framework/jmreport/core/web/package-info.java create mode 100644 yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/framework/security/core/package-info.java create mode 100644 yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/service/ajreport/package-info.java delete mode 100644 yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ajreport/package-info.java delete mode 100644 yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/package-info.java delete mode 100644 yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/convert/ajreport/package-info.java delete mode 100644 yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/dataobject/ajreport/package-info.java delete mode 100644 yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/dal/mysql/ajreport/package-info.java delete mode 100644 yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/web/package-info.java delete mode 100644 yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/core/package-info.java delete mode 100644 yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/ajreport/package-info.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/huangge/yudao/module/system/controller/package-info.java rename yudao-module-system/yudao-module-system-biz/src/main/java/cn/{iocoder => huangge}/yudao/module/system/convert/package-info.java (61%) create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/huangge/yudao/module/system/framework/datapermission/package-info.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/huangge/yudao/module/system/framework/operatelog/package-info.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/huangge/yudao/module/system/framework/web/package-info.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/huangge/yudao/module/system/job/package-info.java delete mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/package-info.java delete mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/datapermission/package-info.java delete mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/operatelog/package-info.java delete mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/web/package-info.java delete mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/package-info.java diff --git a/pom.xml b/pom.xml index 97a28af11..a12420459 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao ${revision} pom @@ -50,7 +50,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-dependencies ${revision} pom diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml index ae977dd97..50dfb0c21 100644 --- a/script/docker/docker-compose.yml +++ b/script/docker/docker-compose.yml @@ -63,7 +63,7 @@ services: NODE_ENV: ENV=${NODE_ENV:-production} PUBLIC_PATH=${PUBLIC_PATH:-/} - VUE_APP_TITLE=${VUE_APP_TITLE:-芋道管理系统} + VUE_APP_TITLE=${VUE_APP_TITLE:-龙儿管理系统} VUE_APP_BASE_API=${VUE_APP_BASE_API:-/prod-api} VUE_APP_APP_NAME=${VUE_APP_APP_NAME:-/} VUE_APP_TENANT_ENABLE=${VUE_APP_TENANT_ENABLE:-true} diff --git a/script/docker/docker.env b/script/docker/docker.env index 0bf6e997e..d61ee610c 100644 --- a/script/docker/docker.env +++ b/script/docker/docker.env @@ -16,7 +16,7 @@ REDIS_HOST=yudao-redis ## admin NODE_ENV=production PUBLIC_PATH=/ -VUE_APP_TITLE=芋道管理系统 +VUE_APP_TITLE=龙儿管理系统 VUE_APP_BASE_API=/prod-api VUE_APP_APP_NAME=/ VUE_APP_TENANT_ENABLE=true diff --git a/sql/dm/ruoyi-vue-pro-dm8.sql b/sql/dm/ruoyi-vue-pro-dm8.sql index 0cf97945a..6027207f3 100644 --- a/sql/dm/ruoyi-vue-pro-dm8.sql +++ b/sql/dm/ruoyi-vue-pro-dm8.sql @@ -388,8 +388,8 @@ COMMENT ON TABLE infra_file_config IS '文件配置表'; -- ---------------------------- -- @formatter:off SET IDENTITY_INSERT infra_file_config ON; -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.module.infra.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', '1', '2022-03-15 23:56:24', '1', '2024-02-28 22:54:07', '0'); -INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (22, '七牛存储器', 20, '', '1', '{"@class":"cn.iocoder.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3.cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS","accessSecret":"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY"}', '1', '2024-01-13 22:11:12', '1', '2024-04-03 19:38:34', '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.huangge.yudao.module.infra.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', '1', '2022-03-15 23:56:24', '1', '2024-02-28 22:54:07', '0'); +INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (22, '七牛存储器', 20, '', '1', '{"@class":"cn.huangge.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3.cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS","accessSecret":"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY"}', '1', '2024-01-13 22:11:12', '1', '2024-04-03 19:38:34', '0'); COMMIT; SET IDENTITY_INSERT infra_file_config OFF; -- @formatter:on diff --git a/sql/kingbase/ruoyi-vue-pro.sql b/sql/kingbase/ruoyi-vue-pro.sql index 37f3b9b66..c92e59edf 100644 --- a/sql/kingbase/ruoyi-vue-pro.sql +++ b/sql/kingbase/ruoyi-vue-pro.sql @@ -493,8 +493,8 @@ COMMENT ON TABLE infra_file_config IS '文件配置表'; -- ---------------------------- -- @formatter:off BEGIN; -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.module.infra.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', '1', '2022-03-15 23:56:24', '1', '2024-02-28 22:54:07', '0'); -INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (22, '七牛存储器', 20, '', '1', '{"@class":"cn.iocoder.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3.cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS","accessSecret":"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY"}', '1', '2024-01-13 22:11:12', '1', '2024-04-03 19:38:34', '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.huangge.yudao.module.infra.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', '1', '2022-03-15 23:56:24', '1', '2024-02-28 22:54:07', '0'); +INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (22, '七牛存储器', 20, '', '1', '{"@class":"cn.huangge.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3.cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS","accessSecret":"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY"}', '1', '2024-01-13 22:11:12', '1', '2024-04-03 19:38:34', '0'); COMMIT; -- @formatter:on diff --git a/sql/mysql/quartz.sql b/sql/mysql/quartz.sql index 21ae3918c..20cd44f30 100644 --- a/sql/mysql/quartz.sql +++ b/sql/mysql/quartz.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', 'accessLogCleanJob', 'DEFAULT', NULL, 'cn.iocoder.yudao.framework.quartz.core.handler.JobHandlerInvoker', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B020000787000000000000000197400104A4F425F48414E444C45525F4E414D457400116163636573734C6F67436C65616E4A6F627800), ('schedulerName', 'brokerageRecordUnfreezeJob', 'DEFAULT', NULL, 'cn.iocoder.yudao.framework.quartz.core.handler.JobHandlerInvoker', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B020000787000000000000000187400104A4F425F48414E444C45525F4E414D4574001A62726F6B65726167655265636F7264556E667265657A654A6F627800), ('schedulerName', 'errorLogCleanJob', 'DEFAULT', NULL, 'cn.iocoder.yudao.framework.quartz.core.handler.JobHandlerInvoker', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000000000001A7400104A4F425F48414E444C45525F4E414D457400106572726F724C6F67436C65616E4A6F627800), ('schedulerName', 'jobLogCleanJob', 'DEFAULT', NULL, 'cn.iocoder.yudao.framework.quartz.core.handler.JobHandlerInvoker', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000000000001B7400104A4F425F48414E444C45525F4E414D4574000E6A6F624C6F67436C65616E4A6F627800), ('schedulerName', 'payNotifyJob', 'DEFAULT', NULL, 'cn.iocoder.yudao.framework.quartz.core.handler.JobHandlerInvoker', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B020000787000000000000000057400104A4F425F48414E444C45525F4E414D4574000C7061794E6F746966794A6F627800), ('schedulerName', 'payOrderExpireJob', 'DEFAULT', NULL, 'cn.iocoder.yudao.framework.quartz.core.handler.JobHandlerInvoker', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B020000787000000000000000127400104A4F425F48414E444C45525F4E414D457400117061794F726465724578706972654A6F627800), ('schedulerName', 'payOrderSyncJob', 'DEFAULT', NULL, 'cn.iocoder.yudao.framework.quartz.core.handler.JobHandlerInvoker', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B020000787000000000000000117400104A4F425F48414E444C45525F4E414D4574000F7061794F7264657253796E634A6F627800), ('schedulerName', 'payRefundSyncJob', 'DEFAULT', NULL, 'cn.iocoder.yudao.framework.quartz.core.handler.JobHandlerInvoker', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B020000787000000000000000137400104A4F425F48414E444C45525F4E414D45740010706179526566756E6453796E634A6F627800), ('schedulerName', 'tradeOrderAutoCancelJob', 'DEFAULT', NULL, 'cn.iocoder.yudao.framework.quartz.core.handler.JobHandlerInvoker', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B020000787000000000000000157400104A4F425F48414E444C45525F4E414D4574001774726164654F726465724175746F43616E63656C4A6F627800), ('schedulerName', 'tradeOrderAutoCommentJob', 'DEFAULT', NULL, 'cn.iocoder.yudao.framework.quartz.core.handler.JobHandlerInvoker', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B020000787000000000000000177400104A4F425F48414E444C45525F4E414D4574001874726164654F726465724175746F436F6D6D656E744A6F627800), ('schedulerName', 'tradeOrderAutoReceiveJob', 'DEFAULT', NULL, 'cn.iocoder.yudao.framework.quartz.core.handler.JobHandlerInvoker', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B020000787000000000000000167400104A4F425F48414E444C45525F4E414D4574001874726164654F726465724175746F526563656976654A6F627800); +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', 'accessLogCleanJob', 'DEFAULT', NULL, 'cn.huangge.yudao.framework.quartz.core.handler.JobHandlerInvoker', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B020000787000000000000000197400104A4F425F48414E444C45525F4E414D457400116163636573734C6F67436C65616E4A6F627800), ('schedulerName', 'brokerageRecordUnfreezeJob', 'DEFAULT', NULL, 'cn.huangge.yudao.framework.quartz.core.handler.JobHandlerInvoker', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B020000787000000000000000187400104A4F425F48414E444C45525F4E414D4574001A62726F6B65726167655265636F7264556E667265657A654A6F627800), ('schedulerName', 'errorLogCleanJob', 'DEFAULT', NULL, 'cn.huangge.yudao.framework.quartz.core.handler.JobHandlerInvoker', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000000000001A7400104A4F425F48414E444C45525F4E414D457400106572726F724C6F67436C65616E4A6F627800), ('schedulerName', 'jobLogCleanJob', 'DEFAULT', NULL, 'cn.huangge.yudao.framework.quartz.core.handler.JobHandlerInvoker', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000000000001B7400104A4F425F48414E444C45525F4E414D4574000E6A6F624C6F67436C65616E4A6F627800), ('schedulerName', 'payNotifyJob', 'DEFAULT', NULL, 'cn.huangge.yudao.framework.quartz.core.handler.JobHandlerInvoker', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B020000787000000000000000057400104A4F425F48414E444C45525F4E414D4574000C7061794E6F746966794A6F627800), ('schedulerName', 'payOrderExpireJob', 'DEFAULT', NULL, 'cn.huangge.yudao.framework.quartz.core.handler.JobHandlerInvoker', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B020000787000000000000000127400104A4F425F48414E444C45525F4E414D457400117061794F726465724578706972654A6F627800), ('schedulerName', 'payOrderSyncJob', 'DEFAULT', NULL, 'cn.huangge.yudao.framework.quartz.core.handler.JobHandlerInvoker', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B020000787000000000000000117400104A4F425F48414E444C45525F4E414D4574000F7061794F7264657253796E634A6F627800), ('schedulerName', 'payRefundSyncJob', 'DEFAULT', NULL, 'cn.huangge.yudao.framework.quartz.core.handler.JobHandlerInvoker', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B020000787000000000000000137400104A4F425F48414E444C45525F4E414D45740010706179526566756E6453796E634A6F627800), ('schedulerName', 'tradeOrderAutoCancelJob', 'DEFAULT', NULL, 'cn.huangge.yudao.framework.quartz.core.handler.JobHandlerInvoker', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B020000787000000000000000157400104A4F425F48414E444C45525F4E414D4574001774726164654F726465724175746F43616E63656C4A6F627800), ('schedulerName', 'tradeOrderAutoCommentJob', 'DEFAULT', NULL, 'cn.huangge.yudao.framework.quartz.core.handler.JobHandlerInvoker', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B020000787000000000000000177400104A4F425F48414E444C45525F4E414D4574001874726164654F726465724175746F436F6D6D656E744A6F627800), ('schedulerName', 'tradeOrderAutoReceiveJob', 'DEFAULT', NULL, 'cn.huangge.yudao.framework.quartz.core.handler.JobHandlerInvoker', '0', '1', '1', '0', 0xACED0005737200156F72672E71756172747A2E4A6F62446174614D61709FB083E8BFA9B0CB020000787200266F72672E71756172747A2E7574696C732E537472696E674B65794469727479466C61674D61708208E8C3FBC55D280200015A0013616C6C6F77735472616E7369656E74446174617872001D6F72672E71756172747A2E7574696C732E4469727479466C61674D617013E62EAD28760ACE0200025A000564697274794C00036D617074000F4C6A6176612F7574696C2F4D61703B787001737200116A6176612E7574696C2E486173684D61700507DAC1C31660D103000246000A6C6F6164466163746F724900097468726573686F6C6478703F4000000000000C770800000010000000027400064A4F425F49447372000E6A6176612E6C616E672E4C6F6E673B8BE490CC8F23DF0200014A000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B020000787000000000000000167400104A4F425F48414E444C45525F4E414D4574001874726164654F726465724175746F526563656976654A6F627800); COMMIT; -- ---------------------------- diff --git a/sql/mysql/ruoyi-vue-pro.sql b/sql/mysql/ruoyi-vue-pro.sql index 6f71bc680..469765404 100644 --- a/sql/mysql/ruoyi-vue-pro.sql +++ b/sql/mysql/ruoyi-vue-pro.sql @@ -281,8 +281,8 @@ 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'0', '{\"@class\":\"cn.iocoder.yudao.module.infra.framework.file.core.client.db.DBFileClientConfig\",\"domain\":\"http://127.0.0.1:48080\"}', '1', '2022-03-15 23:56:24', '1', '2024-02-28 22:54:07', b'0'); -INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (22, '七牛存储器', 20, '', b'1', '{\"@class\":\"cn.iocoder.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig\",\"endpoint\":\"s3.cn-south-1.qiniucs.com\",\"domain\":\"http://test.yudao.iocoder.cn\",\"bucket\":\"ruoyi-vue-pro\",\"accessKey\":\"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS\",\"accessSecret\":\"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY\"}', '1', '2024-01-13 22:11:12', '1', '2024-04-03 19:38:34', b'0'); +INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (4, '数据库', 1, '我是数据库', b'0', '{\"@class\":\"cn.huangge.yudao.module.infra.framework.file.core.client.db.DBFileClientConfig\",\"domain\":\"http://127.0.0.1:48080\"}', '1', '2022-03-15 23:56:24', '1', '2024-02-28 22:54:07', b'0'); +INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (22, '七牛存储器', 20, '', b'1', '{\"@class\":\"cn.huangge.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig\",\"endpoint\":\"s3.cn-south-1.qiniucs.com\",\"domain\":\"http://test.yudao.iocoder.cn\",\"bucket\":\"ruoyi-vue-pro\",\"accessKey\":\"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS\",\"accessSecret\":\"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY\"}', '1', '2024-01-13 22:11:12', '1', '2024-04-03 19:38:34', b'0'); COMMIT; -- ---------------------------- diff --git a/sql/opengauss/ruoyi-vue-pro.sql b/sql/opengauss/ruoyi-vue-pro.sql index 9ff0033a7..274fa7e56 100644 --- a/sql/opengauss/ruoyi-vue-pro.sql +++ b/sql/opengauss/ruoyi-vue-pro.sql @@ -493,8 +493,8 @@ COMMENT ON TABLE infra_file_config IS '文件配置表'; -- ---------------------------- -- @formatter:off BEGIN; -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.module.infra.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', '1', '2022-03-15 23:56:24', '1', '2024-02-28 22:54:07', '0'); -INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (22, '七牛存储器', 20, '', '1', '{"@class":"cn.iocoder.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3.cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS","accessSecret":"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY"}', '1', '2024-01-13 22:11:12', '1', '2024-04-03 19:38:34', '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.huangge.yudao.module.infra.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', '1', '2022-03-15 23:56:24', '1', '2024-02-28 22:54:07', '0'); +INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (22, '七牛存储器', 20, '', '1', '{"@class":"cn.huangge.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3.cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS","accessSecret":"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY"}', '1', '2024-01-13 22:11:12', '1', '2024-04-03 19:38:34', '0'); COMMIT; -- @formatter:on diff --git a/sql/oracle/ruoyi-vue-pro.sql b/sql/oracle/ruoyi-vue-pro.sql index 9fbf8d5ad..1b281e83e 100644 --- a/sql/oracle/ruoyi-vue-pro.sql +++ b/sql/oracle/ruoyi-vue-pro.sql @@ -458,8 +458,8 @@ COMMENT ON TABLE infra_file_config IS '文件配置表'; -- Records of infra_file_config -- ---------------------------- -- @formatter:off -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.module.infra.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('2024-02-28 22:54:07', '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 (22, '七牛存储器', 20, '', '1', '{"@class":"cn.iocoder.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3.cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS","accessSecret":"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY"}', '1', to_date('2024-01-13 22:11:12', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2024-04-03 19:38:34', '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.huangge.yudao.module.infra.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('2024-02-28 22:54:07', '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 (22, '七牛存储器', 20, '', '1', '{"@class":"cn.huangge.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3.cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS","accessSecret":"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY"}', '1', to_date('2024-01-13 22:11:12', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2024-04-03 19:38:34', 'SYYYY-MM-DD HH24:MI:SS'), '0'); COMMIT; -- @formatter:on diff --git a/sql/postgresql/ruoyi-vue-pro.sql b/sql/postgresql/ruoyi-vue-pro.sql index 526d5a40d..94a23eb13 100644 --- a/sql/postgresql/ruoyi-vue-pro.sql +++ b/sql/postgresql/ruoyi-vue-pro.sql @@ -493,8 +493,8 @@ COMMENT ON TABLE infra_file_config IS '文件配置表'; -- ---------------------------- -- @formatter:off BEGIN; -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.module.infra.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', '1', '2022-03-15 23:56:24', '1', '2024-02-28 22:54:07', '0'); -INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (22, '七牛存储器', 20, '', '1', '{"@class":"cn.iocoder.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3.cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS","accessSecret":"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY"}', '1', '2024-01-13 22:11:12', '1', '2024-04-03 19:38:34', '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.huangge.yudao.module.infra.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', '1', '2022-03-15 23:56:24', '1', '2024-02-28 22:54:07', '0'); +INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (22, '七牛存储器', 20, '', '1', '{"@class":"cn.huangge.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3.cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS","accessSecret":"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY"}', '1', '2024-01-13 22:11:12', '1', '2024-04-03 19:38:34', '0'); COMMIT; -- @formatter:on diff --git a/sql/sqlserver/ruoyi-vue-pro.sql b/sql/sqlserver/ruoyi-vue-pro.sql index 9368057ff..6d6df40ed 100644 --- a/sql/sqlserver/ruoyi-vue-pro.sql +++ b/sql/sqlserver/ruoyi-vue-pro.sql @@ -1390,9 +1390,9 @@ BEGIN TRANSACTION GO SET IDENTITY_INSERT infra_file_config ON GO -INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (4, N'数据库', 1, N'我是数据库', N'0', N'{"@class":"cn.iocoder.yudao.module.infra.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', N'1', N'2022-03-15 23:56:24', N'1', N'2024-02-28 22:54:07', N'0') +INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (4, N'数据库', 1, N'我是数据库', N'0', N'{"@class":"cn.huangge.yudao.module.infra.framework.file.core.client.db.DBFileClientConfig","domain":"http://127.0.0.1:48080"}', N'1', N'2022-03-15 23:56:24', N'1', N'2024-02-28 22:54:07', N'0') GO -INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (22, N'七牛存储器', 20, N'', N'1', N'{"@class":"cn.iocoder.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3.cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS","accessSecret":"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY"}', N'1', N'2024-01-13 22:11:12', N'1', N'2024-04-03 19:38:34', N'0') +INSERT INTO infra_file_config (id, name, storage, remark, master, config, creator, create_time, updater, update_time, deleted) VALUES (22, N'七牛存储器', 20, N'', N'1', N'{"@class":"cn.huangge.yudao.module.infra.framework.file.core.client.s3.S3FileClientConfig","endpoint":"s3.cn-south-1.qiniucs.com","domain":"http://test.yudao.iocoder.cn","bucket":"ruoyi-vue-pro","accessKey":"3TvrJ70gl2Gt6IBe7_IZT1F6i_k0iMuRtyEv4EyS","accessSecret":"wd0tbVBYlp0S-ihA8Qg2hPLncoP83wyrIq24OZuY"}', N'1', N'2024-01-13 22:11:12', N'1', N'2024-04-03 19:38:34', N'0') GO SET IDENTITY_INSERT infra_file_config OFF GO diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index 35c712062..fa629eab9 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -4,7 +4,7 @@ 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.boot + cn.huangge.boot yudao-dependencies ${revision} pom @@ -107,17 +107,17 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-biz-tenant ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-biz-data-permission ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-biz-ip ${revision} @@ -132,19 +132,19 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-web ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-security ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-websocket ${revision} @@ -162,7 +162,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-mybatis ${revision} @@ -225,7 +225,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-redis ${revision} @@ -262,14 +262,14 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-job ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-mq ${revision} @@ -282,7 +282,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-protection ${revision} @@ -301,7 +301,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-monitor ${revision} @@ -366,7 +366,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-test ${revision} test @@ -421,13 +421,13 @@ - cn.iocoder.boot + cn.huangge.boot yudao-common ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-excel ${revision} diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml index 76e674099..5fca34f18 100644 --- a/yudao-framework/pom.xml +++ b/yudao-framework/pom.xml @@ -5,7 +5,7 @@ 4.0.0 yudao - cn.iocoder.boot + cn.huangge.boot ${revision} pom diff --git a/yudao-framework/yudao-common/pom.xml b/yudao-framework/yudao-common/pom.xml index b28da08fe..2a4a23a05 100644 --- a/yudao-framework/yudao-common/pom.xml +++ b/yudao-framework/yudao-common/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-framework ${revision} diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/pom.xml b/yudao-framework/yudao-spring-boot-starter-biz-data-permission/pom.xml index 09e878688..4ab510c34 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-biz-data-permission/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> yudao-framework - cn.iocoder.boot + cn.huangge.boot ${revision} 4.0.0 @@ -17,33 +17,33 @@ - cn.iocoder.boot + cn.huangge.boot yudao-common - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-security true - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-mybatis - cn.iocoder.boot + cn.huangge.boot yudao-module-system-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-test test 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 index c5d0cd35d..3c96c17ba 100644 --- 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 @@ -1,2 +1,2 @@ -cn.iocoder.yudao.framework.datapermission.config.YudaoDataPermissionAutoConfiguration -cn.iocoder.yudao.framework.datapermission.config.YudaoDeptDataPermissionAutoConfiguration \ No newline at end of file +cn.huangge.yudao.framework.datapermission.config.YudaoDataPermissionAutoConfiguration +cn.huangge.yudao.framework.datapermission.config.YudaoDeptDataPermissionAutoConfiguration \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-biz-ip/pom.xml b/yudao-framework/yudao-spring-boot-starter-biz-ip/pom.xml index bc800c85d..c2a0407b4 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-ip/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-biz-ip/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> yudao-framework - cn.iocoder.boot + cn.huangge.boot ${revision} 4.0.0 @@ -22,7 +22,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-common @@ -45,7 +45,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-test test diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/pom.xml b/yudao-framework/yudao-spring-boot-starter-biz-tenant/pom.xml index c1a537613..970266c82 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> yudao-framework - cn.iocoder.boot + cn.huangge.boot ${revision} 4.0.0 @@ -17,36 +17,36 @@ - cn.iocoder.boot + cn.huangge.boot yudao-common - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-security - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-mybatis - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-redis - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-job - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-mq true @@ -68,7 +68,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-test test diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethod.java b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethod.java index de330fdc0..8db871ad0 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethod.java +++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethod.java @@ -21,8 +21,8 @@ import java.lang.reflect.Method; import java.lang.reflect.Type; import java.util.Arrays; -import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; -import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils; +import cn.huangge.yudao.framework.tenant.core.context.TenantContextHolder; +import cn.huangge.yudao.framework.tenant.core.util.TenantUtils; import org.springframework.core.DefaultParameterNameDiscoverer; import org.springframework.core.MethodParameter; import org.springframework.core.ParameterNameDiscoverer; @@ -32,7 +32,7 @@ import org.springframework.messaging.Message; import org.springframework.messaging.handler.HandlerMethod; import org.springframework.util.ObjectUtils; -import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.HEADER_TENANT_ID; +import static cn.huangge.yudao.framework.web.core.util.WebFrameworkUtils.HEADER_TENANT_ID; /** * Extension of {@link HandlerMethod} that invokes the underlying method with diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/resources/META-INF/spring.factories b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/resources/META-INF/spring.factories index a495842a0..509bd6ed5 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/resources/META-INF/spring.factories +++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.env.EnvironmentPostProcessor=\ - cn.iocoder.yudao.framework.tenant.core.mq.kafka.TenantKafkaEnvironmentPostProcessor + cn.huangge.yudao.framework.tenant.core.mq.kafka.TenantKafkaEnvironmentPostProcessor 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 index 603831e3f..d9b7eea59 100644 --- 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 @@ -1 +1 @@ -cn.iocoder.yudao.framework.tenant.config.YudaoTenantAutoConfiguration \ No newline at end of file +cn.huangge.yudao.framework.tenant.config.YudaoTenantAutoConfiguration \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-excel/pom.xml b/yudao-framework/yudao-spring-boot-starter-excel/pom.xml index 9732390a4..cfcaf3967 100644 --- a/yudao-framework/yudao-spring-boot-starter-excel/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-excel/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-framework ${revision} @@ -17,7 +17,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-common @@ -29,7 +29,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-module-system-api ${revision} @@ -64,14 +64,14 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-biz-ip true - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-test test diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/huangge/yudao/framework/dict/package-info.java b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/huangge/yudao/framework/dict/package-info.java new file mode 100644 index 000000000..6c2fa6608 --- /dev/null +++ b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/huangge/yudao/framework/dict/package-info.java @@ -0,0 +1,6 @@ +/** + * 字典数据模块，提供 {@link cn.huangge.yudao.framework.dict.core.DictFrameworkUtils} 工具类 + * + * 通过将字典缓存在内存中，保证性能 + */ +package cn.huangge.yudao.framework.dict; diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/dict/package-info.java b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/dict/package-info.java deleted file mode 100644 index fd87fda1d..000000000 --- a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/dict/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * 字典数据模块，提供 {@link cn.iocoder.yudao.framework.dict.core.DictFrameworkUtils} 工具类 - * - * 通过将字典缓存在内存中，保证性能 - */ -package cn.iocoder.yudao.framework.dict; diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-excel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 2125cee93..20d5f0e53 100644 --- a/yudao-framework/yudao-spring-boot-starter-excel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/yudao-framework/yudao-spring-boot-starter-excel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.iocoder.yudao.framework.dict.config.YudaoDictAutoConfiguration \ No newline at end of file +cn.huangge.yudao.framework.dict.config.YudaoDictAutoConfiguration \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-job/pom.xml b/yudao-framework/yudao-spring-boot-starter-job/pom.xml index c17baf4f2..e38f53fc0 100644 --- a/yudao-framework/yudao-spring-boot-starter-job/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-job/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-framework ${revision} @@ -20,7 +20,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-common 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 index 4086f7a4a..4cd8eba7c 100644 --- 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 @@ -1,2 +1,2 @@ -cn.iocoder.yudao.framework.quartz.config.YudaoQuartzAutoConfiguration -cn.iocoder.yudao.framework.quartz.config.YudaoAsyncAutoConfiguration \ No newline at end of file +cn.huangge.yudao.framework.quartz.config.YudaoQuartzAutoConfiguration +cn.huangge.yudao.framework.quartz.config.YudaoAsyncAutoConfiguration \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-monitor/pom.xml b/yudao-framework/yudao-spring-boot-starter-monitor/pom.xml index ebd1210c0..0c7c75173 100644 --- a/yudao-framework/yudao-spring-boot-starter-monitor/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-monitor/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-framework ${revision} @@ -17,7 +17,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-common 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 index 218ee31a2..ae004caab 100644 --- 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 @@ -1,2 +1,2 @@ -cn.iocoder.yudao.framework.tracer.config.YudaoTracerAutoConfiguration -cn.iocoder.yudao.framework.tracer.config.YudaoMetricsAutoConfiguration \ No newline at end of file +cn.huangge.yudao.framework.tracer.config.YudaoTracerAutoConfiguration +cn.huangge.yudao.framework.tracer.config.YudaoMetricsAutoConfiguration \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-mq/pom.xml b/yudao-framework/yudao-spring-boot-starter-mq/pom.xml index c8972f16b..5a4302e43 100644 --- a/yudao-framework/yudao-spring-boot-starter-mq/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-mq/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-framework ${revision} @@ -18,7 +18,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-redis diff --git a/yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/huangge/yudao/framework/mq/rabbitmq/core/package-info.java b/yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/huangge/yudao/framework/mq/rabbitmq/core/package-info.java new file mode 100644 index 000000000..573c23ae8 --- /dev/null +++ b/yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/huangge/yudao/framework/mq/rabbitmq/core/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位符，无特殊逻辑 + */ +package cn.huangge.yudao.framework.mq.rabbitmq.core; \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/rabbitmq/core/package-info.java b/yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/rabbitmq/core/package-info.java deleted file mode 100644 index 2773b5828..000000000 --- a/yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/rabbitmq/core/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位符，无特殊逻辑 - */ -package cn.iocoder.yudao.framework.mq.rabbitmq.core; \ No newline at end of file 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 index 213850b94..a03ce0f46 100644 --- 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 @@ -1,3 +1,3 @@ -cn.iocoder.yudao.framework.mq.redis.config.YudaoRedisMQProducerAutoConfiguration -cn.iocoder.yudao.framework.mq.redis.config.YudaoRedisMQConsumerAutoConfiguration -cn.iocoder.yudao.framework.mq.rabbitmq.config.YudaoRabbitMQAutoConfiguration \ No newline at end of file +cn.huangge.yudao.framework.mq.redis.config.YudaoRedisMQProducerAutoConfiguration +cn.huangge.yudao.framework.mq.redis.config.YudaoRedisMQConsumerAutoConfiguration +cn.huangge.yudao.framework.mq.rabbitmq.config.YudaoRabbitMQAutoConfiguration \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml b/yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml index 1f04e4a63..9b5812b2e 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-framework ${revision} @@ -17,13 +17,13 @@ - cn.iocoder.boot + cn.huangge.boot yudao-common - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-web provided diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories index eb172e4ce..130da1208 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories +++ b/yudao-framework/yudao-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.huangge.yudao.framework.mybatis.config.IdTypeEnvironmentPostProcessor 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 index 4a4eb95b7..3b0668a5a 100644 --- 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 @@ -1,3 +1,3 @@ -cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration -cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration -cn.iocoder.yudao.framework.translate.config.YudaoTranslateAutoConfiguration \ No newline at end of file +cn.huangge.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration +cn.huangge.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration +cn.huangge.yudao.framework.translate.config.YudaoTranslateAutoConfiguration \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-protection/pom.xml b/yudao-framework/yudao-spring-boot-starter-protection/pom.xml index 7e7279eb8..77a7a9c99 100644 --- a/yudao-framework/yudao-spring-boot-starter-protection/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-protection/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-framework ${revision} @@ -18,14 +18,14 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-web provided - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-redis @@ -38,7 +38,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-test test 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 index abca5135a..4967ab87c 100644 --- 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 @@ -1,4 +1,4 @@ -cn.iocoder.yudao.framework.idempotent.config.YudaoIdempotentConfiguration -cn.iocoder.yudao.framework.lock4j.config.YudaoLock4jConfiguration -cn.iocoder.yudao.framework.ratelimiter.config.YudaoRateLimiterConfiguration -cn.iocoder.yudao.framework.signature.config.YudaoApiSignatureAutoConfiguration \ No newline at end of file +cn.huangge.yudao.framework.idempotent.config.YudaoIdempotentConfiguration +cn.huangge.yudao.framework.lock4j.config.YudaoLock4jConfiguration +cn.huangge.yudao.framework.ratelimiter.config.YudaoRateLimiterConfiguration +cn.huangge.yudao.framework.signature.config.YudaoApiSignatureAutoConfiguration \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-redis/pom.xml b/yudao-framework/yudao-spring-boot-starter-redis/pom.xml index 8f4e580a0..3bdc6f4cb 100644 --- a/yudao-framework/yudao-spring-boot-starter-redis/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-redis/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-framework ${revision} @@ -17,7 +17,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-common 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 index 02d4a6835..18fd7ae98 100644 --- 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 @@ -1,2 +1,2 @@ -cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration -cn.iocoder.yudao.framework.redis.config.YudaoCacheAutoConfiguration \ No newline at end of file +cn.huangge.yudao.framework.redis.config.YudaoRedisAutoConfiguration +cn.huangge.yudao.framework.redis.config.YudaoCacheAutoConfiguration \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-security/pom.xml b/yudao-framework/yudao-spring-boot-starter-security/pom.xml index e76e57ef9..de967c20c 100644 --- a/yudao-framework/yudao-spring-boot-starter-security/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-security/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-framework ${revision} @@ -20,7 +20,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-common @@ -32,7 +32,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-web @@ -62,7 +62,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-module-system-api ${revision} diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/huangge/yudao/framework/operatelog/core/package-info.java b/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/huangge/yudao/framework/operatelog/core/package-info.java new file mode 100644 index 000000000..f8b202bff --- /dev/null +++ b/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/huangge/yudao/framework/operatelog/core/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位，无特殊作用 + */ +package cn.huangge.yudao.framework.operatelog.core; \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/operatelog/core/package-info.java b/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/operatelog/core/package-info.java deleted file mode 100644 index 97ce4eaa7..000000000 --- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/operatelog/core/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位，无特殊作用 - */ -package cn.iocoder.yudao.framework.operatelog.core; \ No newline at end of file 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 index f5a1f81c5..ebaf0243b 100644 --- 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 @@ -1,3 +1,3 @@ -cn.iocoder.yudao.framework.security.config.YudaoSecurityAutoConfiguration -cn.iocoder.yudao.framework.security.config.YudaoWebSecurityConfigurerAdapter -cn.iocoder.yudao.framework.operatelog.config.YudaoOperateLogConfiguration \ No newline at end of file +cn.huangge.yudao.framework.security.config.YudaoSecurityAutoConfiguration +cn.huangge.yudao.framework.security.config.YudaoWebSecurityConfigurerAdapter +cn.huangge.yudao.framework.operatelog.config.YudaoOperateLogConfiguration \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-test/pom.xml b/yudao-framework/yudao-spring-boot-starter-test/pom.xml index 04576fee6..4c56dac74 100644 --- a/yudao-framework/yudao-spring-boot-starter-test/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-test/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-framework ${revision} @@ -17,18 +17,18 @@ - cn.iocoder.boot + cn.huangge.boot yudao-common - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-mybatis - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-redis diff --git a/yudao-framework/yudao-spring-boot-starter-web/pom.xml b/yudao-framework/yudao-spring-boot-starter-web/pom.xml index 5861f198f..b38f74bec 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-web/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-framework ${revision} @@ -17,7 +17,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-common @@ -55,12 +55,12 @@ - cn.iocoder.boot + cn.huangge.boot yudao-module-infra-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-module-system-api ${revision} diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/huangge/yudao/framework/jackson/core/package-info.java b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/huangge/yudao/framework/jackson/core/package-info.java new file mode 100644 index 000000000..649951de3 --- /dev/null +++ b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/huangge/yudao/framework/jackson/core/package-info.java @@ -0,0 +1 @@ +package cn.huangge.yudao.framework.jackson.core; 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/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 index 9cdcd09c4..b7066c3d6 100644 --- 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 @@ -1,6 +1,6 @@ -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.xss.config.YudaoXssAutoConfiguration -cn.iocoder.yudao.framework.banner.config.YudaoBannerAutoConfiguration \ No newline at end of file +cn.huangge.yudao.framework.apilog.config.YudaoApiLogAutoConfiguration +cn.huangge.yudao.framework.jackson.config.YudaoJacksonAutoConfiguration +cn.huangge.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration +cn.huangge.yudao.framework.web.config.YudaoWebAutoConfiguration +cn.huangge.yudao.framework.xss.config.YudaoXssAutoConfiguration +cn.huangge.yudao.framework.banner.config.YudaoBannerAutoConfiguration \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-websocket/pom.xml b/yudao-framework/yudao-spring-boot-starter-websocket/pom.xml index b534f10d3..b6e3e4089 100644 --- a/yudao-framework/yudao-spring-boot-starter-websocket/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-websocket/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-framework ${revision} @@ -18,7 +18,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-common @@ -28,7 +28,7 @@ 因为 websocket 和 LoginUser 当前登录的用户有一定的相关性，具体可见 WebSocketSessionManagerImpl 逻辑。 如果让 security 拓展 websocket 的话，会导致 websocket 组件的封装很散，进而增大理解成本。 --> - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-security provided @@ -40,7 +40,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-mq @@ -64,7 +64,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-biz-tenant provided diff --git a/yudao-framework/yudao-spring-boot-starter-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 6260e407e..7402404d5 100644 --- a/yudao-framework/yudao-spring-boot-starter-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/yudao-framework/yudao-spring-boot-starter-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.iocoder.yudao.framework.websocket.config.YudaoWebSocketAutoConfiguration \ No newline at end of file +cn.huangge.yudao.framework.websocket.config.YudaoWebSocketAutoConfiguration \ No newline at end of file diff --git a/yudao-module-ai/pom.xml b/yudao-module-ai/pom.xml index 69a5e987f..09bd2dacb 100644 --- a/yudao-module-ai/pom.xml +++ b/yudao-module-ai/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao ${revision} diff --git a/yudao-module-ai/yudao-module-ai-api/pom.xml b/yudao-module-ai/yudao-module-ai-api/pom.xml index 41fe56efc..453451a21 100644 --- a/yudao-module-ai/yudao-module-ai-api/pom.xml +++ b/yudao-module-ai/yudao-module-ai-api/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-module-ai ${revision} @@ -18,7 +18,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-common diff --git a/yudao-module-ai/yudao-module-ai-biz/pom.xml b/yudao-module-ai/yudao-module-ai-biz/pom.xml index ec6f8c762..1b28d1a08 100644 --- a/yudao-module-ai/yudao-module-ai-biz/pom.xml +++ b/yudao-module-ai/yudao-module-ai-biz/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-module-ai ${revision} @@ -20,44 +20,44 @@ - cn.iocoder.boot + cn.huangge.boot yudao-module-ai-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-ai ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-biz-tenant - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-security - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-mybatis - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-job - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-test diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/huangge/yudao/module/ai/framework/web/package-info.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/huangge/yudao/module/ai/framework/web/package-info.java new file mode 100644 index 000000000..1e2e678bf --- /dev/null +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/huangge/yudao/module/ai/framework/web/package-info.java @@ -0,0 +1,4 @@ +/** + * crm 模块的 web 拓展封装 + */ +package cn.huangge.yudao.module.crm.framework.web; diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/framework/web/package-info.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/framework/web/package-info.java deleted file mode 100644 index 09de7263c..000000000 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/framework/web/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * crm 模块的 web 拓展封装 - */ -package cn.iocoder.yudao.module.crm.framework.web; diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/pom.xml b/yudao-module-ai/yudao-spring-boot-starter-ai/pom.xml index 9ac6a0be9..3849a9a65 100644 --- a/yudao-module-ai/yudao-spring-boot-starter-ai/pom.xml +++ b/yudao-module-ai/yudao-spring-boot-starter-ai/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-module-ai ${revision} @@ -65,12 +65,12 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-redis - cn.iocoder.boot + cn.huangge.boot yudao-common diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index b52df354b..fa8c724d3 100644 --- a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.iocoder.yudao.framework.ai.config.YudaoAiAutoConfiguration \ No newline at end of file +cn.huangge.yudao.framework.ai.config.YudaoAiAutoConfiguration \ No newline at end of file diff --git a/yudao-module-bpm/pom.xml b/yudao-module-bpm/pom.xml index 95b798904..ee506eabe 100644 --- a/yudao-module-bpm/pom.xml +++ b/yudao-module-bpm/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> yudao - cn.iocoder.boot + cn.huangge.boot ${revision} 4.0.0 diff --git a/yudao-module-bpm/yudao-module-bpm-api/pom.xml b/yudao-module-bpm/yudao-module-bpm-api/pom.xml index 06554d7ff..8fbdd171f 100644 --- a/yudao-module-bpm/yudao-module-bpm-api/pom.xml +++ b/yudao-module-bpm/yudao-module-bpm-api/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-module-bpm ${revision} @@ -18,7 +18,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-common diff --git a/yudao-module-bpm/yudao-module-bpm-biz/pom.xml b/yudao-module-bpm/yudao-module-bpm-biz/pom.xml index 207b166ba..1d4f6045f 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/pom.xml +++ b/yudao-module-bpm/yudao-module-bpm-biz/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-module-bpm ${revision} @@ -17,52 +17,52 @@ - cn.iocoder.boot + cn.huangge.boot yudao-module-bpm-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-module-system-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-biz-data-permission - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-biz-tenant - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-web - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-security - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-mybatis - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-test - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-excel diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/huangge/yudao/module/bpm/controller/admin/base/package-info.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/huangge/yudao/module/bpm/controller/admin/base/package-info.java new file mode 100644 index 000000000..581e0c2be --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/huangge/yudao/module/bpm/controller/admin/base/package-info.java @@ -0,0 +1,4 @@ +/** + * 基础包，放一些通用的 VO 类 + */ +package cn.huangge.yudao.module.bpm.controller.admin.base; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/huangge/yudao/module/bpm/controller/app/package-info.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/huangge/yudao/module/bpm/controller/app/package-info.java new file mode 100644 index 000000000..71869cf4e --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/huangge/yudao/module/bpm/controller/app/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package cn.huangge.yudao.module.bpm.controller.app; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/huangge/yudao/module/bpm/framework/web/package-info.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/huangge/yudao/module/bpm/framework/web/package-info.java new file mode 100644 index 000000000..ae089cbfa --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/huangge/yudao/module/bpm/framework/web/package-info.java @@ -0,0 +1,4 @@ +/** + * bpm 模块的 web 配置 + */ +package cn.huangge.yudao.module.bpm.framework.web; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/base/package-info.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/base/package-info.java deleted file mode 100644 index 41ce65081..000000000 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/base/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 基础包，放一些通用的 VO 类 - */ -package cn.iocoder.yudao.module.bpm.controller.admin.base; 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/framework/web/package-info.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/web/package-info.java deleted file mode 100644 index c01417081..000000000 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/web/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * bpm 模块的 web 配置 - */ -package cn.iocoder.yudao.module.bpm.framework.web; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/test/resources/application-unit-test.yaml b/yudao-module-bpm/yudao-module-bpm-biz/src/test/resources/application-unit-test.yaml index dd9b95bfb..f23c2ee01 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/test/resources/application-unit-test.yaml +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/test/resources/application-unit-test.yaml @@ -39,4 +39,4 @@ mybatis-plus: # 芋道配置项，设置当前项目所有自定义的配置 yudao: info: - base-package: cn.iocoder.yudao.module + base-package: cn.huangge.yudao.module diff --git a/yudao-module-crm/pom.xml b/yudao-module-crm/pom.xml index 310a7df87..fbf8b11c6 100644 --- a/yudao-module-crm/pom.xml +++ b/yudao-module-crm/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao ${revision} diff --git a/yudao-module-crm/yudao-module-crm-api/pom.xml b/yudao-module-crm/yudao-module-crm-api/pom.xml index 94e129626..23d36fbb8 100644 --- a/yudao-module-crm/yudao-module-crm-api/pom.xml +++ b/yudao-module-crm/yudao-module-crm-api/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-module-crm ${revision} @@ -18,7 +18,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-common diff --git a/yudao-module-crm/yudao-module-crm-biz/pom.xml b/yudao-module-crm/yudao-module-crm-biz/pom.xml index 0af42a825..ad9fb28e3 100644 --- a/yudao-module-crm/yudao-module-crm-biz/pom.xml +++ b/yudao-module-crm/yudao-module-crm-biz/pom.xml @@ -3,7 +3,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - cn.iocoder.boot + cn.huangge.boot yudao-module-crm ${revision} @@ -18,57 +18,57 @@ - cn.iocoder.boot + cn.huangge.boot yudao-module-system-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-module-crm-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-module-bpm-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-biz-ip - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-biz-tenant - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-web - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-security - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-mybatis - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-excel - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-test diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/controller/app/package-info.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/controller/app/package-info.java new file mode 100644 index 000000000..43fa32dc2 --- /dev/null +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/controller/app/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package cn.huangge.yudao.module.crm.controller.app; diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/dal/dataobject/clue/package-info.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/dal/dataobject/clue/package-info.java new file mode 100644 index 000000000..b3d44e84f --- /dev/null +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/dal/dataobject/clue/package-info.java @@ -0,0 +1,4 @@ +/** + * 线索 + */ +package cn.huangge.yudao.module.crm.dal.dataobject.clue; diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/dal/dataobject/contact/package-info.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/dal/dataobject/contact/package-info.java new file mode 100644 index 000000000..5fe10121a --- /dev/null +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/dal/dataobject/contact/package-info.java @@ -0,0 +1,4 @@ +/** + * 联系人 + */ +package cn.huangge.yudao.module.crm.dal.dataobject.contact; diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/dal/dataobject/product/package-info.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/dal/dataobject/product/package-info.java new file mode 100644 index 000000000..e7670cb1d --- /dev/null +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/dal/dataobject/product/package-info.java @@ -0,0 +1,4 @@ +/** + * 产品表 + */ +package cn.huangge.yudao.module.crm.dal.dataobject.product; diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/dal/mysql/clue/package-info.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/dal/mysql/clue/package-info.java new file mode 100644 index 000000000..5ed85bd78 --- /dev/null +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/dal/mysql/clue/package-info.java @@ -0,0 +1,4 @@ +/** + * 线索 + */ +package cn.huangge.yudao.module.crm.dal.mysql.clue; diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/dal/mysql/permission/package-info.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/dal/mysql/permission/package-info.java new file mode 100644 index 000000000..9468c7ee3 --- /dev/null +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/dal/mysql/permission/package-info.java @@ -0,0 +1 @@ +package cn.huangge.yudao.module.crm.dal.mysql.permission; \ No newline at end of file diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/framework/excel/package-info.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/framework/excel/package-info.java new file mode 100644 index 000000000..7665b6510 --- /dev/null +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/framework/excel/package-info.java @@ -0,0 +1,4 @@ +/** + * crm 模块的 excel 拓展封装 + */ +package cn.huangge.yudao.module.crm.framework.excel; \ No newline at end of file diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/framework/operatelog/package-info.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/framework/operatelog/package-info.java new file mode 100644 index 000000000..b51a2c7e7 --- /dev/null +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/framework/operatelog/package-info.java @@ -0,0 +1,4 @@ +/** + * crm 模块的 operatelog 拓展封装 + */ +package cn.huangge.yudao.module.crm.framework.operatelog; \ No newline at end of file diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/framework/permission/core/package-info.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/framework/permission/core/package-info.java new file mode 100644 index 000000000..0d8b8ddd2 --- /dev/null +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/framework/permission/core/package-info.java @@ -0,0 +1 @@ +package cn.huangge.yudao.module.crm.framework.permission.core; \ No newline at end of file diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/framework/permission/package-info.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/framework/permission/package-info.java new file mode 100644 index 000000000..ca7d8f3c9 --- /dev/null +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/framework/permission/package-info.java @@ -0,0 +1,4 @@ +/** + * crm 模块的 permission 拓展封装 + */ +package cn.huangge.yudao.module.crm.framework.permission; \ No newline at end of file diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/framework/web/package-info.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/framework/web/package-info.java new file mode 100644 index 000000000..1e2e678bf --- /dev/null +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/framework/web/package-info.java @@ -0,0 +1,4 @@ +/** + * crm 模块的 web 拓展封装 + */ +package cn.huangge.yudao.module.crm.framework.web; diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/job/package-info.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/job/package-info.java new file mode 100644 index 000000000..05f80157d --- /dev/null +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/huangge/yudao/module/crm/job/package-info.java @@ -0,0 +1,4 @@ +/** + * 定时任务 + */ +package cn.huangge.yudao.module.crm.job; \ No newline at end of file diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/app/package-info.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/app/package-info.java deleted file mode 100644 index 78d85635c..000000000 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/app/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位 - */ -package cn.iocoder.yudao.module.crm.controller.app; diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/clue/package-info.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/clue/package-info.java deleted file mode 100644 index 929b9b6fe..000000000 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/clue/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 线索 - */ -package cn.iocoder.yudao.module.crm.dal.dataobject.clue; diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/contact/package-info.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/contact/package-info.java deleted file mode 100644 index dfe0898e3..000000000 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/contact/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 联系人 - */ -package cn.iocoder.yudao.module.crm.dal.dataobject.contact; diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/product/package-info.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/product/package-info.java deleted file mode 100644 index 4c7282d73..000000000 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/product/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 产品表 - */ -package cn.iocoder.yudao.module.crm.dal.dataobject.product; diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/clue/package-info.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/clue/package-info.java deleted file mode 100644 index f9978e868..000000000 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/clue/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 线索 - */ -package cn.iocoder.yudao.module.crm.dal.mysql.clue; diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/permission/package-info.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/permission/package-info.java deleted file mode 100644 index ff0e16b90..000000000 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/permission/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.yudao.module.crm.dal.mysql.permission; \ No newline at end of file diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/excel/package-info.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/excel/package-info.java deleted file mode 100644 index c2deef8b8..000000000 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/excel/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * crm 模块的 excel 拓展封装 - */ -package cn.iocoder.yudao.module.crm.framework.excel; \ No newline at end of file diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/operatelog/package-info.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/operatelog/package-info.java deleted file mode 100644 index 413b652c1..000000000 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/operatelog/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * crm 模块的 operatelog 拓展封装 - */ -package cn.iocoder.yudao.module.crm.framework.operatelog; \ No newline at end of file diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/core/package-info.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/core/package-info.java deleted file mode 100644 index d895fe969..000000000 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/core/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.yudao.module.crm.framework.permission.core; \ No newline at end of file diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/package-info.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/package-info.java deleted file mode 100644 index 97f76dbe1..000000000 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * crm 模块的 permission 拓展封装 - */ -package cn.iocoder.yudao.module.crm.framework.permission; \ No newline at end of file diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/web/package-info.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/web/package-info.java deleted file mode 100644 index 09de7263c..000000000 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/web/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * crm 模块的 web 拓展封装 - */ -package cn.iocoder.yudao.module.crm.framework.web; diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/job/package-info.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/job/package-info.java deleted file mode 100644 index 2214e6b95..000000000 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/job/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 定时任务 - */ -package cn.iocoder.yudao.module.crm.job; \ No newline at end of file diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/statistics/CrmStatisticsCustomerMapper.xml b/yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/statistics/CrmStatisticsCustomerMapper.xml index dc10f1221..c599a0a87 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/statistics/CrmStatisticsCustomerMapper.xml +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/statistics/CrmStatisticsCustomerMapper.xml @@ -1,9 +1,9 @@ - + + resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerDealCycleByDateRespVO"> SELECT DATE_FORMAT(contract.order_date, '%Y-%m-%d') AS time, IFNULL(TRUNCATE(AVG(TIMESTAMPDIFF(DAY, customer.create_time, contract.order_date)), 1), 0) AS customer_deal_cycle FROM crm_customer AS customer LEFT JOIN crm_contract AS contract ON contract.customer_id = customer.id WHERE customer.deleted = 0 AND contract.deleted = 0 - AND contract.audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status} + AND contract.audit_status = ${@cn.huangge.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status} AND customer.owner_user_id IN #{userId} @@ -207,13 +207,13 @@ SELECT @@ -34,7 +34,7 @@ + resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.performance.CrmStatisticsPerformanceRespVO"> SELECT DATE_FORMAT(order_date, '%Y%m') AS time, COUNT(1) AS currentMonthCount FROM crm_contract WHERE deleted = 0 - AND audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status} + AND audit_status = ${@cn.huangge.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status} AND owner_user_id in #{userId} @@ -20,13 +20,13 @@ + resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.portrait.CrmStatisticCustomerAreaRespVO"> SELECT area_id, COUNT(*) AS customerCount, SUM(deal_status) AS dealCount FROM crm_customer WHERE deleted = 0 AND area_id IS NOT NULL @@ -17,7 +17,7 @@ + resultType="cn.huangge.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO"> SELECT IFNULL(SUM(total_price), 0) AS count, owner_user_id FROM crm_contract WHERE deleted = 0 - AND audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status} + AND audit_status = ${@cn.huangge.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status} and owner_user_id in #{userId} @@ -17,11 +17,11 @@ SELECT @@ -10,7 +10,7 @@ AND in_time < #{endTime} - AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getRequiredTenantId()} + AND tenant_id = ${@cn.huangge.yudao.framework.tenant.core.context.TenantContextHolder@getRequiredTenantId()} AND deleted = 0) - (SELECT IFNULL(SUM(total_price), 0) FROM erp_purchase_return @@ -18,7 +18,7 @@ AND return_time < #{endTime} - AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getRequiredTenantId()} + AND tenant_id = ${@cn.huangge.yudao.framework.tenant.core.context.TenantContextHolder@getRequiredTenantId()} AND deleted = 0) diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/statistics/ErpSaleStatisticsMapper.xml b/yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/statistics/ErpSaleStatisticsMapper.xml index 324cbd432..f77df0fd7 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/statistics/ErpSaleStatisticsMapper.xml +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/statistics/ErpSaleStatisticsMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/yudao-module-infra/pom.xml b/yudao-module-infra/pom.xml index c517e88a4..de091d404 100644 --- a/yudao-module-infra/pom.xml +++ b/yudao-module-infra/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao ${revision} diff --git a/yudao-module-infra/yudao-module-infra-api/pom.xml b/yudao-module-infra/yudao-module-infra-api/pom.xml index 168ea645b..921020a04 100644 --- a/yudao-module-infra/yudao-module-infra-api/pom.xml +++ b/yudao-module-infra/yudao-module-infra-api/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-module-infra ${revision} @@ -18,7 +18,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-common diff --git a/yudao-module-infra/yudao-module-infra-biz/pom.xml b/yudao-module-infra/yudao-module-infra-biz/pom.xml index f2840cfc7..66d90f654 100644 --- a/yudao-module-infra/yudao-module-infra-biz/pom.xml +++ b/yudao-module-infra/yudao-module-infra-biz/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-module-infra ${revision} @@ -20,36 +20,36 @@ - cn.iocoder.boot + cn.huangge.boot yudao-module-system-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-module-infra-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-biz-tenant - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-security - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-websocket - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-mybatis @@ -58,7 +58,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-redis @@ -66,19 +66,19 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-job - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-mq - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-test test @@ -86,7 +86,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-excel @@ -97,7 +97,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-monitor diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/api/package-info.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/api/package-info.java new file mode 100644 index 000000000..fdfa9a6ad --- /dev/null +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/api/package-info.java @@ -0,0 +1 @@ +package cn.huangge.yudao.module.infra.api; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/controller/admin/demo/demo03/package-info.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/controller/admin/demo/demo03/package-info.java new file mode 100644 index 000000000..eab140c22 --- /dev/null +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/controller/admin/demo/demo03/package-info.java @@ -0,0 +1 @@ +package cn.huangge.yudao.module.infra.controller.admin.demo.demo03; \ No newline at end of file diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/controller/app/package-info.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/controller/app/package-info.java new file mode 100644 index 000000000..035095b85 --- /dev/null +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/controller/app/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package cn.huangge.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/huangge/yudao/module/infra/controller/package-info.java similarity index 83% rename from yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/package-info.java rename to yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/controller/package-info.java index 04fde2f43..74b0c947d 100644 --- 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/huangge/yudao/module/infra/controller/package-info.java @@ -3,4 +3,4 @@ * 1. admin 包：提供给管理后台 yudao-ui-admin 前端项目 * 2. app 包：提供给用户 APP yudao-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分 */ -package cn.iocoder.yudao.module.infra.controller; +package cn.huangge.yudao.module.infra.controller; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/enums/package-info.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/enums/package-info.java new file mode 100644 index 000000000..74d98856f --- /dev/null +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/enums/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package cn.huangge.yudao.module.infra.enums; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/framework/codegen/package-info.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/framework/codegen/package-info.java new file mode 100644 index 000000000..437f7c9f6 --- /dev/null +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/framework/codegen/package-info.java @@ -0,0 +1,4 @@ +/** + * 代码生成器 + */ +package cn.huangge.yudao.module.infra.framework.codegen; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/framework/security/core/package-info.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/framework/security/core/package-info.java new file mode 100644 index 000000000..f1755b6e8 --- /dev/null +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/framework/security/core/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package cn.huangge.yudao.module.infra.framework.security.core; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/framework/web/package-info.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/framework/web/package-info.java new file mode 100644 index 000000000..6f903d593 --- /dev/null +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/framework/web/package-info.java @@ -0,0 +1,4 @@ +/** + * infra 模块的 web 配置 + */ +package cn.huangge.yudao.module.infra.framework.web; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/mq/consumer/package-info.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/mq/consumer/package-info.java new file mode 100644 index 000000000..0270da653 --- /dev/null +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/mq/consumer/package-info.java @@ -0,0 +1,4 @@ +/** + * 消息队列的消费者 + */ +package cn.huangge.yudao.module.infra.mq.consumer; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/mq/message/package-info.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/mq/message/package-info.java new file mode 100644 index 000000000..346808ca8 --- /dev/null +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/mq/message/package-info.java @@ -0,0 +1,4 @@ +/** + * 消息队列的消息 + */ +package cn.huangge.yudao.module.infra.mq.message; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/mq/producer/package-info.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/mq/producer/package-info.java new file mode 100644 index 000000000..8d5a9231d --- /dev/null +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/huangge/yudao/module/infra/mq/producer/package-info.java @@ -0,0 +1,4 @@ +/** + * 消息队列的生产者 + */ +package cn.huangge.yudao.module.infra.mq.producer; 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/admin/demo/demo03/package-info.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/package-info.java deleted file mode 100644 index 79682e203..000000000 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.yudao.module.infra.controller.admin.demo.demo03; \ 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/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/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/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/java/cn/iocoder/yudao/module/infra/framework/web/package-info.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/web/package-info.java deleted file mode 100644 index 6fb49bfde..000000000 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/web/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * infra 模块的 web 配置 - */ -package cn.iocoder.yudao.module.infra.framework.web; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/mq/consumer/package-info.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/mq/consumer/package-info.java deleted file mode 100644 index 5ba526413..000000000 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/mq/consumer/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 消息队列的消费者 - */ -package cn.iocoder.yudao.module.infra.mq.consumer; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/mq/message/package-info.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/mq/message/package-info.java deleted file mode 100644 index 19edb0241..000000000 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/mq/message/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 消息队列的消息 - */ -package cn.iocoder.yudao.module.infra.mq.message; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/mq/producer/package-info.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/mq/producer/package-info.java deleted file mode 100644 index 343179cb8..000000000 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/mq/producer/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 消息队列的生产者 - */ -package cn.iocoder.yudao.module.infra.mq.producer; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/application-unit-test.yaml b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/application-unit-test.yaml index 5ce2d4b5f..9e07343cc 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/application-unit-test.yaml +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/application-unit-test.yaml @@ -47,4 +47,4 @@ mybatis-plus: # 芋道配置项，设置当前项目所有自定义的配置 yudao: info: - base-package: cn.iocoder.yudao + base-package: cn.huangge.yudao diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/assert.json b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/assert.json index 8edb8e612..94a4364bd 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/assert.json +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/assert.json @@ -1,48 +1,48 @@ [ { "contentPath" : "java/InfraStudentPageReqVO", - "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/vo/InfraStudentPageReqVO.java" + "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn.huangge.yudao/module/infra/controller/admin/demo/vo/InfraStudentPageReqVO.java" }, { "contentPath" : "java/InfraStudentRespVO", - "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/vo/InfraStudentRespVO.java" + "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn.huangge.yudao/module/infra/controller/admin/demo/vo/InfraStudentRespVO.java" }, { "contentPath" : "java/InfraStudentSaveReqVO", - "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/vo/InfraStudentSaveReqVO.java" + "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn.huangge.yudao/module/infra/controller/admin/demo/vo/InfraStudentSaveReqVO.java" }, { "contentPath" : "java/InfraStudentController", - "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/InfraStudentController.java" + "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn.huangge.yudao/module/infra/controller/admin/demo/InfraStudentController.java" }, { "contentPath" : "java/InfraStudentDO", - "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/demo/InfraStudentDO.java" + "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn.huangge.yudao/module/infra/dal/dataobject/demo/InfraStudentDO.java" }, { "contentPath" : "java/InfraStudentContactDO", - "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/demo/InfraStudentContactDO.java" + "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn.huangge.yudao/module/infra/dal/dataobject/demo/InfraStudentContactDO.java" }, { "contentPath" : "java/InfraStudentTeacherDO", - "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/demo/InfraStudentTeacherDO.java" + "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn.huangge.yudao/module/infra/dal/dataobject/demo/InfraStudentTeacherDO.java" }, { "contentPath" : "java/InfraStudentMapper", - "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/demo/InfraStudentMapper.java" + "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn.huangge.yudao/module/infra/dal/mysql/demo/InfraStudentMapper.java" }, { "contentPath" : "java/InfraStudentContactMapper", - "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/demo/InfraStudentContactMapper.java" + "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn.huangge.yudao/module/infra/dal/mysql/demo/InfraStudentContactMapper.java" }, { "contentPath" : "java/InfraStudentTeacherMapper", - "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/demo/InfraStudentTeacherMapper.java" + "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn.huangge.yudao/module/infra/dal/mysql/demo/InfraStudentTeacherMapper.java" }, { "contentPath" : "xml/InfraStudentMapper", "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/resources/mapper/demo/InfraStudentMapper.xml" }, { "contentPath" : "java/InfraStudentServiceImpl", - "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/demo/InfraStudentServiceImpl.java" + "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn.huangge.yudao/module/infra/service/demo/InfraStudentServiceImpl.java" }, { "contentPath" : "java/InfraStudentService", - "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/demo/InfraStudentService.java" + "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/main/java/cn.huangge.yudao/module/infra/service/demo/InfraStudentService.java" }, { "contentPath" : "java/InfraStudentServiceImplTest", - "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/demo/InfraStudentServiceImplTest.java" + "filePath" : "yudao-module-infra/yudao-module-infra-biz/src/test/java/cn.huangge.yudao/module/infra/service/demo/InfraStudentServiceImplTest.java" }, { "contentPath" : "java/ErrorCodeConstants_手动操作", - "filePath" : "yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/enums/ErrorCodeConstants_手动操作.java" + "filePath" : "yudao-module-infra/yudao-module-infra-api/src/main/java/cn.huangge.yudao/module/infra/enums/ErrorCodeConstants_手动操作.java" }, { "contentPath" : "sql/sql", "filePath" : "sql/sql.sql" diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentContactDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentContactDO index 17c668eaa..0231b50f2 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentContactDO +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentContactDO @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.infra.dal.dataobject.demo; +package cn.huangge.yudao.module.infra.dal.dataobject.demo; import lombok.*; import java.util.*; import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.huangge.yudao.framework.mybatis.core.dataobject.BaseDO; /** * 学生联系人 DO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentContactMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentContactMapper index ca662d19c..1831415c8 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentContactMapper +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentContactMapper @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.infra.dal.mysql.demo; +package cn.huangge.yudao.module.infra.dal.mysql.demo; import java.util.*; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; +import cn.huangge.yudao.framework.common.pojo.PageResult; +import cn.huangge.yudao.framework.common.pojo.PageParam; +import cn.huangge.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.huangge.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.huangge.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; import org.apache.ibatis.annotations.Mapper; /** diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentController index d6f20183d..e8dbc8091 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentController @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.demo; +package cn.huangge.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -14,22 +14,22 @@ import javax.servlet.http.*; import java.util.*; import java.io.IOException; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import cn.huangge.yudao.framework.common.pojo.PageParam; +import cn.huangge.yudao.framework.common.pojo.PageResult; +import cn.huangge.yudao.framework.common.pojo.CommonResult; +import cn.huangge.yudao.framework.common.util.object.BeanUtils; +import static cn.huangge.yudao.framework.common.pojo.CommonResult.success; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; +import cn.huangge.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*; +import cn.huangge.yudao.framework.operatelog.core.annotations.OperateLog; +import static cn.huangge.yudao.framework.operatelog.core.enums.OperateTypeEnum.*; -import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; -import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; -import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; -import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentTeacherDO; -import cn.iocoder.yudao.module.infra.service.demo.InfraStudentService; +import cn.huangge.yudao.module.infra.controller.admin.demo.vo.*; +import cn.huangge.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; +import cn.huangge.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; +import cn.huangge.yudao.module.infra.dal.dataobject.demo.InfraStudentTeacherDO; +import cn.huangge.yudao.module.infra.service.demo.InfraStudentService; @Tag(name = "管理后台 - 学生") @RestController diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentDO index b0d4bd216..ad8eec8ee 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentDO +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentDO @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.infra.dal.dataobject.demo; +package cn.huangge.yudao.module.infra.dal.dataobject.demo; import lombok.*; import java.util.*; import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.huangge.yudao.framework.mybatis.core.dataobject.BaseDO; /** * 学生 DO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentMapper index 34e70a082..e9159cd86 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentMapper +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentMapper @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.module.infra.dal.mysql.demo; +package cn.huangge.yudao.module.infra.dal.mysql.demo; import java.util.*; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; +import cn.huangge.yudao.framework.common.pojo.PageResult; +import cn.huangge.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.huangge.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.huangge.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; +import cn.huangge.yudao.module.infra.controller.admin.demo.vo.*; /** * 学生 Mapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentPageReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentPageReqVO index 41a373012..61b8ac592 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentPageReqVO +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentPageReqVO @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; +package cn.huangge.yudao.module.infra.controller.admin.demo.vo; import lombok.*; import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.huangge.yudao.framework.common.pojo.PageParam; 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.huangge.yudao.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/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentRespVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentRespVO index c41a5501f..885f0ec29 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentRespVO +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentRespVO @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; +package cn.huangge.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -7,8 +7,8 @@ import java.util.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import com.alibaba.excel.annotation.*; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; +import cn.huangge.yudao.framework.excel.core.annotations.DictFormat; +import cn.huangge.yudao.framework.excel.core.convert.DictConvert; @Schema(description = "管理后台 - 学生 Response VO") @Data diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentSaveReqVO index eaadf7432..66062dcb5 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentSaveReqVO @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; +package cn.huangge.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -7,8 +7,8 @@ import javax.validation.constraints.*; import java.util.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; -import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentTeacherDO; +import cn.huangge.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; +import cn.huangge.yudao.module.infra.dal.dataobject.demo.InfraStudentTeacherDO; @Schema(description = "管理后台 - 学生新增/修改 Request VO") @Data diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentService index 7df090d7f..0d22dd41d 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentService @@ -1,13 +1,13 @@ -package cn.iocoder.yudao.module.infra.service.demo; +package cn.huangge.yudao.module.infra.service.demo; import java.util.*; import javax.validation.*; -import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; -import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; -import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; -import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentTeacherDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.huangge.yudao.module.infra.controller.admin.demo.vo.*; +import cn.huangge.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; +import cn.huangge.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; +import cn.huangge.yudao.module.infra.dal.dataobject.demo.InfraStudentTeacherDO; +import cn.huangge.yudao.framework.common.pojo.PageResult; +import cn.huangge.yudao.framework.common.pojo.PageParam; /** * 学生 Service 接口 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentServiceImpl index 793b2dd22..95bd7c664 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentServiceImpl @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.service.demo; +package cn.huangge.yudao.module.infra.service.demo; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -6,20 +6,20 @@ import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; import java.util.*; -import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; -import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; -import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; -import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentTeacherDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.huangge.yudao.module.infra.controller.admin.demo.vo.*; +import cn.huangge.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; +import cn.huangge.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; +import cn.huangge.yudao.module.infra.dal.dataobject.demo.InfraStudentTeacherDO; +import cn.huangge.yudao.framework.common.pojo.PageResult; +import cn.huangge.yudao.framework.common.pojo.PageParam; +import cn.huangge.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; -import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentContactMapper; -import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentTeacherMapper; +import cn.huangge.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; +import cn.huangge.yudao.module.infra.dal.mysql.demo.InfraStudentContactMapper; +import cn.huangge.yudao.module.infra.dal.mysql.demo.InfraStudentTeacherMapper; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.*; +import static cn.huangge.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.huangge.yudao.module.infra.enums.ErrorCodeConstants.*; /** * 学生 Service 实现类 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentServiceImplTest index b5f4bf0ff..d2ac1cdcd 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentServiceImplTest @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.infra.service.demo; +package cn.huangge.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -6,12 +6,12 @@ import org.springframework.boot.test.mock.mockito.MockBean; import javax.annotation.Resource; -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; +import cn.huangge.yudao.framework.test.core.ut.BaseDbUnitTest; -import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; -import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; -import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; -import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.huangge.yudao.module.infra.controller.admin.demo.vo.*; +import cn.huangge.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; +import cn.huangge.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; +import cn.huangge.yudao.framework.common.pojo.PageResult; import javax.annotation.Resource; import org.springframework.context.annotation.Import; @@ -19,12 +19,12 @@ import java.util.*; import java.time.LocalDateTime; import static cn.hutool.core.util.RandomUtil.*; -import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.*; -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.framework.common.util.date.LocalDateTimeUtils.*; -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*; +import static cn.huangge.yudao.module.infra.enums.ErrorCodeConstants.*; +import static cn.huangge.yudao.framework.test.core.util.AssertUtils.*; +import static cn.huangge.yudao.framework.test.core.util.RandomUtils.*; +import static cn.huangge.yudao.framework.common.util.date.LocalDateTimeUtils.*; +import static cn.huangge.yudao.framework.common.util.object.ObjectUtils.*; +import static cn.huangge.yudao.framework.common.util.date.DateUtils.*; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentTeacherDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentTeacherDO index c19cf9fab..12c5ff334 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentTeacherDO +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentTeacherDO @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.infra.dal.dataobject.demo; +package cn.huangge.yudao.module.infra.dal.dataobject.demo; import lombok.*; import java.util.*; import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.huangge.yudao.framework.mybatis.core.dataobject.BaseDO; /** * 学生班主任 DO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentTeacherMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentTeacherMapper index 994212dab..288211f90 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentTeacherMapper +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentTeacherMapper @@ -1,12 +1,12 @@ -package cn.iocoder.yudao.module.infra.dal.mysql.demo; +package cn.huangge.yudao.module.infra.dal.mysql.demo; import java.util.*; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentTeacherDO; +import cn.huangge.yudao.framework.common.pojo.PageResult; +import cn.huangge.yudao.framework.common.pojo.PageParam; +import cn.huangge.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.huangge.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.huangge.yudao.module.infra.dal.dataobject.demo.InfraStudentTeacherDO; import org.apache.ibatis.annotations.Mapper; /** diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/xml/InfraStudentMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/xml/InfraStudentMapper index 155aa5c27..ed6328728 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/xml/InfraStudentMapper +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/xml/InfraStudentMapper @@ -1,6 +1,6 @@ - + - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-web - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-security - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-mybatis - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-test - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-excel diff --git a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/package-info.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/huangge/yudao/module/iot/controller/package-info.java similarity index 84% rename from yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/package-info.java rename to yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/huangge/yudao/module/iot/controller/package-info.java index 652122752..31787b119 100644 --- a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/package-info.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/huangge/yudao/module/iot/controller/package-info.java @@ -3,4 +3,4 @@ * 1. admin 包：提供给管理后台 yudao-ui-admin 前端项目 * 2. app 包：提供给用户 APP yudao-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分 */ -package cn.iocoder.yudao.module.pay.controller; +package cn.huangge.yudao.module.iot.controller; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/huangge/yudao/module/iot/convert/package-info.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/huangge/yudao/module/iot/convert/package-info.java new file mode 100644 index 000000000..7b5b24a55 --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/huangge/yudao/module/iot/convert/package-info.java @@ -0,0 +1 @@ +package cn.huangge.yudao.module.iot.convert; \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/huangge/yudao/module/iot/framework/web/package-info.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/huangge/yudao/module/iot/framework/web/package-info.java new file mode 100644 index 000000000..b3664e961 --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/huangge/yudao/module/iot/framework/web/package-info.java @@ -0,0 +1,4 @@ +/** + * iot 模块的 web 拓展封装 + */ +package cn.huangge.yudao.module.iot.framework.web; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/convert/package-info.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/convert/package-info.java deleted file mode 100644 index c196c25c3..000000000 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/convert/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.yudao.module.iot.convert; \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/web/package-info.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/web/package-info.java deleted file mode 100644 index aafcca274..000000000 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/web/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * iot 模块的 web 拓展封装 - */ -package cn.iocoder.yudao.module.iot.framework.web; diff --git a/yudao-module-mall/pom.xml b/yudao-module-mall/pom.xml index f4854aef0..968cc0b82 100644 --- a/yudao-module-mall/pom.xml +++ b/yudao-module-mall/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> yudao - cn.iocoder.boot + cn.huangge.boot ${revision} 4.0.0 diff --git a/yudao-module-mall/yudao-module-product-api/pom.xml b/yudao-module-mall/yudao-module-product-api/pom.xml index 123e7c334..81a9648ca 100644 --- a/yudao-module-mall/yudao-module-product-api/pom.xml +++ b/yudao-module-mall/yudao-module-product-api/pom.xml @@ -4,7 +4,7 @@ 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.boot + cn.huangge.boot yudao-module-mall ${revision} @@ -19,7 +19,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-common diff --git a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/huangge/yudao/module/product/api/package-info.java b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/huangge/yudao/module/product/api/package-info.java new file mode 100644 index 000000000..e6b4092b6 --- /dev/null +++ b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/huangge/yudao/module/product/api/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package cn.huangge.yudao.module.product.api; \ No newline at end of file diff --git a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/package-info.java b/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/package-info.java deleted file mode 100644 index b19092853..000000000 --- a/yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位 - */ -package cn.iocoder.yudao.module.product.api; \ No newline at end of file diff --git a/yudao-module-mall/yudao-module-product-biz/pom.xml b/yudao-module-mall/yudao-module-product-biz/pom.xml index c8bad4605..3e3455f85 100644 --- a/yudao-module-mall/yudao-module-product-biz/pom.xml +++ b/yudao-module-mall/yudao-module-product-biz/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-module-mall ${revision} @@ -19,12 +19,12 @@ - cn.iocoder.boot + cn.huangge.boot yudao-module-product-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-module-member-api ${revision} @@ -33,29 +33,29 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-web - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-security - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-mybatis - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-test - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-excel diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/huangge/yudao/module/product/api/package-info.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/huangge/yudao/module/product/api/package-info.java new file mode 100644 index 000000000..65b873062 --- /dev/null +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/huangge/yudao/module/product/api/package-info.java @@ -0,0 +1 @@ +package cn.huangge.yudao.module.product.api; diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/huangge/yudao/module/product/framework/web/package-info.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/huangge/yudao/module/product/framework/web/package-info.java new file mode 100644 index 000000000..b19158641 --- /dev/null +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/huangge/yudao/module/product/framework/web/package-info.java @@ -0,0 +1,4 @@ +/** + * product 模块的 web 配置 + */ +package cn.huangge.yudao.module.product.framework.web; diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/package-info.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/package-info.java deleted file mode 100644 index 162453c3c..000000000 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.yudao.module.product.api; diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/framework/web/package-info.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/framework/web/package-info.java deleted file mode 100644 index f4adb2d76..000000000 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/framework/web/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * product 模块的 web 配置 - */ -package cn.iocoder.yudao.module.product.framework.web; diff --git a/yudao-module-mall/yudao-module-product-biz/src/test/resources/application-unit-test.yaml b/yudao-module-mall/yudao-module-product-biz/src/test/resources/application-unit-test.yaml index 36aec5c43..06e7da062 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/test/resources/application-unit-test.yaml +++ b/yudao-module-mall/yudao-module-product-biz/src/test/resources/application-unit-test.yaml @@ -46,4 +46,4 @@ mybatis-plus: # 芋道配置项，设置当前项目所有自定义的配置 yudao: info: - base-package: cn.iocoder.yudao + base-package: cn.huangge.yudao diff --git a/yudao-module-mall/yudao-module-promotion-api/pom.xml b/yudao-module-mall/yudao-module-promotion-api/pom.xml index 1c21560ba..d79edc954 100644 --- a/yudao-module-mall/yudao-module-promotion-api/pom.xml +++ b/yudao-module-mall/yudao-module-promotion-api/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-module-mall ${revision} @@ -18,7 +18,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-common diff --git a/yudao-module-mall/yudao-module-promotion-biz/pom.xml b/yudao-module-mall/yudao-module-promotion-biz/pom.xml index a3bf64965..07e199bc2 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/pom.xml +++ b/yudao-module-mall/yudao-module-promotion-biz/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-module-mall ${revision} @@ -20,57 +20,57 @@ - cn.iocoder.boot + cn.huangge.boot yudao-module-promotion-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-module-product-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-module-trade-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-module-member-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-biz-tenant - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-web - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-security - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-mybatis - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-test - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-excel diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/huangge/yudao/module/promotion/controller/app/kefu/vo/package-info.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/huangge/yudao/module/promotion/controller/app/kefu/vo/package-info.java new file mode 100644 index 000000000..6b671ca18 --- /dev/null +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/huangge/yudao/module/promotion/controller/app/kefu/vo/package-info.java @@ -0,0 +1 @@ +package cn.huangge.yudao.module.promotion.controller.app.kefu.vo; \ No newline at end of file diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/huangge/yudao/module/promotion/framework/web/package-info.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/huangge/yudao/module/promotion/framework/web/package-info.java new file mode 100644 index 000000000..7417f411d --- /dev/null +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/huangge/yudao/module/promotion/framework/web/package-info.java @@ -0,0 +1,4 @@ +/** + * promotion 模块的 web 配置 + */ +package cn.huangge.yudao.module.promotion.framework.web; diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/huangge/yudao/module/promotion/job/package-info.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/huangge/yudao/module/promotion/job/package-info.java new file mode 100644 index 000000000..5be9d1584 --- /dev/null +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/huangge/yudao/module/promotion/job/package-info.java @@ -0,0 +1,4 @@ +/** + * TODO 占位，无具体含义 + */ +package cn.huangge.yudao.module.promotion.job; diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/huangge/yudao/module/promotion/mq/consumer/package-info.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/huangge/yudao/module/promotion/mq/consumer/package-info.java new file mode 100644 index 000000000..879992b95 --- /dev/null +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/huangge/yudao/module/promotion/mq/consumer/package-info.java @@ -0,0 +1,4 @@ +/** + * 消息队列的消费者 + */ +package cn.huangge.yudao.module.promotion.mq.consumer; diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/huangge/yudao/module/promotion/mq/message/package-info.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/huangge/yudao/module/promotion/mq/message/package-info.java new file mode 100644 index 000000000..ce6a40e93 --- /dev/null +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/huangge/yudao/module/promotion/mq/message/package-info.java @@ -0,0 +1,4 @@ +/** + * 消息队列的消息 + */ +package cn.huangge.yudao.module.promotion.mq.message; diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/huangge/yudao/module/promotion/mq/producer/package-info.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/huangge/yudao/module/promotion/mq/producer/package-info.java new file mode 100644 index 000000000..9fdccc86b --- /dev/null +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/huangge/yudao/module/promotion/mq/producer/package-info.java @@ -0,0 +1,4 @@ +/** + * 消息队列的生产者 + */ +package cn.huangge.yudao.module.promotion.mq.producer; diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/vo/package-info.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/vo/package-info.java deleted file mode 100644 index 9116686b0..000000000 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/vo/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.yudao.module.promotion.controller.app.kefu.vo; \ No newline at end of file diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/framework/web/package-info.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/framework/web/package-info.java deleted file mode 100644 index 8359130d4..000000000 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/framework/web/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * promotion 模块的 web 配置 - */ -package cn.iocoder.yudao.module.promotion.framework.web; diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/job/package-info.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/job/package-info.java deleted file mode 100644 index 320b98aa2..000000000 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/job/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * TODO 占位，无具体含义 - */ -package cn.iocoder.yudao.module.promotion.job; diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/mq/consumer/package-info.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/mq/consumer/package-info.java deleted file mode 100644 index 95c23df74..000000000 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/mq/consumer/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 消息队列的消费者 - */ -package cn.iocoder.yudao.module.promotion.mq.consumer; diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/mq/message/package-info.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/mq/message/package-info.java deleted file mode 100644 index 912504e76..000000000 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/mq/message/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 消息队列的消息 - */ -package cn.iocoder.yudao.module.promotion.mq.message; diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/mq/producer/package-info.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/mq/producer/package-info.java deleted file mode 100644 index e7b8d1b4c..000000000 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/mq/producer/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 消息队列的生产者 - */ -package cn.iocoder.yudao.module.promotion.mq.producer; diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/test/resources/application-unit-test.yaml b/yudao-module-mall/yudao-module-promotion-biz/src/test/resources/application-unit-test.yaml index f05f05074..bce773e7f 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/test/resources/application-unit-test.yaml +++ b/yudao-module-mall/yudao-module-promotion-biz/src/test/resources/application-unit-test.yaml @@ -45,4 +45,4 @@ mybatis: # 芋道配置项，设置当前项目所有自定义的配置 yudao: info: - base-package: cn.iocoder.yudao.module + base-package: cn.huangge.yudao.module diff --git a/yudao-module-mall/yudao-module-statistics-api/pom.xml b/yudao-module-mall/yudao-module-statistics-api/pom.xml index 7c838fecc..dca8b6eca 100644 --- a/yudao-module-mall/yudao-module-statistics-api/pom.xml +++ b/yudao-module-mall/yudao-module-statistics-api/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-module-mall ${revision} @@ -18,7 +18,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-common diff --git a/yudao-module-mall/yudao-module-statistics-api/src/main/java/cn/huangge/yudao/module/statistics/api/package-info.java b/yudao-module-mall/yudao-module-statistics-api/src/main/java/cn/huangge/yudao/module/statistics/api/package-info.java new file mode 100644 index 000000000..a1ec34dab --- /dev/null +++ b/yudao-module-mall/yudao-module-statistics-api/src/main/java/cn/huangge/yudao/module/statistics/api/package-info.java @@ -0,0 +1,4 @@ +/** + * TODO 占位，无特殊含义 + */ +package cn.huangge.yudao.module.statistics.api; diff --git a/yudao-module-mall/yudao-module-statistics-api/src/main/java/cn/huangge/yudao/module/statistics/enums/package-info.java b/yudao-module-mall/yudao-module-statistics-api/src/main/java/cn/huangge/yudao/module/statistics/enums/package-info.java new file mode 100644 index 000000000..49babe0c4 --- /dev/null +++ b/yudao-module-mall/yudao-module-statistics-api/src/main/java/cn/huangge/yudao/module/statistics/enums/package-info.java @@ -0,0 +1,4 @@ +/** + * TODO 占位，无特殊含义 + */ +package cn.huangge.yudao.module.statistics.enums; diff --git a/yudao-module-mall/yudao-module-statistics-api/src/main/java/cn/iocoder/yudao/module/statistics/api/package-info.java b/yudao-module-mall/yudao-module-statistics-api/src/main/java/cn/iocoder/yudao/module/statistics/api/package-info.java deleted file mode 100644 index 2963c120a..000000000 --- a/yudao-module-mall/yudao-module-statistics-api/src/main/java/cn/iocoder/yudao/module/statistics/api/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * TODO 占位，无特殊含义 - */ -package cn.iocoder.yudao.module.statistics.api; diff --git a/yudao-module-mall/yudao-module-statistics-api/src/main/java/cn/iocoder/yudao/module/statistics/enums/package-info.java b/yudao-module-mall/yudao-module-statistics-api/src/main/java/cn/iocoder/yudao/module/statistics/enums/package-info.java deleted file mode 100644 index f885ae076..000000000 --- a/yudao-module-mall/yudao-module-statistics-api/src/main/java/cn/iocoder/yudao/module/statistics/enums/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * TODO 占位，无特殊含义 - */ -package cn.iocoder.yudao.module.statistics.enums; diff --git a/yudao-module-mall/yudao-module-statistics-biz/pom.xml b/yudao-module-mall/yudao-module-statistics-biz/pom.xml index fc1545560..048c2f7e8 100644 --- a/yudao-module-mall/yudao-module-statistics-biz/pom.xml +++ b/yudao-module-mall/yudao-module-statistics-biz/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-module-mall ${revision} @@ -19,71 +19,71 @@ - cn.iocoder.boot + cn.huangge.boot yudao-module-statistics-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-module-promotion-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-module-product-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-module-trade-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-module-member-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-module-pay-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-biz-tenant - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-biz-ip - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-web - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-security - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-mybatis - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-test - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-excel diff --git a/yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/huangge/yudao/module/statistics/controller/app/package-info.java b/yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/huangge/yudao/module/statistics/controller/app/package-info.java new file mode 100644 index 000000000..0ec0b290f --- /dev/null +++ b/yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/huangge/yudao/module/statistics/controller/app/package-info.java @@ -0,0 +1,4 @@ +/** + * TODO 芋艿：占位 + */ +package cn.huangge.yudao.module.statistics.controller.app; diff --git a/yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/huangge/yudao/module/statistics/dal/dataobject/package-info.java b/yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/huangge/yudao/module/statistics/dal/dataobject/package-info.java new file mode 100644 index 000000000..fcfe086fe --- /dev/null +++ b/yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/huangge/yudao/module/statistics/dal/dataobject/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 todo + */ +package cn.huangge.yudao.module.statistics.dal.dataobject; diff --git a/yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/app/package-info.java b/yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/app/package-info.java deleted file mode 100644 index 1384194b4..000000000 --- a/yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/app/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * TODO 芋艿：占位 - */ -package cn.iocoder.yudao.module.statistics.controller.app; diff --git a/yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/dal/dataobject/package-info.java b/yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/dal/dataobject/package-info.java deleted file mode 100644 index 80eca3b41..000000000 --- a/yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/dal/dataobject/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位 todo - */ -package cn.iocoder.yudao.module.statistics.dal.dataobject; diff --git a/yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/infra/ApiAccessLogStatisticsMapper.xml b/yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/infra/ApiAccessLogStatisticsMapper.xml index e64161597..3b4e79c46 100644 --- a/yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/infra/ApiAccessLogStatisticsMapper.xml +++ b/yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/infra/ApiAccessLogStatisticsMapper.xml @@ -1,6 +1,6 @@ - + + resultType="cn.huangge.yudao.module.statistics.service.member.bo.MemberAreaStatisticsRespBO"> SELECT area_id, COUNT(1) AS userCount FROM member_user WHERE deleted = FALSE @@ -11,7 +11,7 @@ + resultType="cn.huangge.yudao.module.statistics.service.trade.bo.WalletSummaryRespBO"> SELECT COUNT(1) AS rechargePayCount, SUM(pay_price) AS rechargePayPrice FROM pay_wallet_recharge @@ -13,7 +13,7 @@ + resultType="cn.huangge.yudao.module.statistics.dal.dataobject.product.ProductStatisticsDO"> SELECT spu.id AS spuId -- 浏览量：一个用户可以有多次 , (SELECT COUNT(1) diff --git a/yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/trade/AfterSaleStatisticsMapper.xml b/yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/trade/AfterSaleStatisticsMapper.xml index 933c45610..f0da82f4e 100644 --- a/yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/trade/AfterSaleStatisticsMapper.xml +++ b/yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/trade/AfterSaleStatisticsMapper.xml @@ -1,9 +1,9 @@ - + SELECT SUM(price) diff --git a/yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/trade/TradeOrderStatisticsMapper.xml b/yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/trade/TradeOrderStatisticsMapper.xml index 07d2f0d58..dad414cca 100644 --- a/yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/trade/TradeOrderStatisticsMapper.xml +++ b/yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/trade/TradeOrderStatisticsMapper.xml @@ -1,9 +1,9 @@ - + + resultType="cn.huangge.yudao.module.statistics.service.trade.bo.TradeSummaryRespBO"> SELECT IFNULL(SUM(order_create_count), 0) AS count, IFNULL(SUM(order_pay_price), 0) AS summary FROM trade_statistics @@ -12,7 +12,7 @@ + resultType="cn.huangge.yudao.module.trade.controller.app.brokerage.vo.user.AppBrokerageUserChildSummaryRespVO"> SELECT bu.id, bu.bind_user_time AS brokerageTime, (SELECT SUM(price) FROM trade_brokerage_record r diff --git a/yudao-module-mall/yudao-module-trade-biz/src/test/resources/application-unit-test.yaml b/yudao-module-mall/yudao-module-trade-biz/src/test/resources/application-unit-test.yaml index 4168a2bda..2e4ce8f3e 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/test/resources/application-unit-test.yaml +++ b/yudao-module-mall/yudao-module-trade-biz/src/test/resources/application-unit-test.yaml @@ -45,7 +45,7 @@ mybatis: # 芋道配置项，设置当前项目所有自定义的配置 yudao: info: - base-package: cn.iocoder.yudao.module + base-package: cn.huangge.yudao.module trade: order: app-id: 1 diff --git a/yudao-module-member/pom.xml b/yudao-module-member/pom.xml index ea65199ad..bb9068160 100644 --- a/yudao-module-member/pom.xml +++ b/yudao-module-member/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao ${revision} diff --git a/yudao-module-member/yudao-module-member-api/pom.xml b/yudao-module-member/yudao-module-member-api/pom.xml index 1f60cd0fc..267b4c9c9 100644 --- a/yudao-module-member/yudao-module-member-api/pom.xml +++ b/yudao-module-member/yudao-module-member-api/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-module-member ${revision} @@ -18,7 +18,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-common diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/huangge/yudao/module/member/message/package-info.java b/yudao-module-member/yudao-module-member-api/src/main/java/cn/huangge/yudao/module/member/message/package-info.java new file mode 100644 index 000000000..396fffd65 --- /dev/null +++ b/yudao-module-member/yudao-module-member-api/src/main/java/cn/huangge/yudao/module/member/message/package-info.java @@ -0,0 +1,4 @@ +/** + * 消息队列的消息 + */ +package cn.huangge.yudao.module.member.message; diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/message/package-info.java b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/message/package-info.java deleted file mode 100644 index 6ae3b6448..000000000 --- a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/message/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 消息队列的消息 - */ -package cn.iocoder.yudao.module.member.message; diff --git a/yudao-module-member/yudao-module-member-biz/pom.xml b/yudao-module-member/yudao-module-member-biz/pom.xml index 3c9b81e65..ed64a6fd8 100644 --- a/yudao-module-member/yudao-module-member-biz/pom.xml +++ b/yudao-module-member/yudao-module-member-biz/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-module-member ${revision} @@ -19,30 +19,30 @@ - cn.iocoder.boot + cn.huangge.boot yudao-module-member-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-module-system-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-module-infra-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-biz-tenant - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-security @@ -53,36 +53,36 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-mybatis - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-redis - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-mq - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-test test - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-excel - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-biz-ip diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/api/package-info.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/api/package-info.java new file mode 100644 index 000000000..bc9c980e1 --- /dev/null +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/api/package-info.java @@ -0,0 +1 @@ +package cn.huangge.yudao.module.member.api; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/controller/admin/address/package-info.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/controller/admin/address/package-info.java new file mode 100644 index 000000000..10ddcd8cc --- /dev/null +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/controller/admin/address/package-info.java @@ -0,0 +1 @@ +package cn.huangge.yudao.module.member.controller.admin.address; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/package-info.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/controller/package-info.java similarity index 83% rename from yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/package-info.java rename to yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/controller/package-info.java index 9e2888c69..02938d15c 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/package-info.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/controller/package-info.java @@ -3,4 +3,4 @@ * 1. admin 包：提供给管理后台 yudao-ui-admin 前端项目 * 2. app 包：提供给用户 APP yudao-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分 */ -package cn.iocoder.yudao.module.member.controller; +package cn.huangge.yudao.module.member.controller; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/framework/web/package-info.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/framework/web/package-info.java new file mode 100644 index 000000000..24f196dad --- /dev/null +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/framework/web/package-info.java @@ -0,0 +1,4 @@ +/** + * member 模块的 web 配置 + */ +package cn.huangge.yudao.module.member.framework.web; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/mq/consumer/package-info.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/mq/consumer/package-info.java new file mode 100644 index 000000000..3d6d69587 --- /dev/null +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/mq/consumer/package-info.java @@ -0,0 +1,4 @@ +/** + * 消息队列的消费者 + */ +package cn.huangge.yudao.module.member.mq.consumer; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/mq/message/package-info.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/mq/message/package-info.java new file mode 100644 index 000000000..36b1e9f04 --- /dev/null +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/mq/message/package-info.java @@ -0,0 +1,4 @@ +/** + * 消息队列的消息 + */ +package cn.huangge.yudao.module.member.mq.message; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/mq/producer/package-info.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/mq/producer/package-info.java new file mode 100644 index 000000000..1962d0f75 --- /dev/null +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/huangge/yudao/module/member/mq/producer/package-info.java @@ -0,0 +1,4 @@ +/** + * 消息队列的生产者 + */ +package cn.huangge.yudao.module.member.mq.producer; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/package-info.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/package-info.java deleted file mode 100644 index 5f97979b8..000000000 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.yudao.module.member.api; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/package-info.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/package-info.java deleted file mode 100644 index 652bbb6f1..000000000 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.yudao.module.member.controller.admin.address; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/framework/web/package-info.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/framework/web/package-info.java deleted file mode 100644 index 3a964cfc2..000000000 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/framework/web/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * member 模块的 web 配置 - */ -package cn.iocoder.yudao.module.member.framework.web; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/mq/consumer/package-info.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/mq/consumer/package-info.java deleted file mode 100644 index 521f60b8c..000000000 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/mq/consumer/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 消息队列的消费者 - */ -package cn.iocoder.yudao.module.member.mq.consumer; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/mq/message/package-info.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/mq/message/package-info.java deleted file mode 100644 index 6489394a1..000000000 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/mq/message/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 消息队列的消息 - */ -package cn.iocoder.yudao.module.member.mq.message; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/mq/producer/package-info.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/mq/producer/package-info.java deleted file mode 100644 index dff4c99a9..000000000 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/mq/producer/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 消息队列的生产者 - */ -package cn.iocoder.yudao.module.member.mq.producer; diff --git a/yudao-module-member/yudao-module-member-biz/src/test/resources/application-unit-test.yaml b/yudao-module-member/yudao-module-member-biz/src/test/resources/application-unit-test.yaml index f05f05074..bce773e7f 100644 --- a/yudao-module-member/yudao-module-member-biz/src/test/resources/application-unit-test.yaml +++ b/yudao-module-member/yudao-module-member-biz/src/test/resources/application-unit-test.yaml @@ -45,4 +45,4 @@ mybatis: # 芋道配置项，设置当前项目所有自定义的配置 yudao: info: - base-package: cn.iocoder.yudao.module + base-package: cn.huangge.yudao.module diff --git a/yudao-module-mp/pom.xml b/yudao-module-mp/pom.xml index b339c4063..dee766a2a 100644 --- a/yudao-module-mp/pom.xml +++ b/yudao-module-mp/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> yudao - cn.iocoder.boot + cn.huangge.boot ${revision} 4.0.0 diff --git a/yudao-module-mp/yudao-module-mp-api/pom.xml b/yudao-module-mp/yudao-module-mp-api/pom.xml index 64b6f5072..cee2e7e1a 100644 --- a/yudao-module-mp/yudao-module-mp-api/pom.xml +++ b/yudao-module-mp/yudao-module-mp-api/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> yudao-module-mp - cn.iocoder.boot + cn.huangge.boot ${revision} 4.0.0 @@ -18,7 +18,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-common diff --git a/yudao-module-mp/yudao-module-mp-biz/pom.xml b/yudao-module-mp/yudao-module-mp-biz/pom.xml index 5e3fefbad..c010a6254 100644 --- a/yudao-module-mp/yudao-module-mp-biz/pom.xml +++ b/yudao-module-mp/yudao-module-mp-biz/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> yudao-module-mp - cn.iocoder.boot + cn.huangge.boot ${revision} 4.0.0 @@ -19,30 +19,30 @@ - cn.iocoder.boot + cn.huangge.boot yudao-module-mp-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-module-system-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-module-infra-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-biz-tenant - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-security @@ -53,31 +53,31 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-mybatis - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-redis - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-mq - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-test test - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-excel diff --git a/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/huangge/yudao/module/mp/framework/web/package-info.java b/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/huangge/yudao/module/mp/framework/web/package-info.java new file mode 100644 index 000000000..2b7dd6ff4 --- /dev/null +++ b/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/huangge/yudao/module/mp/framework/web/package-info.java @@ -0,0 +1,4 @@ +/** + * mp 模块的 web 配置 + */ +package cn.huangge.yudao.module.mp.framework.web; diff --git a/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/framework/web/package-info.java b/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/framework/web/package-info.java deleted file mode 100644 index a103f1c38..000000000 --- a/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/framework/web/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * mp 模块的 web 配置 - */ -package cn.iocoder.yudao.module.mp.framework.web; diff --git a/yudao-module-pay/pom.xml b/yudao-module-pay/pom.xml index 85bcb1e2c..132dcdbc5 100644 --- a/yudao-module-pay/pom.xml +++ b/yudao-module-pay/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao ${revision} diff --git a/yudao-module-pay/yudao-module-pay-api/pom.xml b/yudao-module-pay/yudao-module-pay-api/pom.xml index 0903abed5..22a5509fd 100644 --- a/yudao-module-pay/yudao-module-pay-api/pom.xml +++ b/yudao-module-pay/yudao-module-pay-api/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> yudao-module-pay - cn.iocoder.boot + cn.huangge.boot ${revision} 4.0.0 @@ -18,7 +18,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-common diff --git a/yudao-module-pay/yudao-module-pay-api/src/main/java/cn/huangge/yudao/module/pay/api/notify/package-info.java b/yudao-module-pay/yudao-module-pay-api/src/main/java/cn/huangge/yudao/module/pay/api/notify/package-info.java new file mode 100644 index 000000000..e19498e60 --- /dev/null +++ b/yudao-module-pay/yudao-module-pay-api/src/main/java/cn/huangge/yudao/module/pay/api/notify/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位符，无特殊作用 + */ +package cn.huangge.yudao.module.pay.api.notify; diff --git a/yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/notify/package-info.java b/yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/notify/package-info.java deleted file mode 100644 index 60c4ca883..000000000 --- a/yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/notify/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位符，无特殊作用 - */ -package cn.iocoder.yudao.module.pay.api.notify; diff --git a/yudao-module-pay/yudao-module-pay-biz/pom.xml b/yudao-module-pay/yudao-module-pay-biz/pom.xml index 22dc86f0b..22a51c7cf 100644 --- a/yudao-module-pay/yudao-module-pay-biz/pom.xml +++ b/yudao-module-pay/yudao-module-pay-biz/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-module-pay ${revision} @@ -19,55 +19,55 @@ - cn.iocoder.boot + cn.huangge.boot yudao-module-pay-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-biz-pay ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-biz-tenant - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-security - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-mybatis - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-redis - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-job - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-test test - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-excel diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/package-info.java b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/huangge/yudao/module/pay/controller/package-info.java similarity index 84% rename from yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/package-info.java rename to yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/huangge/yudao/module/pay/controller/package-info.java index 5d2990e1b..35b384680 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/package-info.java +++ b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/huangge/yudao/module/pay/controller/package-info.java @@ -3,4 +3,4 @@ * 1. admin 包：提供给管理后台 yudao-ui-admin 前端项目 * 2. app 包：提供给用户 APP yudao-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分 */ -package cn.iocoder.yudao.module.iot.controller; +package cn.huangge.yudao.module.pay.controller; diff --git a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/huangge/yudao/module/pay/framework/job/core/package-info.java b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/huangge/yudao/module/pay/framework/job/core/package-info.java new file mode 100644 index 000000000..332ded115 --- /dev/null +++ b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/huangge/yudao/module/pay/framework/job/core/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package cn.huangge.yudao.module.pay.framework.job.core; diff --git a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/huangge/yudao/module/pay/framework/web/package-info.java b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/huangge/yudao/module/pay/framework/web/package-info.java new file mode 100644 index 000000000..38c6a9f26 --- /dev/null +++ b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/huangge/yudao/module/pay/framework/web/package-info.java @@ -0,0 +1,4 @@ +/** + * pay 模块的 web 配置 + */ +package cn.huangge.yudao.module.pay.framework.web; diff --git a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/framework/job/core/package-info.java b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/framework/job/core/package-info.java deleted file mode 100644 index 5a5a689f8..000000000 --- a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/framework/job/core/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位 - */ -package cn.iocoder.yudao.module.pay.framework.job.core; diff --git a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/framework/web/package-info.java b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/framework/web/package-info.java deleted file mode 100644 index 03bfad978..000000000 --- a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/framework/web/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * pay 模块的 web 配置 - */ -package cn.iocoder.yudao.module.pay.framework.web; diff --git a/yudao-module-pay/yudao-module-pay-biz/src/test/resources/application-unit-test.yaml b/yudao-module-pay/yudao-module-pay-biz/src/test/resources/application-unit-test.yaml index f05f05074..bce773e7f 100644 --- a/yudao-module-pay/yudao-module-pay-biz/src/test/resources/application-unit-test.yaml +++ b/yudao-module-pay/yudao-module-pay-biz/src/test/resources/application-unit-test.yaml @@ -45,4 +45,4 @@ mybatis: # 芋道配置项，设置当前项目所有自定义的配置 yudao: info: - base-package: cn.iocoder.yudao.module + base-package: cn.huangge.yudao.module diff --git a/yudao-module-pay/yudao-spring-boot-starter-biz-pay/pom.xml b/yudao-module-pay/yudao-spring-boot-starter-biz-pay/pom.xml index 93193d008..73c274d05 100644 --- a/yudao-module-pay/yudao-spring-boot-starter-biz-pay/pom.xml +++ b/yudao-module-pay/yudao-spring-boot-starter-biz-pay/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-module-pay ${revision} @@ -18,7 +18,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-common @@ -67,7 +67,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-test test diff --git a/yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index f2a8bf146..c318ca78b 100644 --- a/yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.iocoder.yudao.framework.pay.config.YudaoPayAutoConfiguration \ No newline at end of file +cn.huangge.yudao.framework.pay.config.YudaoPayAutoConfiguration \ No newline at end of file diff --git a/yudao-module-report/pom.xml b/yudao-module-report/pom.xml index fadb0740b..7307b17dd 100644 --- a/yudao-module-report/pom.xml +++ b/yudao-module-report/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao ${revision} diff --git a/yudao-module-report/yudao-module-report-api/pom.xml b/yudao-module-report/yudao-module-report-api/pom.xml index 3effa4323..505ff9ada 100644 --- a/yudao-module-report/yudao-module-report-api/pom.xml +++ b/yudao-module-report/yudao-module-report-api/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-module-report ${revision} @@ -19,7 +19,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-common diff --git a/yudao-module-report/yudao-module-report-biz/pom.xml b/yudao-module-report/yudao-module-report-biz/pom.xml index d78a61000..d6160c07a 100644 --- a/yudao-module-report/yudao-module-report-biz/pom.xml +++ b/yudao-module-report/yudao-module-report-biz/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-module-report ${revision} @@ -19,43 +19,43 @@ - cn.iocoder.boot + cn.huangge.boot yudao-module-report-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-module-system-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-biz-tenant - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-web - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-security - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-mybatis - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-test @@ -66,7 +66,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-excel diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/controller/admin/ajreport/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/controller/admin/ajreport/package-info.java new file mode 100644 index 000000000..ef4db5b3e --- /dev/null +++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/controller/admin/ajreport/package-info.java @@ -0,0 +1 @@ +package cn.huangge.yudao.module.report.controller.admin.ajreport; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/controller/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/controller/package-info.java new file mode 100644 index 000000000..572cbad35 --- /dev/null +++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/controller/package-info.java @@ -0,0 +1,6 @@ +/** + * 提供 RESTful API 给前端： + * 1. admin 包：提供给管理后台 yudao-ui-admin 前端项目 + * 2. app 包：提供给用户 APP yudao-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分 + */ +package cn.huangge.yudao.module.report.controller; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/convert/ajreport/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/convert/ajreport/package-info.java new file mode 100644 index 000000000..11bee5efe --- /dev/null +++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/convert/ajreport/package-info.java @@ -0,0 +1,4 @@ +/** + * TODO 占位，后续删除 + */ +package cn.huangge.yudao.module.report.convert.ajreport; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/dal/dataobject/ajreport/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/dal/dataobject/ajreport/package-info.java new file mode 100644 index 000000000..d9ec3007b --- /dev/null +++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/dal/dataobject/ajreport/package-info.java @@ -0,0 +1,4 @@ +/** + * TODO 芋艿：占位，待删除 + */ +package cn.huangge.yudao.module.report.dal.dataobject.ajreport; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/dal/mysql/ajreport/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/dal/mysql/ajreport/package-info.java new file mode 100644 index 000000000..1455f45a3 --- /dev/null +++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/dal/mysql/ajreport/package-info.java @@ -0,0 +1,4 @@ +/** + * TODO 芋艿：占位，待删除 + */ +package cn.huangge.yudao.module.report.dal.mysql.ajreport; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/framework/jmreport/core/web/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/framework/jmreport/core/web/package-info.java new file mode 100644 index 000000000..7c5e335a6 --- /dev/null +++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/framework/jmreport/core/web/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位，后续会基于 Filter 实现积木报表的认证等功能，替代 {@link cn.huangge.yudao.module.report.framework.jmreport.core.service.JmReportTokenServiceImpl} + */ +package cn.huangge.yudao.module.report.framework.jmreport.core.web; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/framework/security/core/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/framework/security/core/package-info.java new file mode 100644 index 000000000..6e2d13323 --- /dev/null +++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/framework/security/core/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package cn.huangge.yudao.module.report.framework.security.core; diff --git a/yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/service/ajreport/package-info.java b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/service/ajreport/package-info.java new file mode 100644 index 000000000..cda77b50b --- /dev/null +++ b/yudao-module-report/yudao-module-report-biz/src/main/java/cn/huangge/yudao/module/report/service/ajreport/package-info.java @@ -0,0 +1,4 @@ +/** + * TODO 芋艿：占位，待删除 + */ +package cn.huangge.yudao.module.report.service.ajreport; 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-report/yudao-module-report-biz/src/test/resources/application-unit-test.yaml b/yudao-module-report/yudao-module-report-biz/src/test/resources/application-unit-test.yaml index f05f05074..bce773e7f 100644 --- a/yudao-module-report/yudao-module-report-biz/src/test/resources/application-unit-test.yaml +++ b/yudao-module-report/yudao-module-report-biz/src/test/resources/application-unit-test.yaml @@ -45,4 +45,4 @@ mybatis: # 芋道配置项，设置当前项目所有自定义的配置 yudao: info: - base-package: cn.iocoder.yudao.module + base-package: cn.huangge.yudao.module diff --git a/yudao-module-system/pom.xml b/yudao-module-system/pom.xml index c2cc5a973..731ab376e 100644 --- a/yudao-module-system/pom.xml +++ b/yudao-module-system/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao ${revision} diff --git a/yudao-module-system/yudao-module-system-api/pom.xml b/yudao-module-system/yudao-module-system-api/pom.xml index c98baf3dd..b0e087770 100644 --- a/yudao-module-system/yudao-module-system-api/pom.xml +++ b/yudao-module-system/yudao-module-system-api/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-module-system ${revision} @@ -18,7 +18,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-common diff --git a/yudao-module-system/yudao-module-system-biz/pom.xml b/yudao-module-system/yudao-module-system-biz/pom.xml index f12ca6271..0ae729206 100644 --- a/yudao-module-system/yudao-module-system-biz/pom.xml +++ b/yudao-module-system/yudao-module-system-biz/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao-module-system ${revision} @@ -19,33 +19,33 @@ - cn.iocoder.boot + cn.huangge.boot yudao-module-system-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-module-infra-api ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-biz-data-permission - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-biz-tenant - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-biz-ip - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-security @@ -56,37 +56,37 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-mybatis - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-redis - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-job - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-mq - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-test test - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-excel diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/huangge/yudao/module/system/controller/package-info.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/huangge/yudao/module/system/controller/package-info.java new file mode 100644 index 000000000..205255b73 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/huangge/yudao/module/system/controller/package-info.java @@ -0,0 +1,6 @@ +/** + * 提供 RESTful API 给前端： + * 1. admin 包：提供给管理后台 yudao-ui-admin 前端项目 + * 2. app 包：提供给用户 APP yudao-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分 + */ +package cn.huangge.yudao.module.system.controller; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/package-info.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/huangge/yudao/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 yudao-module-system/yudao-module-system-biz/src/main/java/cn/huangge/yudao/module/system/convert/package-info.java index b1ce8e379..05307cdd4 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/package-info.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/huangge/yudao/module/system/convert/package-info.java @@ -3,4 +3,4 @@ * * 目前使用 MapStruct 框架 */ -package cn.iocoder.yudao.module.system.convert; +package cn.huangge.yudao.module.system.convert; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/huangge/yudao/module/system/framework/datapermission/package-info.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/huangge/yudao/module/system/framework/datapermission/package-info.java new file mode 100644 index 000000000..ccc718dd1 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/huangge/yudao/module/system/framework/datapermission/package-info.java @@ -0,0 +1,4 @@ +/** + * system 模块的数据权限配置 + */ +package cn.huangge.yudao.module.system.framework.datapermission; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/huangge/yudao/module/system/framework/operatelog/package-info.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/huangge/yudao/module/system/framework/operatelog/package-info.java new file mode 100644 index 000000000..324d792cc --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/huangge/yudao/module/system/framework/operatelog/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位文件，避免文件夹缩进 + */ +package cn.huangge.yudao.module.system.framework.operatelog; \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/huangge/yudao/module/system/framework/web/package-info.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/huangge/yudao/module/system/framework/web/package-info.java new file mode 100644 index 000000000..8d87a1d55 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/huangge/yudao/module/system/framework/web/package-info.java @@ -0,0 +1,4 @@ +/** + * system 模块的 web 配置 + */ +package cn.huangge.yudao.module.system.framework.web; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/huangge/yudao/module/system/job/package-info.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/huangge/yudao/module/system/job/package-info.java new file mode 100644 index 000000000..ed916b926 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/huangge/yudao/module/system/job/package-info.java @@ -0,0 +1 @@ +package cn.huangge.yudao.module.system.job; 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/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/operatelog/package-info.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/operatelog/package-info.java deleted file mode 100644 index c7f124832..000000000 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/operatelog/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位文件，避免文件夹缩进 - */ -package cn.iocoder.yudao.module.system.framework.operatelog; \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/web/package-info.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/web/package-info.java deleted file mode 100644 index 1a17a3d7c..000000000 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/web/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * system 模块的 web 配置 - */ -package cn.iocoder.yudao.module.system.framework.web; 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/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService b/yudao-module-system/yudao-module-system-biz/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService index 946ee5964..79f5f4620 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService @@ -1 +1 @@ -cn.iocoder.yudao.module.system.framework.captcha.core.RedisCaptchaServiceImpl +cn.huangge.yudao.module.system.framework.captcha.core.RedisCaptchaServiceImpl diff --git a/yudao-module-system/yudao-module-system-biz/src/test/resources/application-unit-test.yaml b/yudao-module-system/yudao-module-system-biz/src/test/resources/application-unit-test.yaml index c1f65733a..79cbbdab2 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/resources/application-unit-test.yaml +++ b/yudao-module-system/yudao-module-system-biz/src/test/resources/application-unit-test.yaml @@ -45,4 +45,4 @@ mybatis: # 芋道配置项，设置当前项目所有自定义的配置 yudao: info: - base-package: cn.iocoder.yudao.module + base-package: cn.huangge.yudao.module diff --git a/yudao-server/pom.xml b/yudao-server/pom.xml index efd53c84a..e967aa809 100644 --- a/yudao-server/pom.xml +++ b/yudao-server/pom.xml @@ -3,7 +3,7 @@ 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.boot + cn.huangge.boot yudao ${revision} @@ -22,95 +22,95 @@ - cn.iocoder.boot + cn.huangge.boot yudao-module-system-biz ${revision} - cn.iocoder.boot + cn.huangge.boot yudao-module-infra-biz ${revision} - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -124,7 +124,7 @@ - cn.iocoder.boot + cn.huangge.boot yudao-spring-boot-starter-protection diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml index f2c4b0a97..eaa230f78 100644 --- a/yudao-server/src/main/resources/application-local.yaml +++ b/yudao-server/src/main/resources/application-local.yaml @@ -45,7 +45,7 @@ spring: primary: master datasource: master: - url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://192.168.188.1:3306/vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 @@ -54,7 +54,7 @@ spring: # url: jdbc:kingbase8://127.0.0.1:54321/test # 人大金仓 KingbaseES 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/postgres # OpenGauss 连接的示例 username: root - password: 123456 + password: huangge1199 # username: sa # SQL Server 连接的示例 # password: Yudao@2024 # SQL Server 连接的示例 # username: SYSDBA # DM 连接的示例 @@ -63,17 +63,17 @@ spring: # password: Yudao@2024 # OpenGauss 连接的示例 slave: # 模拟从库，可根据自己需要修改 lazy: true # 开启懒加载，保证启动速度 - url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://192.168.188.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true username: root - password: 123456 + password: huangge1199 # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 data: redis: - host: 127.0.0.1 # 地址 + host: 192.168.188.1 # 地址 port: 6379 # 端口 database: 0 # 数据库索引 -# password: dev # 密码，建议生产环境开启 + password: foobared # 密码，建议生产环境开启 --- #################### 定时任务相关配置 #################### @@ -158,24 +158,24 @@ logging: name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径 level: # 配置自己写的 MyBatis Mapper 打印日志 - cn.iocoder.yudao.module.bpm.dal.mysql: debug - cn.iocoder.yudao.module.infra.dal.mysql: debug - cn.iocoder.yudao.module.infra.dal.mysql.logger.ApiErrorLogMapper: INFO # 配置 ApiErrorLogMapper 的日志级别为 info，避免和 GlobalExceptionHandler 重复打印 - cn.iocoder.yudao.module.infra.dal.mysql.job.JobLogMapper: INFO # 配置 JobLogMapper 的日志级别为 info - cn.iocoder.yudao.module.infra.dal.mysql.file.FileConfigMapper: INFO # 配置 FileConfigMapper 的日志级别为 info - cn.iocoder.yudao.module.pay.dal.mysql: debug - cn.iocoder.yudao.module.pay.dal.mysql.notify.PayNotifyTaskMapper: INFO # 配置 PayNotifyTaskMapper 的日志级别为 info - cn.iocoder.yudao.module.system.dal.mysql: debug - cn.iocoder.yudao.module.system.dal.mysql.sms.SmsChannelMapper: INFO # 配置 SmsChannelMapper 的日志级别为 info - cn.iocoder.yudao.module.tool.dal.mysql: debug - cn.iocoder.yudao.module.member.dal.mysql: debug - cn.iocoder.yudao.module.trade.dal.mysql: debug - cn.iocoder.yudao.module.promotion.dal.mysql: debug - cn.iocoder.yudao.module.statistics.dal.mysql: debug - cn.iocoder.yudao.module.crm.dal.mysql: debug - cn.iocoder.yudao.module.erp.dal.mysql: debug - cn.iocoder.yudao.module.iot.dal.mysql: debug - cn.iocoder.yudao.module.ai.dal.mysql: debug + cn.huangge.yudao.module.bpm.dal.mysql: debug + cn.huangge.yudao.module.infra.dal.mysql: debug + cn.huangge.yudao.module.infra.dal.mysql.logger.ApiErrorLogMapper: INFO # 配置 ApiErrorLogMapper 的日志级别为 info，避免和 GlobalExceptionHandler 重复打印 + cn.huangge.yudao.module.infra.dal.mysql.job.JobLogMapper: INFO # 配置 JobLogMapper 的日志级别为 info + cn.huangge.yudao.module.infra.dal.mysql.file.FileConfigMapper: INFO # 配置 FileConfigMapper 的日志级别为 info + cn.huangge.yudao.module.pay.dal.mysql: debug + cn.huangge.yudao.module.pay.dal.mysql.notify.PayNotifyTaskMapper: INFO # 配置 PayNotifyTaskMapper 的日志级别为 info + cn.huangge.yudao.module.system.dal.mysql: debug + cn.huangge.yudao.module.system.dal.mysql.sms.SmsChannelMapper: INFO # 配置 SmsChannelMapper 的日志级别为 info + cn.huangge.yudao.module.tool.dal.mysql: debug + cn.huangge.yudao.module.member.dal.mysql: debug + cn.huangge.yudao.module.trade.dal.mysql: debug + cn.huangge.yudao.module.promotion.dal.mysql: debug + cn.huangge.yudao.module.statistics.dal.mysql: debug + cn.huangge.yudao.module.crm.dal.mysql: debug + cn.huangge.yudao.module.erp.dal.mysql: debug + cn.huangge.yudao.module.iot.dal.mysql: debug + cn.huangge.yudao.module.ai.dal.mysql: debug org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR # TODO 芋艿：先禁用，Spring Boot 3.X 存在部分错误的 WARN 提示 debug: false diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml index e0e135c7b..34de8f4c6 100644 --- a/yudao-server/src/main/resources/application.yaml +++ b/yudao-server/src/main/resources/application.yaml @@ -209,7 +209,7 @@ yudao: yudao: info: version: 1.0.0 - base-package: cn.iocoder.yudao + base-package: cn.huangge.yudao web: admin-ui: url: http://dashboard.yudao.iocoder.cn # Admin 管理后台 UI 的地址