From 61c49b5798ca792d38d438d304a7b638cbf63a51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=9F=E5=AE=B6=E5=85=B4?= <2648609927@qq.com> Date: Thu, 1 May 2025 00:17:08 +0800 Subject: [PATCH 1/5] =?UTF-8?q?refactor(oa):=20=E4=BC=98=E5=8C=96=20OA=20?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 银行管理：将 BankController、BankDao、BankService 移至各自独立的包中 - 数据范围：将 DataScopeController移至独立包中 - 企业信息：将 EnterpriseController、EnterpriseEmployeeManager、EnterpriseService 移至各自独立的包中 - 发票管理：将 InvoiceController、InvoiceDao、InvoiceService 移至各自独立的包中 - 更新相关 XML 文件中的命名空间 --- .../business/oa/bank/{ => controller}/BankController.java | 3 ++- .../sa/admin/module/business/oa/bank/{ => dao}/BankDao.java | 3 +-- .../module/business/oa/bank/{ => service}/BankService.java | 3 ++- .../oa/enterprise/{ => controller}/EnterpriseController.java | 3 ++- .../enterprise/{ => manager}/EnterpriseEmployeeManager.java | 2 +- .../oa/enterprise/{ => service}/EnterpriseService.java | 3 ++- .../oa/invoice/{ => controller}/InvoiceController.java | 3 ++- .../module/business/oa/invoice/{ => dao}/InvoiceDao.java | 3 +-- .../business/oa/invoice/{ => service}/InvoiceService.java | 5 +++-- .../datascope/{ => controller}/DataScopeController.java | 2 +- .../main/resources/mapper/business/oa/bank/BankMapper.xml | 2 +- .../resources/mapper/business/oa/invoice/InvoiceMapper.xml | 2 +- 12 files changed, 19 insertions(+), 15 deletions(-) rename smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/{ => controller}/BankController.java (95%) rename smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/{ => dao}/BankDao.java (93%) rename smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/{ => service}/BankService.java (97%) rename smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/{ => controller}/EnterpriseController.java (97%) rename smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/{ => manager}/EnterpriseEmployeeManager.java (90%) rename smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/{ => service}/EnterpriseService.java (98%) rename smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/{ => controller}/InvoiceController.java (95%) rename smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/{ => dao}/InvoiceDao.java (94%) rename smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/{ => service}/InvoiceService.java (96%) rename smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/{ => controller}/DataScopeController.java (94%) diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/controller/BankController.java similarity index 95% rename from smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java rename to smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/controller/BankController.java index e165817e..73216433 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/controller/BankController.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.oa.bank; +package net.lab1024.sa.admin.module.business.oa.bank.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; @@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import jakarta.validation.Valid; import net.lab1024.sa.admin.constant.AdminSwaggerTagConst; +import net.lab1024.sa.admin.module.business.oa.bank.service.BankService; import net.lab1024.sa.admin.module.business.oa.bank.domain.BankCreateForm; import net.lab1024.sa.admin.module.business.oa.bank.domain.BankQueryForm; import net.lab1024.sa.admin.module.business.oa.bank.domain.BankUpdateForm; diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankDao.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/dao/BankDao.java similarity index 93% rename from smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankDao.java rename to smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/dao/BankDao.java index f553221c..0a058d17 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankDao.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/dao/BankDao.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.oa.bank; +package net.lab1024.sa.admin.module.business.oa.bank.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -7,7 +7,6 @@ import net.lab1024.sa.admin.module.business.oa.bank.domain.BankQueryForm; import net.lab1024.sa.admin.module.business.oa.bank.domain.BankVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Component; import java.util.List; diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankService.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/service/BankService.java similarity index 97% rename from smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankService.java rename to smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/service/BankService.java index 177c50d3..5b32bf62 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankService.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/service/BankService.java @@ -1,8 +1,9 @@ -package net.lab1024.sa.admin.module.business.oa.bank; +package net.lab1024.sa.admin.module.business.oa.bank.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; +import net.lab1024.sa.admin.module.business.oa.bank.dao.BankDao; import net.lab1024.sa.admin.module.business.oa.bank.domain.*; import net.lab1024.sa.admin.module.business.oa.enterprise.dao.EnterpriseDao; import net.lab1024.sa.admin.module.business.oa.enterprise.domain.entity.EnterpriseEntity; diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/controller/EnterpriseController.java similarity index 97% rename from smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java rename to smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/controller/EnterpriseController.java index d919537b..ab06bd02 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/controller/EnterpriseController.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.oa.enterprise; +package net.lab1024.sa.admin.module.business.oa.enterprise.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; @@ -8,6 +8,7 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import net.lab1024.sa.admin.constant.AdminSwaggerTagConst; +import net.lab1024.sa.admin.module.business.oa.enterprise.service.EnterpriseService; import net.lab1024.sa.admin.module.business.oa.enterprise.domain.form.*; import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseEmployeeVO; import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseExcelVO; diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseEmployeeManager.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/manager/EnterpriseEmployeeManager.java similarity index 90% rename from smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseEmployeeManager.java rename to smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/manager/EnterpriseEmployeeManager.java index f90b21ac..a3c21d84 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseEmployeeManager.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/manager/EnterpriseEmployeeManager.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.oa.enterprise; +package net.lab1024.sa.admin.module.business.oa.enterprise.manager; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import net.lab1024.sa.admin.module.business.oa.enterprise.dao.EnterpriseEmployeeDao; diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseService.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/service/EnterpriseService.java similarity index 98% rename from smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseService.java rename to smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/service/EnterpriseService.java index 5ea17e6c..37848774 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseService.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/service/EnterpriseService.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.oa.enterprise; +package net.lab1024.sa.admin.module.business.oa.enterprise.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Lists; @@ -13,6 +13,7 @@ import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseEm import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseExcelVO; import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseListVO; import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO; +import net.lab1024.sa.admin.module.business.oa.enterprise.manager.EnterpriseEmployeeManager; import net.lab1024.sa.admin.module.system.department.service.DepartmentService; import net.lab1024.sa.base.common.code.UserErrorCode; import net.lab1024.sa.base.common.domain.PageResult; diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/controller/InvoiceController.java similarity index 95% rename from smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java rename to smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/controller/InvoiceController.java index 13d3b98f..380be168 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/controller/InvoiceController.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.oa.invoice; +package net.lab1024.sa.admin.module.business.oa.invoice.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; @@ -7,6 +7,7 @@ import jakarta.annotation.Resource; import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import net.lab1024.sa.admin.constant.AdminSwaggerTagConst; +import net.lab1024.sa.admin.module.business.oa.invoice.service.InvoiceService; import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceAddForm; import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceQueryForm; import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceUpdateForm; diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceDao.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/dao/InvoiceDao.java similarity index 94% rename from smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceDao.java rename to smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/dao/InvoiceDao.java index 68c8d9a9..5afcebbc 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceDao.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/dao/InvoiceDao.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.oa.invoice; +package net.lab1024.sa.admin.module.business.oa.invoice.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -7,7 +7,6 @@ import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceQueryForm; import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Component; import java.util.List; diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceService.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/service/InvoiceService.java similarity index 96% rename from smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceService.java rename to smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/service/InvoiceService.java index dda73c3a..dc7eb521 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceService.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/service/InvoiceService.java @@ -1,10 +1,11 @@ -package net.lab1024.sa.admin.module.business.oa.invoice; +package net.lab1024.sa.admin.module.business.oa.invoice.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; -import net.lab1024.sa.admin.module.business.oa.enterprise.EnterpriseService; +import net.lab1024.sa.admin.module.business.oa.enterprise.service.EnterpriseService; import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO; +import net.lab1024.sa.admin.module.business.oa.invoice.dao.InvoiceDao; import net.lab1024.sa.admin.module.business.oa.invoice.domain.*; import net.lab1024.sa.base.common.domain.PageResult; import net.lab1024.sa.base.common.domain.ResponseDTO; diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/DataScopeController.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/controller/DataScopeController.java similarity index 94% rename from smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/DataScopeController.java rename to smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/controller/DataScopeController.java index 8f2fec8e..32bdf8b6 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/DataScopeController.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/controller/DataScopeController.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.system.datascope; +package net.lab1024.sa.admin.module.system.datascope.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/oa/bank/BankMapper.xml b/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/oa/bank/BankMapper.xml index 79b505db..c742cc76 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/oa/bank/BankMapper.xml +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/oa/bank/BankMapper.xml @@ -1,6 +1,6 @@ - + UPDATE t_oa_bank SET deleted_flag = #{deletedFlag} diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/oa/invoice/InvoiceMapper.xml b/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/oa/invoice/InvoiceMapper.xml index 0001d92f..afbc0469 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/oa/invoice/InvoiceMapper.xml +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/oa/invoice/InvoiceMapper.xml @@ -1,6 +1,6 @@ - + UPDATE t_oa_invoice SET deleted_flag = #{deletedFlag} From c93616bec2a3bff61e0d38b704d414c3d90e4d6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=9F=E5=AE=B6=E5=85=B4?= <2648609927@qq.com> Date: Thu, 1 May 2025 00:20:05 +0800 Subject: [PATCH 2/5] =?UTF-8?q?refactor(oa):=20=E4=BC=98=E5=8C=96=20OA=20?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84=20Java8?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 银行相关代码：将 BankController、BankDao、BankService移至合适的包结构 - 数据范围控制器：将 DataScopeController移至 controller 包 - 企业相关代码：将 EnterpriseController、EnterpriseEmployeeManager、EnterpriseService 移至合适的包结构 - 发票相关代码：将 InvoiceController、InvoiceDao、InvoiceService 移至合适的包结构 - 更新相关 XML映射文件的命名空间 --- .../business/oa/bank/{ => controller}/BankController.java | 3 ++- .../sa/admin/module/business/oa/bank/{ => dao}/BankDao.java | 3 +-- .../module/business/oa/bank/{ => service}/BankService.java | 3 ++- .../oa/enterprise/{ => controller}/EnterpriseController.java | 3 ++- .../enterprise/{ => manager}/EnterpriseEmployeeManager.java | 2 +- .../oa/enterprise/{ => service}/EnterpriseService.java | 3 ++- .../oa/invoice/{ => controller}/InvoiceController.java | 3 ++- .../module/business/oa/invoice/{ => dao}/InvoiceDao.java | 3 +-- .../business/oa/invoice/{ => service}/InvoiceService.java | 5 +++-- .../datascope/{ => controller}/DataScopeController.java | 2 +- .../main/resources/mapper/business/oa/bank/BankMapper.xml | 2 +- .../resources/mapper/business/oa/invoice/InvoiceMapper.xml | 2 +- 12 files changed, 19 insertions(+), 15 deletions(-) rename smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/{ => controller}/BankController.java (95%) rename smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/{ => dao}/BankDao.java (93%) rename smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/{ => service}/BankService.java (97%) rename smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/{ => controller}/EnterpriseController.java (97%) rename smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/{ => manager}/EnterpriseEmployeeManager.java (90%) rename smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/{ => service}/EnterpriseService.java (98%) rename smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/{ => controller}/InvoiceController.java (95%) rename smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/{ => dao}/InvoiceDao.java (94%) rename smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/{ => service}/InvoiceService.java (96%) rename smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/{ => controller}/DataScopeController.java (94%) diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/controller/BankController.java similarity index 95% rename from smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/controller/BankController.java index 51a7c4c7..6b5b7a96 100644 --- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java +++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/controller/BankController.java @@ -1,9 +1,10 @@ -package net.lab1024.sa.admin.module.business.oa.bank; +package net.lab1024.sa.admin.module.business.oa.bank.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import net.lab1024.sa.admin.constant.AdminSwaggerTagConst; +import net.lab1024.sa.admin.module.business.oa.bank.service.BankService; import net.lab1024.sa.admin.module.business.oa.bank.domain.BankCreateForm; import net.lab1024.sa.admin.module.business.oa.bank.domain.BankQueryForm; import net.lab1024.sa.admin.module.business.oa.bank.domain.BankUpdateForm; diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankDao.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/dao/BankDao.java similarity index 93% rename from smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankDao.java rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/dao/BankDao.java index f553221c..0a058d17 100644 --- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankDao.java +++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/dao/BankDao.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.oa.bank; +package net.lab1024.sa.admin.module.business.oa.bank.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -7,7 +7,6 @@ import net.lab1024.sa.admin.module.business.oa.bank.domain.BankQueryForm; import net.lab1024.sa.admin.module.business.oa.bank.domain.BankVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Component; import java.util.List; diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/service/BankService.java similarity index 97% rename from smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankService.java rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/service/BankService.java index 72d51457..bf688dd3 100644 --- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankService.java +++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/service/BankService.java @@ -1,7 +1,8 @@ -package net.lab1024.sa.admin.module.business.oa.bank; +package net.lab1024.sa.admin.module.business.oa.bank.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import net.lab1024.sa.admin.module.business.oa.bank.dao.BankDao; import net.lab1024.sa.admin.module.business.oa.bank.domain.*; import net.lab1024.sa.admin.module.business.oa.enterprise.dao.EnterpriseDao; import net.lab1024.sa.admin.module.business.oa.enterprise.domain.entity.EnterpriseEntity; diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/controller/EnterpriseController.java similarity index 97% rename from smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/controller/EnterpriseController.java index 8ef807fa..0b2d199e 100644 --- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java +++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/controller/EnterpriseController.java @@ -1,10 +1,11 @@ -package net.lab1024.sa.admin.module.business.oa.enterprise; +package net.lab1024.sa.admin.module.business.oa.enterprise.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import net.lab1024.sa.admin.constant.AdminSwaggerTagConst; +import net.lab1024.sa.admin.module.business.oa.enterprise.service.EnterpriseService; import net.lab1024.sa.admin.module.business.oa.enterprise.domain.form.*; import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseEmployeeVO; import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseExcelVO; diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseEmployeeManager.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/manager/EnterpriseEmployeeManager.java similarity index 90% rename from smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseEmployeeManager.java rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/manager/EnterpriseEmployeeManager.java index f90b21ac..a3c21d84 100644 --- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseEmployeeManager.java +++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/manager/EnterpriseEmployeeManager.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.oa.enterprise; +package net.lab1024.sa.admin.module.business.oa.enterprise.manager; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import net.lab1024.sa.admin.module.business.oa.enterprise.dao.EnterpriseEmployeeDao; diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/service/EnterpriseService.java similarity index 98% rename from smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseService.java rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/service/EnterpriseService.java index 04954b07..2b97a6bb 100644 --- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseService.java +++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/service/EnterpriseService.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.oa.enterprise; +package net.lab1024.sa.admin.module.business.oa.enterprise.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Lists; @@ -12,6 +12,7 @@ import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseEm import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseExcelVO; import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseListVO; import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO; +import net.lab1024.sa.admin.module.business.oa.enterprise.manager.EnterpriseEmployeeManager; import net.lab1024.sa.admin.module.system.department.service.DepartmentService; import net.lab1024.sa.base.common.code.UserErrorCode; import net.lab1024.sa.base.common.domain.PageResult; diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/controller/InvoiceController.java similarity index 95% rename from smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/controller/InvoiceController.java index fb3270ef..1515697e 100644 --- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java +++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/controller/InvoiceController.java @@ -1,10 +1,11 @@ -package net.lab1024.sa.admin.module.business.oa.invoice; +package net.lab1024.sa.admin.module.business.oa.invoice.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import lombok.extern.slf4j.Slf4j; import net.lab1024.sa.admin.constant.AdminSwaggerTagConst; +import net.lab1024.sa.admin.module.business.oa.invoice.service.InvoiceService; import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceAddForm; import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceQueryForm; import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceUpdateForm; diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceDao.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/dao/InvoiceDao.java similarity index 94% rename from smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceDao.java rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/dao/InvoiceDao.java index 68c8d9a9..5afcebbc 100644 --- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceDao.java +++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/dao/InvoiceDao.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.oa.invoice; +package net.lab1024.sa.admin.module.business.oa.invoice.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -7,7 +7,6 @@ import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceQueryForm; import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Component; import java.util.List; diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/service/InvoiceService.java similarity index 96% rename from smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceService.java rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/service/InvoiceService.java index ce62b2a3..479bccba 100644 --- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceService.java +++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/service/InvoiceService.java @@ -1,9 +1,10 @@ -package net.lab1024.sa.admin.module.business.oa.invoice; +package net.lab1024.sa.admin.module.business.oa.invoice.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -import net.lab1024.sa.admin.module.business.oa.enterprise.EnterpriseService; +import net.lab1024.sa.admin.module.business.oa.enterprise.service.EnterpriseService; import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO; +import net.lab1024.sa.admin.module.business.oa.invoice.dao.InvoiceDao; import net.lab1024.sa.admin.module.business.oa.invoice.domain.*; import net.lab1024.sa.base.common.domain.PageResult; import net.lab1024.sa.base.common.domain.ResponseDTO; diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/DataScopeController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/controller/DataScopeController.java similarity index 94% rename from smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/DataScopeController.java rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/controller/DataScopeController.java index 348a215b..4e7d731d 100644 --- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/DataScopeController.java +++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/controller/DataScopeController.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.system.datascope; +package net.lab1024.sa.admin.module.system.datascope.controller; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/bank/BankMapper.xml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/bank/BankMapper.xml index 79b505db..c742cc76 100644 --- a/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/bank/BankMapper.xml +++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/bank/BankMapper.xml @@ -1,6 +1,6 @@ - + UPDATE t_oa_bank SET deleted_flag = #{deletedFlag} diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/invoice/InvoiceMapper.xml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/invoice/InvoiceMapper.xml index 0001d92f..afbc0469 100644 --- a/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/invoice/InvoiceMapper.xml +++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/invoice/InvoiceMapper.xml @@ -1,6 +1,6 @@ - + UPDATE t_oa_invoice SET deleted_flag = #{deletedFlag} From 40edf452acd35aabc2933066fa79c9fb58a18cf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=9F=E5=AE=B6=E5=85=B4?= <2648609927@qq.com> Date: Thu, 1 May 2025 01:15:03 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix(smart-admin-web-javascript):=20?= =?UTF-8?q?=E4=B8=89=E7=BA=A7=E7=AD=89=E4=BF=9D=E9=85=8D=E7=BD=AE=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E9=83=A8=E5=88=86Label=E8=A2=AB=E9=81=AE=E7=9B=96?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/support/level3protect/level3-protect-config-index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smart-admin-web-javascript/src/views/support/level3protect/level3-protect-config-index.vue b/smart-admin-web-javascript/src/views/support/level3protect/level3-protect-config-index.vue index df1fcceb..97fbd1d5 100644 --- a/smart-admin-web-javascript/src/views/support/level3protect/level3-protect-config-index.vue +++ b/smart-admin-web-javascript/src/views/support/level3protect/level3-protect-config-index.vue @@ -24,7 +24,7 @@ :model="form" :rules="rules" ref="formRef" - style="width: 800px" + style="width: 100%" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }" autocomplete="off" From 696db3835a984679b4534cb618ef139a76e7c603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=9F=E5=AE=B6=E5=85=B4?= <2648609927@qq.com> Date: Thu, 1 May 2025 01:18:19 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix(smart-admin-web-typescript):=20?= =?UTF-8?q?=E4=B8=89=E7=BA=A7=E7=AD=89=E4=BF=9D=E9=85=8D=E7=BD=AE=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E9=83=A8=E5=88=86Label=E8=A2=AB=E9=81=AE=E7=9B=96?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/support/level3protect/level3-protect-config-index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smart-admin-web-typescript/src/views/support/level3protect/level3-protect-config-index.vue b/smart-admin-web-typescript/src/views/support/level3protect/level3-protect-config-index.vue index ce1499c1..9895456a 100644 --- a/smart-admin-web-typescript/src/views/support/level3protect/level3-protect-config-index.vue +++ b/smart-admin-web-typescript/src/views/support/level3protect/level3-protect-config-index.vue @@ -24,7 +24,7 @@ :model="form" :rules="rules" ref="formRef" - style="width: 800px" + style="width: 100%" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }" autocomplete="off" From 41fad5b83123f0fd1095e4ff5e906e017a8ca69d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=9F=E5=AE=B6=E5=85=B4?= <2648609927@qq.com> Date: Thu, 1 May 2025 23:26:22 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat(sa-base):=20=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E4=B8=BB=E4=BB=8E=E6=95=B0=E6=8D=AE=E6=BA=90=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 DataSource 注解用于切换数据源 - 实现 DynamicDataSourceHandler 动态数据源处理器 - 添加 DruidConfig 配置多数据源 - 更新 sa-base.yaml 配置文件，支持主从数据源 --- .../sa/base/common/annoation/DataSource.java | 26 +++ .../base/common/aspect/DataSourceAspect.java | 69 ++++++ .../sa/base/config/DataSourceConfig.java | 201 ------------------ .../lab1024/sa/base/config/DruidConfig.java | 87 ++++++++ .../sa/base/constant/DataSourceTypeEnum.java | 23 ++ .../DynamicDataSourceContextHandler.java | 44 ++++ .../handler/DynamicDataSourceHandler.java | 37 ++++ .../sa/base/properties/DruidProperties.java | 73 +++++++ .../src/main/resources/dev/sa-base.yaml | 32 ++- 9 files changed, 380 insertions(+), 212 deletions(-) create mode 100644 smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/common/annoation/DataSource.java create mode 100644 smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/common/aspect/DataSourceAspect.java delete mode 100644 smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/DataSourceConfig.java create mode 100644 smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/DruidConfig.java create mode 100644 smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/constant/DataSourceTypeEnum.java create mode 100644 smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/handler/DynamicDataSourceContextHandler.java create mode 100644 smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/handler/DynamicDataSourceHandler.java create mode 100644 smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/properties/DruidProperties.java diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/common/annoation/DataSource.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/common/annoation/DataSource.java new file mode 100644 index 00000000..140aa7c6 --- /dev/null +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/common/annoation/DataSource.java @@ -0,0 +1,26 @@ +package net.lab1024.sa.base.common.annoation; + +import net.lab1024.sa.base.constant.DataSourceTypeEnum; + +import java.lang.annotation.*; + +/** + * 切换数据源名称 + * + * @Author 钟家兴 + * @Date 2025-05-01 14:49 + * @Wechat JavaerEngineer + * @Email lab1024@163.com + * @Copyright 1024创新实验室 + */ +@Target({ElementType.METHOD, ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +@Documented +@Inherited +public @interface DataSource { + + /** + * 切换数据源名称 + */ + public DataSourceTypeEnum value() default DataSourceTypeEnum.SLAVE; +} diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/common/aspect/DataSourceAspect.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/common/aspect/DataSourceAspect.java new file mode 100644 index 00000000..1e31e254 --- /dev/null +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/common/aspect/DataSourceAspect.java @@ -0,0 +1,69 @@ +package net.lab1024.sa.base.common.aspect; + +import net.lab1024.sa.base.common.annoation.DataSource; +import net.lab1024.sa.base.handler.DynamicDataSourceContextHandler; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Pointcut; +import org.aspectj.lang.reflect.MethodSignature; +import org.springframework.core.annotation.AnnotationUtils; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; + +import java.util.Objects; + +/** + * 多数据源处理 + * + * @Author 钟家兴 + * @Date 2025-05-01 14:49 + * @Wechat JavaerEngineer + * @Email lab1024@163.com + * @Copyright 1024创新实验室 + */ +@Aspect +@Order(1) +@Component +public class DataSourceAspect { + + /** + * aop切点，有相关注解的方法才做增强处理 + */ + @Pointcut("@annotation(net.lab1024.sa.base.common.annoation.DataSource) || @within(net.lab1024.sa.base.common.annoation.DataSource)") + public void dsPointCut() { + } + + /** + * 环绕通知 + */ + @Around("dsPointCut()") + public Object around(ProceedingJoinPoint point) throws Throwable { + DataSource dataSource = getDataSource(point); + + if (dataSource != null) { + DynamicDataSourceContextHandler.setDataSourceType(dataSource.value().name()); + } + + try { + return point.proceed(); + } finally { + DynamicDataSourceContextHandler.clearDataSourceType(); + } + } + + /** + * 获取需要切换的数据源 + */ + public DataSource getDataSource(ProceedingJoinPoint point) { + MethodSignature signature = (MethodSignature) point.getSignature(); + DataSource dataSource = AnnotationUtils.findAnnotation(signature.getMethod(), DataSource.class); + + // 方法注解为空，则取类注解 + if (Objects.nonNull(dataSource)) { + return dataSource; + } + + return AnnotationUtils.findAnnotation(signature.getDeclaringType(), DataSource.class); + } +} diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/DataSourceConfig.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/DataSourceConfig.java deleted file mode 100644 index 24fdc89d..00000000 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/DataSourceConfig.java +++ /dev/null @@ -1,201 +0,0 @@ -package net.lab1024.sa.base.config; - -import com.alibaba.druid.filter.Filter; -import com.alibaba.druid.filter.stat.StatFilter; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.support.jakarta.StatViewServlet; -import com.alibaba.druid.support.jakarta.WebStatFilter; -import com.alibaba.druid.support.spring.stat.DruidStatInterceptor; -import com.baomidou.mybatisplus.annotation.DbType; -import com.baomidou.mybatisplus.core.config.GlobalConfig; -import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; -import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; -import lombok.extern.slf4j.Slf4j; -import net.lab1024.sa.base.common.domain.DataScopePlugin; -import net.lab1024.sa.base.handler.MybatisPlusFillHandler; -import org.apache.ibatis.plugin.Interceptor; -import org.apache.ibatis.session.SqlSessionFactory; -import org.springframework.aop.support.DefaultPointcutAdvisor; -import org.springframework.aop.support.JdkRegexpMethodPointcut; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.web.servlet.FilterRegistrationBean; -import org.springframework.boot.web.servlet.ServletRegistrationBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Conditional; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; -import org.springframework.core.io.Resource; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; - -import javax.sql.DataSource; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 数据源配置 - * - * @Author 1024创新实验室-主任: 卓大 - * @Date 2017-11-28 15:21:10 - * @Wechat zhuoda1024 - * @Email lab1024@163.com - * @Copyright 1024创新实验室 - */ -@Slf4j -@Configuration -public class DataSourceConfig { - - @Value("${spring.datasource.driver-class-name}") - String driver; - - @Value("${spring.datasource.url}") - String url; - - @Value("${spring.datasource.username}") - String username; - - @Value("${spring.datasource.password}") - String password; - - @Value("${spring.datasource.initial-size}") - int initialSize; - - @Value("${spring.datasource.min-idle}") - int minIdle; - - @Value("${spring.datasource.max-active}") - int maxActive; - - @Value("${spring.datasource.max-wait}") - long maxWait; - - @Value("${spring.datasource.time-between-eviction-runs-millis}") - long timeBetweenEvictionRunsMillis; - - @Value("${spring.datasource.min-evictable-idle-time-millis}") - long minEvictableIdleTimeMillis; - - @Value("${spring.datasource.filters}") - String filters; - - @Value("${spring.datasource.druid.username}") - String druidUserName; - - @Value("${spring.datasource.druid.password}") - String druidPassword; - - @Value("${spring.datasource.druid.login.enabled}") - boolean druidLoginEnable; - - @Value("${spring.datasource.druid.method.pointcut}") - String methodPointcut; - - @jakarta.annotation.Resource - private MybatisPlusInterceptor paginationInterceptor; - - @jakarta.annotation.Resource - private DataScopePlugin dataScopePlugin; - - @Bean - @Primary - public DataSource druidDataSource() { - DruidDataSource druidDataSource = new DruidDataSource(); - druidDataSource.setDbType(DbType.MYSQL.getDb()); - druidDataSource.setDriverClassName(driver); - druidDataSource.setUrl(url); - druidDataSource.setUsername(username); - druidDataSource.setPassword(password); - druidDataSource.setInitialSize(initialSize); - druidDataSource.setMinIdle(minIdle); - druidDataSource.setMaxActive(maxActive); - druidDataSource.setMaxWait(maxWait); - druidDataSource.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis); - druidDataSource.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis); - druidDataSource.setValidationQuery("SELECT 1"); - try { - druidDataSource.setFilters(filters); - ArrayList arrayList = new ArrayList<>(); - StatFilter statFilter = new StatFilter(); - statFilter.setMergeSql(true); - statFilter.setSlowSqlMillis(1000); - statFilter.setLogSlowSql(true); - arrayList.add(statFilter); - druidDataSource.setProxyFilters(arrayList); - druidDataSource.init(); - } catch (SQLException e) { - log.error("初始化数据源出错", e); - } - - return druidDataSource; - } - - @Bean - public SqlSessionFactory sqlSessionFactory() throws Exception { - MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean(); - factoryBean.setDataSource(druidDataSource()); - PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); - Resource[] resources = resolver.getResources("classpath*:/mapper/**/*.xml"); - factoryBean.setMapperLocations(resources); - - // 设置 MyBatis-Plus 分页插件 注意此处myBatisPlugin一定要放在后面 - List pluginsList = new ArrayList<>(); - pluginsList.add(paginationInterceptor); - if (dataScopePlugin != null) { - pluginsList.add(dataScopePlugin); - } - factoryBean.setPlugins(pluginsList.toArray(new Interceptor[0])); - // 添加字段自动填充处理 - factoryBean.setGlobalConfig(new GlobalConfig().setBanner(false).setMetaObjectHandler(new MybatisPlusFillHandler())); - - return factoryBean.getObject(); - } - - /** - * 非正式环境 才加载 - * - * @return - */ - @Conditional(SystemEnvironmentConfig.class) - @Bean - public ServletRegistrationBean druidServlet() { - ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean<>(); - servletRegistrationBean.setServlet(new StatViewServlet()); - servletRegistrationBean.addUrlMappings("/druid/*"); - Map initParameters = new HashMap(); - //不设置用户名密码可以直接通过druid/index.html访问 - if (druidLoginEnable) { - initParameters.put("loginUsername", druidUserName); - initParameters.put("loginPassword", druidPassword); - } - initParameters.put("resetEnable", "false"); - servletRegistrationBean.setInitParameters(initParameters); - return servletRegistrationBean; - } - - @Bean - public FilterRegistrationBean filterRegistrationBean() { - FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean(); - filterRegistrationBean.setFilter(new WebStatFilter()); - filterRegistrationBean.addUrlPatterns("/*"); - filterRegistrationBean.addInitParameter("exclusions", "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/*"); - return filterRegistrationBean; - } - - @Bean - public JdkRegexpMethodPointcut jdkRegexpMethodPointcut() { - JdkRegexpMethodPointcut jdkRegexpMethodPointcut = new JdkRegexpMethodPointcut(); - jdkRegexpMethodPointcut.setPatterns(methodPointcut); - return jdkRegexpMethodPointcut; - } - - @Bean - public DefaultPointcutAdvisor defaultPointcutAdvisor() { - DefaultPointcutAdvisor pointcutAdvisor = new DefaultPointcutAdvisor(); - pointcutAdvisor.setPointcut(jdkRegexpMethodPointcut()); - pointcutAdvisor.setAdvice(new DruidStatInterceptor()); - return pointcutAdvisor; - } - -} diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/DruidConfig.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/DruidConfig.java new file mode 100644 index 00000000..bae70ba3 --- /dev/null +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/DruidConfig.java @@ -0,0 +1,87 @@ +package net.lab1024.sa.base.config; + +import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceBuilder; +import lombok.extern.slf4j.Slf4j; +import net.lab1024.sa.base.constant.DataSourceTypeEnum; +import net.lab1024.sa.base.handler.DynamicDataSourceHandler; +import net.lab1024.sa.base.properties.DruidProperties; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; + +import javax.sql.DataSource; +import java.util.HashMap; +import java.util.Map; + +/** + * Druid 配置多数据源 + * + * @Author 钟家兴 + * @Date 2025-05-01 14:49 + * @Wechat JavaerEngineer + * @Email lab1024@163.com + * @Copyright 1024创新实验室 + */ +@Slf4j +@Configuration +public class DruidConfig { + + /** + * 这里以map的方式存储所有的自定义的数据源，其中key是枚举类的字符串值，value是创建好且赋值好的数据源对象 + */ + private static Map targetDataSources = new HashMap<>(); + + /** + * DruidProperties(属性配置对象，见后面6 spring会根据配置文件的值将该对象的属性赋值 + * 然后调用dataSource()方法将创建好的数据源对象赋值好然后交给spring管理 + * 这里是配置的主数据源也是默认的数据源 + */ + @Bean + @ConfigurationProperties("spring.datasource.druid.master") + public DataSource masterDataSource(DruidProperties druidProperties) { + DataSource dataSource = druidProperties.dataSource(DruidDataSourceBuilder.create().build()); + targetDataSources.put(DataSourceTypeEnum.MASTER.name(), dataSource); + return dataSource; + } + + /** + * 配置从数据源，注意从数据源配置“name = "enabled", havingValue = "true"”参数 + */ + @Bean + @ConfigurationProperties("spring.datasource.druid.slave") + @ConditionalOnProperty(prefix = "spring.datasource.druid.slave", name = "enabled", havingValue = "true") + public DataSource slaveDataSource(DruidProperties druidProperties) { + DataSource dataSource = druidProperties.dataSource(DruidDataSourceBuilder.create().build()); + targetDataSources.put(DataSourceTypeEnum.SLAVE.name(), dataSource); + return dataSource; + } + + /** + * 之后所有需要增加的数据源可以在这里从上到下依次添加 + * 只需要按照上面的方式（slaveDataSource的方法照葫芦画瓢）注入bean，然后再在配置文件中配置好相关的参数 + * 最后添加该数据源所对应的枚举类作为该数据源的key即可 + **/ + + /** + * 使用 @Qualifier 注解指定将两个数据源作为入参 + */ + @Bean(name = "dynamicDataSource") + @Primary + public DynamicDataSourceHandler dataSource(@Qualifier("masterDataSource") DataSource masterDataSource, @Autowired(required = false) @Qualifier("slaveDataSource") DataSource slaveDataSource) { + Map targetDataSources = new HashMap<>(); + targetDataSources.put(DataSourceTypeEnum.MASTER.name(), masterDataSource); + log.info("加载动态数据源：{}", DataSourceTypeEnum.MASTER.name()); + + // 如果从数据源不为空 则添加到 targetDataSources 中 + if (slaveDataSource != null) { + targetDataSources.put(DataSourceTypeEnum.SLAVE.name(), slaveDataSource); + log.info("加载动态数据源：{}", DataSourceTypeEnum.SLAVE.name()); + } + + return new DynamicDataSourceHandler(masterDataSource, targetDataSources); + } +} diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/constant/DataSourceTypeEnum.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/constant/DataSourceTypeEnum.java new file mode 100644 index 00000000..bb1628fd --- /dev/null +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/constant/DataSourceTypeEnum.java @@ -0,0 +1,23 @@ +package net.lab1024.sa.base.constant; + +/** + * 数据源类型 + * + * @Author 钟家兴 + * @Date 2025-05-01 14:49 + * @Wechat JavaerEngineer + * @Email lab1024@163.com + * @Copyright 1024创新实验室 + */ +public enum DataSourceTypeEnum { + + /** + * 主库 + */ + MASTER, + + /** + * 从库 + */ + SLAVE +} diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/handler/DynamicDataSourceContextHandler.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/handler/DynamicDataSourceContextHandler.java new file mode 100644 index 00000000..a52140e5 --- /dev/null +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/handler/DynamicDataSourceContextHandler.java @@ -0,0 +1,44 @@ +package net.lab1024.sa.base.handler; + +import lombok.extern.slf4j.Slf4j; + +/** + * 数据源切换处理 + * + * @Author 钟家兴 + * @Date 2025-05-01 14:49 + * @Wechat JavaerEngineer + * @Email lab1024@163.com + * @Copyright 1024创新实验室 + */ +@Slf4j +public class DynamicDataSourceContextHandler { + + /** + * 使用ThreadLocal维护变量，ThreadLocal为每个使用该变量的线程提供独立的变量副本， + * 所以每一个线程都可以独立地改变自己的副本，而不会影响其它线程所对应的副本。 + */ + private static final ThreadLocal CONTEXT_HOLDER = new ThreadLocal<>(); + + /** + * 设置数据源的变量 + */ + public static void setDataSourceType(String dsType) { + log.info("切换到 {} 数据源", dsType); + CONTEXT_HOLDER.set(dsType); + } + + /** + * 获得数据源的变量 + */ + public static String getDataSourceType() { + return CONTEXT_HOLDER.get(); + } + + /** + * 清空数据源变量 + */ + public static void clearDataSourceType() { + CONTEXT_HOLDER.remove(); + } +} diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/handler/DynamicDataSourceHandler.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/handler/DynamicDataSourceHandler.java new file mode 100644 index 00000000..73cf744e --- /dev/null +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/handler/DynamicDataSourceHandler.java @@ -0,0 +1,37 @@ +package net.lab1024.sa.base.handler; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; + +import javax.sql.DataSource; +import java.util.Map; + +/** + * 动态数据源 + * + * @Author 钟家兴 + * @Date 2025-05-01 14:49 + * @Wechat JavaerEngineer + * @Email lab1024@163.com + * @Copyright 1024创新实验室 + */ +@Slf4j +public class DynamicDataSourceHandler extends AbstractRoutingDataSource { + + /** + * targetDataSources:将所有的数据源以Map的形式传入到AbstractRoutingDataSource的实现类中，以供后面进行动态数据源选择 + */ + public DynamicDataSourceHandler(DataSource defaultTargetDataSource, Map targetDataSources) { + super.setDefaultTargetDataSource(defaultTargetDataSource); + super.setTargetDataSources(targetDataSources); + super.afterPropertiesSet(); + } + + /** + * 系统每次选择数据源的时候会执行这个方法拿到key，再通过key去内部的数据源targetDataSources Map中找到对应的数据源对象 + */ + @Override + protected Object determineCurrentLookupKey() { + return DynamicDataSourceContextHandler.getDataSourceType(); + } +} diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/properties/DruidProperties.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/properties/DruidProperties.java new file mode 100644 index 00000000..a625ce47 --- /dev/null +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/properties/DruidProperties.java @@ -0,0 +1,73 @@ +package net.lab1024.sa.base.properties; + +import com.alibaba.druid.pool.DruidDataSource; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; + +/** + * Druid 配置属性 + * + * @Author 钟家兴 + * @Date 2025-05-01 14:49 + * @Wechat JavaerEngineer + * @Email lab1024@163.com + * @Copyright 1024创新实验室 + */ +@Configuration +public class DruidProperties { + + @Value("${spring.datasource.druid.initial-size}") + private int initialSize; + + @Value("${spring.datasource.druid.min-idle}") + private int minIdle; + + @Value("${spring.datasource.druid.max-active}") + private int maxActive; + + @Value("${spring.datasource.druid.max-wait}") + private int maxWait; + + @Value("${spring.datasource.druid.connect-timeout}") + private int connectTimeout; + + @Value("${spring.datasource.druid.socket-timeout}") + private int socketTimeout; + + @Value("${spring.datasource.druid.time-between-eviction-runs-millis}") + private int timeBetweenEvictionRunsMillis; + + @Value("${spring.datasource.druid.min-evictable-idle-time-millis}") + private int minEvictableIdleTimeMillis; + + @Value("${spring.datasource.druid.max-evictable-idle-time-millis}") + private int maxEvictableIdleTimeMillis; + + /** + * 构建datasource + */ + public DruidDataSource dataSource(DruidDataSource datasource) + { + // 配置初始化大小、最小、最大 + datasource.setInitialSize(initialSize); + datasource.setMaxActive(maxActive); + datasource.setMinIdle(minIdle); + + // 配置获取连接等待超时的时间 + datasource.setMaxWait(maxWait); + + // 配置驱动连接超时时间，检测数据库建立连接的超时时间，单位是毫秒 + datasource.setConnectTimeout(connectTimeout); + + // 配置网络超时时间，等待数据库操作完成的网络超时时间，单位是毫秒 + datasource.setSocketTimeout(socketTimeout); + + // 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + datasource.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis); + + // 配置一个连接在池中最小、最大生存的时间，单位是毫秒 + datasource.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis); + datasource.setMaxEvictableIdleTimeMillis(maxEvictableIdleTimeMillis); + return datasource; + } +} diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/dev/sa-base.yaml b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/dev/sa-base.yaml index 400b9780..840bc752 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/dev/sa-base.yaml +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/dev/sa-base.yaml @@ -1,18 +1,28 @@ spring: # 数据库连接信息 datasource: - url: jdbc:p6spy:mysql://127.0.0.1:3306/smart_admin_v3?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai - username: root - password: SmartAdmin666 + type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.p6spy.engine.spy.P6SpyDriver - initial-size: 2 - min-idle: 2 - max-active: 10 - max-wait: 60000 - time-between-eviction-runs-millis: 60000 - min-evictable-idle-time-millis: 300000 - filters: stat druid: + master: + url: jdbc:p6spy:mysql://127.0.0.1:3306/smart_admin_v3?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai + username: root + password: SmartAdmin666 + slave: + enabled: true + url: jdbc:p6spy:mysql://127.0.0.1:3306/smart_admin_v3_slave?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai + username: root + password: SmartAdmin666 + initial-size: 2 + min-idle: 2 + max-active: 10 + max-wait: 60000 + connect-timeout: 30000 + socket-timeout: 30000 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + max-evictable-idle-time-millis: 300000 + filters: stat username: druid password: 1024 login: @@ -26,7 +36,7 @@ spring: database: 1 host: 127.0.0.1 port: 6379 - password: + password: 123456 timeout: 10000ms lettuce: pool: