Pre Merge pull request !73 from Engineer/master

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/config/OperateLogAspectConfig.java

@@ -24,5 +24,4 @@ public class OperateLogAspectConfig extends OperateLogAspect{
         return OperateLogConfig.builder().corePoolSize(1).queueCapacity(10000).build();
     }
 
-
 }

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminSwaggerTagConst.java

@@ -28,7 +28,6 @@ public class AdminSwaggerTagConst extends SwaggerTagConst {
 
     }
 
-
     public static class System {
 
         public static final String SYSTEM_LOGIN = "系统-员工登录";
@@ -55,5 +54,4 @@ public class AdminSwaggerTagConst extends SwaggerTagConst {
 
     }
 
-
 }

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java

@@ -37,14 +37,14 @@ import net.lab1024.sa.base.constant.RedisKeyConst;
 import net.lab1024.sa.base.module.support.apiencrypt.service.ApiEncryptService;
 import net.lab1024.sa.base.module.support.captcha.CaptchaService;
 import net.lab1024.sa.base.module.support.captcha.domain.CaptchaVO;
-import net.lab1024.sa.base.module.support.config.ConfigKeyEnum;
+import net.lab1024.sa.base.module.support.config.enums.ConfigKeyEnum;
-import net.lab1024.sa.base.module.support.config.ConfigService;
+import net.lab1024.sa.base.module.support.config.service.ConfigService;
 import net.lab1024.sa.base.module.support.file.service.IFileStorageService;
-import net.lab1024.sa.base.module.support.loginlog.LoginLogResultEnum;
+import net.lab1024.sa.base.module.support.loginlog.enums.LoginLogResultEnum;
-import net.lab1024.sa.base.module.support.loginlog.LoginLogService;
+import net.lab1024.sa.base.module.support.loginlog.service.LoginLogService;
 import net.lab1024.sa.base.module.support.loginlog.domain.LoginLogEntity;
 import net.lab1024.sa.base.module.support.loginlog.domain.LoginLogVO;
-import net.lab1024.sa.base.module.support.mail.MailService;
+import net.lab1024.sa.base.module.support.mail.service.MailService;
 import net.lab1024.sa.base.module.support.mail.constant.MailTemplateCodeEnum;
 import net.lab1024.sa.base.module.support.redis.RedisService;
 import net.lab1024.sa.base.module.support.securityprotect.domain.LoginFailEntity;

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminConfigController.java

@@ -9,7 +9,7 @@ import net.lab1024.sa.base.common.controller.SupportBaseController;
 import net.lab1024.sa.base.common.domain.PageResult;
 import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.constant.SwaggerTagConst;
-import net.lab1024.sa.base.module.support.config.ConfigService;
+import net.lab1024.sa.base.module.support.config.service.ConfigService;
 import net.lab1024.sa.base.module.support.config.domain.ConfigAddForm;
 import net.lab1024.sa.base.module.support.config.domain.ConfigQueryForm;
 import net.lab1024.sa.base.module.support.config.domain.ConfigUpdateForm;

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHeartBeatController.java

@@ -8,7 +8,7 @@ import net.lab1024.sa.base.common.controller.SupportBaseController;
 import net.lab1024.sa.base.common.domain.PageResult;
 import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.constant.SwaggerTagConst;
-import net.lab1024.sa.base.module.support.heartbeat.HeartBeatService;
+import net.lab1024.sa.base.module.support.heartbeat.service.HeartBeatService;
 import net.lab1024.sa.base.module.support.heartbeat.domain.HeartBeatRecordQueryForm;
 import net.lab1024.sa.base.module.support.heartbeat.domain.HeartBeatRecordVO;
 import org.springframework.web.bind.annotation.PostMapping;

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminLoginLogController.java

@@ -10,7 +10,7 @@ import net.lab1024.sa.base.common.domain.RequestUser;
 import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.common.util.SmartRequestUtil;
 import net.lab1024.sa.base.constant.SwaggerTagConst;
-import net.lab1024.sa.base.module.support.loginlog.LoginLogService;
+import net.lab1024.sa.base.module.support.loginlog.service.LoginLogService;
 import net.lab1024.sa.base.module.support.loginlog.domain.LoginLogQueryForm;
 import net.lab1024.sa.base.module.support.loginlog.domain.LoginLogVO;
 import org.springframework.web.bind.annotation.PostMapping;

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminOperateLogController.java

@@ -10,7 +10,7 @@ import net.lab1024.sa.base.common.domain.RequestUser;
 import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.common.util.SmartRequestUtil;
 import net.lab1024.sa.base.constant.SwaggerTagConst;
-import net.lab1024.sa.base.module.support.operatelog.OperateLogService;
+import net.lab1024.sa.base.module.support.operatelog.service.OperateLogService;
 import net.lab1024.sa.base.module.support.operatelog.domain.OperateLogQueryForm;
 import net.lab1024.sa.base.module.support.operatelog.domain.OperateLogVO;
 import org.springframework.web.bind.annotation.*;

smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminProtectController.java

@@ -9,8 +9,8 @@ import net.lab1024.sa.base.common.domain.PageResult;
 import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.common.domain.ValidateList;
 import net.lab1024.sa.base.constant.SwaggerTagConst;
-import net.lab1024.sa.base.module.support.config.ConfigKeyEnum;
+import net.lab1024.sa.base.module.support.config.enums.ConfigKeyEnum;
-import net.lab1024.sa.base.module.support.config.ConfigService;
+import net.lab1024.sa.base.module.support.config.service.ConfigService;
 import net.lab1024.sa.base.module.support.securityprotect.domain.Level3ProtectConfigForm;
 import net.lab1024.sa.base.module.support.securityprotect.domain.LoginFailQueryForm;
 import net.lab1024.sa.base.module.support.securityprotect.domain.LoginFailVO;

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/handler/DynamicDataSourceContextHandler.java

@@ -15,8 +15,8 @@ import lombok.extern.slf4j.Slf4j;
 public class DynamicDataSourceContextHandler {
 
     /**
-     * 使用ThreadLocal维护变量，ThreadLocal为每个使用该变量的线程提供独立的变量副本，
+     * 使用ThreadLocal维护变量 ThreadLocal为每个使用该变量的线程提供独立的变量副本
-     * 所以每一个线程都可以独立地改变自己的副本，而不会影响其它线程所对应的副本。
+     * 所以每一个线程都可以独立地改变自己的副本 而不会影响其它线程所对应的副本
      */
     private static final ThreadLocal<String> CONTEXT_HOLDER = new ThreadLocal<>();
 

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/controller/ConfigController.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.base.module.support.config;
+package net.lab1024.sa.base.module.support.config.controller;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -6,6 +6,7 @@ import jakarta.annotation.Resource;
 import net.lab1024.sa.base.common.controller.SupportBaseController;
 import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.constant.SwaggerTagConst;
+import net.lab1024.sa.base.module.support.config.service.ConfigService;
 import net.lab1024.sa.base.module.support.config.domain.ConfigVO;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/dao/ConfigDao.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.base.module.support.config;
+package net.lab1024.sa.base.module.support.config.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -6,7 +6,6 @@ import net.lab1024.sa.base.module.support.config.domain.ConfigEntity;
 import net.lab1024.sa.base.module.support.config.domain.ConfigQueryForm;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Component;
 
 import java.util.List;
 

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/enums/ConfigKeyEnum.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.base.module.support.config;
+package net.lab1024.sa.base.module.support.config.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/service/ConfigService.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.base.module.support.config;
+package net.lab1024.sa.base.module.support.config.service;
 
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
@@ -12,7 +12,9 @@ import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.common.util.SmartBeanUtil;
 import net.lab1024.sa.base.common.util.SmartPageUtil;
 import net.lab1024.sa.base.constant.ReloadConst;
+import net.lab1024.sa.base.module.support.config.dao.ConfigDao;
 import net.lab1024.sa.base.module.support.config.domain.*;
+import net.lab1024.sa.base.module.support.config.enums.ConfigKeyEnum;
 import net.lab1024.sa.base.module.support.reload.core.annoation.SmartReload;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/dao/HeartBeatRecordDao.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.base.module.support.heartbeat;
+package net.lab1024.sa.base.module.support.heartbeat.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,7 +7,6 @@ import net.lab1024.sa.base.module.support.heartbeat.domain.HeartBeatRecordQueryF
 import net.lab1024.sa.base.module.support.heartbeat.domain.HeartBeatRecordVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
 import java.util.List;

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/handler/HeartBeatRecordHandler.java

@@ -1,10 +1,11 @@
-package net.lab1024.sa.base.module.support.heartbeat;
+package net.lab1024.sa.base.module.support.heartbeat.handler;
 
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.base.common.util.SmartBeanUtil;
 import net.lab1024.sa.base.module.support.heartbeat.core.HeartBeatRecord;
 import net.lab1024.sa.base.module.support.heartbeat.core.IHeartBeatRecordHandler;
+import net.lab1024.sa.base.module.support.heartbeat.dao.HeartBeatRecordDao;
 import net.lab1024.sa.base.module.support.heartbeat.domain.HeartBeatRecordEntity;
 import org.springframework.stereotype.Service;
 

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/service/HeartBeatService.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.base.module.support.heartbeat;
+package net.lab1024.sa.base.module.support.heartbeat.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jakarta.annotation.Resource;
@@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.base.common.domain.PageResult;
 import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.common.util.SmartPageUtil;
+import net.lab1024.sa.base.module.support.heartbeat.dao.HeartBeatRecordDao;
 import net.lab1024.sa.base.module.support.heartbeat.domain.HeartBeatRecordQueryForm;
 import net.lab1024.sa.base.module.support.heartbeat.domain.HeartBeatRecordVO;
 import org.springframework.stereotype.Service;

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/sample/SmartJobSample2.java

@@ -1,7 +1,7 @@
 package net.lab1024.sa.base.module.support.job.sample;
 
 import lombok.extern.slf4j.Slf4j;
-import net.lab1024.sa.base.module.support.config.ConfigDao;
+import net.lab1024.sa.base.module.support.config.dao.ConfigDao;
 import net.lab1024.sa.base.module.support.config.domain.ConfigEntity;
 import net.lab1024.sa.base.module.support.job.core.SmartJob;
 import org.springframework.beans.factory.annotation.Autowired;

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/dao/LoginLogDao.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.base.module.support.loginlog;
+package net.lab1024.sa.base.module.support.loginlog.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,7 +7,6 @@ import net.lab1024.sa.base.module.support.loginlog.domain.LoginLogQueryForm;
 import net.lab1024.sa.base.module.support.loginlog.domain.LoginLogVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Component;
 
 import java.util.List;
 

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/domain/LoginLogVO.java

@@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import net.lab1024.sa.base.common.enumeration.UserTypeEnum;
 import net.lab1024.sa.base.common.swagger.SchemaEnum;
-import net.lab1024.sa.base.module.support.loginlog.LoginLogResultEnum;
+import net.lab1024.sa.base.module.support.loginlog.enums.LoginLogResultEnum;
 
 import java.time.LocalDateTime;
 

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/enums/LoginLogResultEnum.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.base.module.support.loginlog;
+package net.lab1024.sa.base.module.support.loginlog.enums;
 
 import net.lab1024.sa.base.common.enumeration.BaseEnum;
 

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/service/LoginLogService.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.base.module.support.loginlog;
+package net.lab1024.sa.base.module.support.loginlog.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jakarta.annotation.Resource;
@@ -7,6 +7,8 @@ import net.lab1024.sa.base.common.domain.PageResult;
 import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.common.enumeration.UserTypeEnum;
 import net.lab1024.sa.base.common.util.SmartPageUtil;
+import net.lab1024.sa.base.module.support.loginlog.enums.LoginLogResultEnum;
+import net.lab1024.sa.base.module.support.loginlog.dao.LoginLogDao;
 import net.lab1024.sa.base.module.support.loginlog.domain.LoginLogEntity;
 import net.lab1024.sa.base.module.support.loginlog.domain.LoginLogQueryForm;
 import net.lab1024.sa.base.module.support.loginlog.domain.LoginLogVO;

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/dao/MailTemplateDao.java

@@ -1,10 +1,9 @@
-package net.lab1024.sa.base.module.support.mail;
+package net.lab1024.sa.base.module.support.mail.dao;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import net.lab1024.sa.base.module.support.mail.domain.MailTemplateEntity;
 import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Component;
 
 /**
  * 邮件模板

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/service/MailService.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.base.module.support.mail;
+package net.lab1024.sa.base.module.support.mail.service;
 
 
 import cn.hutool.core.lang.UUID;
@@ -11,6 +11,7 @@ import jakarta.mail.internet.MimeMessage;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.common.domain.SystemEnvironment;
+import net.lab1024.sa.base.module.support.mail.dao.MailTemplateDao;
 import net.lab1024.sa.base.module.support.mail.constant.MailTemplateCodeEnum;
 import net.lab1024.sa.base.module.support.mail.constant.MailTemplateTypeEnum;
 import net.lab1024.sa.base.module.support.mail.domain.MailTemplateEntity;

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogAspect.java

@@ -13,7 +13,7 @@ import net.lab1024.sa.base.common.constant.StringConst;
 import net.lab1024.sa.base.common.domain.RequestUser;
 import net.lab1024.sa.base.common.util.SmartIpUtil;
 import net.lab1024.sa.base.common.util.SmartRequestUtil;
-import net.lab1024.sa.base.module.support.operatelog.OperateLogDao;
+import net.lab1024.sa.base.module.support.operatelog.dao.OperateLogDao;
 import net.lab1024.sa.base.module.support.operatelog.annotation.OperateLog;
 import net.lab1024.sa.base.module.support.operatelog.domain.OperateLogEntity;
 import org.aspectj.lang.JoinPoint;

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/dao/OperateLogDao.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.base.module.support.operatelog;
+package net.lab1024.sa.base.module.support.operatelog.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -6,7 +6,6 @@ import net.lab1024.sa.base.module.support.operatelog.domain.OperateLogEntity;
 import net.lab1024.sa.base.module.support.operatelog.domain.OperateLogQueryForm;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Component;
 
 import java.util.List;
 

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/service/OperateLogService.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.base.module.support.operatelog;
+package net.lab1024.sa.base.module.support.operatelog.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jakarta.annotation.Resource;
@@ -7,6 +7,7 @@ import net.lab1024.sa.base.common.domain.PageResult;
 import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.common.util.SmartBeanUtil;
 import net.lab1024.sa.base.common.util.SmartPageUtil;
+import net.lab1024.sa.base.module.support.operatelog.dao.OperateLogDao;
 import net.lab1024.sa.base.module.support.operatelog.domain.OperateLogEntity;
 import net.lab1024.sa.base.module.support.operatelog.domain.OperateLogQueryForm;
 import net.lab1024.sa.base.module.support.operatelog.domain.OperateLogVO;

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/Level3ProtectConfigService.java

@@ -7,8 +7,8 @@ import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.base.common.domain.ResponseDTO;
-import net.lab1024.sa.base.module.support.config.ConfigKeyEnum;
+import net.lab1024.sa.base.module.support.config.enums.ConfigKeyEnum;
-import net.lab1024.sa.base.module.support.config.ConfigService;
+import net.lab1024.sa.base.module.support.config.service.ConfigService;
 import net.lab1024.sa.base.module.support.securityprotect.domain.Level3ProtectConfigForm;
 import org.springframework.stereotype.Service;
 

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/controller/TableColumnController.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.base.module.support.table;
+package net.lab1024.sa.base.module.support.table.controller;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -9,6 +9,7 @@ import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.common.util.SmartRequestUtil;
 import net.lab1024.sa.base.constant.SwaggerTagConst;
 import net.lab1024.sa.base.module.support.repeatsubmit.annoation.RepeatSubmit;
+import net.lab1024.sa.base.module.support.table.service.TableColumnService;
 import net.lab1024.sa.base.module.support.table.domain.TableColumnUpdateForm;
 import org.springframework.web.bind.annotation.*;
 

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/dao/TableColumnDao.java

@@ -1,4 +1,4 @@
-package net.lab1024.sa.base.module.support.table;
+package net.lab1024.sa.base.module.support.table.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import net.lab1024.sa.base.module.support.table.domain.TableColumnEntity;

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/service/TableColumnService.java

@@ -1,9 +1,10 @@
-package net.lab1024.sa.base.module.support.table;
+package net.lab1024.sa.base.module.support.table.service;
 
 import com.alibaba.fastjson.JSONArray;
 import jakarta.annotation.Resource;
 import net.lab1024.sa.base.common.domain.RequestUser;
 import net.lab1024.sa.base.common.domain.ResponseDTO;
+import net.lab1024.sa.base.module.support.table.dao.TableColumnDao;
 import net.lab1024.sa.base.module.support.table.domain.TableColumnEntity;
 import net.lab1024.sa.base.module.support.table.domain.TableColumnUpdateForm;
 import org.apache.commons.collections4.CollectionUtils;

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/properties/DruidProperties.java

@@ -1,9 +1,15 @@
 package net.lab1024.sa.base.properties;
 
+import com.alibaba.druid.filter.Filter;
+import com.alibaba.druid.filter.stat.StatFilter;
 import com.alibaba.druid.pool.DruidDataSource;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
+import java.sql.SQLException;
+import java.util.ArrayList;
+
 /**
  * Druid 配置属性
  *
@@ -13,6 +19,7 @@ import org.springframework.context.annotation.Configuration;
  * @Email lab1024@163.com
  * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
  */
+@Slf4j
 @Configuration
 public class DruidProperties {
 
@@ -43,6 +50,9 @@ public class DruidProperties {
     @Value("${spring.datasource.druid.max-evictable-idle-time-millis}")
     private int maxEvictableIdleTimeMillis;
 
+    @Value("${spring.datasource.druid.filters}")
+    private String filters;
+
     /**
      * 构建datasource
      */
@@ -68,6 +78,24 @@ public class DruidProperties {
         // 配置一个连接在池中最小、最大生存的时间，单位是毫秒
         datasource.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
         datasource.setMaxEvictableIdleTimeMillis(maxEvictableIdleTimeMillis);
+
+        datasource.setValidationQuery("SELECT 1");
+
+        try {
+            // 配置过滤器
+            datasource.setFilters(filters);
+
+            // 配置监控
+            ArrayList<Filter> arrayList = new ArrayList<>();
+            StatFilter statFilter = new StatFilter();
+            statFilter.setMergeSql(true);
+            statFilter.setSlowSqlMillis(1000);
+            statFilter.setLogSlowSql(true);
+            arrayList.add(statFilter);
+            datasource.setProxyFilters(arrayList);
+        } catch (SQLException e) {
+            log.error("初始化数据源出错", e);
+        }
         return datasource;
     }
 }

smart-admin-api-java17-springboot3/sa-base/src/main/resources/dev/sa-base.yaml

@@ -4,15 +4,18 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
     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
+        enabled: false
         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
@@ -23,10 +26,16 @@ spring:
       min-evictable-idle-time-millis: 300000
       max-evictable-idle-time-millis: 300000
       filters: stat
-      username: druid
+      # Druid监控
-      password: 1024
+      stat-view-servlet:
-      login:
+        enabled: true
-        enabled: false
+        url-pattern: /druid/*
+        login-username: druid
+        login-password: 1024
+        web-stat-filter:
+          enabled: true
+          url-pattern: /*
+          exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
       method:
         pointcut: net.lab1024.sa..*Service.*
 
@@ -36,7 +45,7 @@ spring:
       database: 1
       host: 127.0.0.1
       port: 6379
-      password: 123456
+      password:
       timeout: 10000ms
       lettuce:
         pool:

smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/ConfigMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="net.lab1024.sa.base.module.support.config.ConfigDao">
+<mapper namespace="net.lab1024.sa.base.module.support.config.dao.ConfigDao">
     <!-- 分页查询系统配置 -->
     <select id="queryByPage" resultType="net.lab1024.sa.base.module.support.config.domain.ConfigEntity">
         SELECT *

smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/HeartBeatRecordMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="net.lab1024.sa.base.module.support.heartbeat.HeartBeatRecordDao">
+<mapper namespace="net.lab1024.sa.base.module.support.heartbeat.dao.HeartBeatRecordDao">
 
 
     <update id="updateHeartBeatTimeById">

smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/LoginLogMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="net.lab1024.sa.base.module.support.loginlog.LoginLogDao">
+<mapper namespace="net.lab1024.sa.base.module.support.loginlog.dao.LoginLogDao">
 
     <select id="queryByPage" resultType="net.lab1024.sa.base.module.support.loginlog.domain.LoginLogVO">
         select

smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/OperateLogMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="net.lab1024.sa.base.module.support.operatelog.OperateLogDao">
+<mapper namespace="net.lab1024.sa.base.module.support.operatelog.dao.OperateLogDao">
 
     <select id="queryByPage" resultType="net.lab1024.sa.base.module.support.operatelog.domain.OperateLogEntity">
         select

smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/TableColumnMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="net.lab1024.sa.base.module.support.table.TableColumnDao">
+<mapper namespace="net.lab1024.sa.base.module.support.table.dao.TableColumnDao">
     <delete id="deleteTableColumn">
         delete
         from t_table_column

smart-admin-api-java17-springboot3/sa-base/src/main/resources/pre/sa-base.yaml

@@ -1,22 +1,41 @@
 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
+    type: com.alibaba.druid.pool.DruidDataSource
-    username: root
-    password: SmartAdmin666
     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:
-      username: druid
+      # 主数据源
-      password: 1024
+      master:
-      login:
+        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: false
+        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
+      # Druid监控
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        login-username: druid
+        login-password: 1024
+        web-stat-filter:
+          enabled: true
+          url-pattern: /*
+          exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
       method:
         pointcut: net.lab1024.sa..*Service.*
 

smart-admin-api-java17-springboot3/sa-base/src/main/resources/prod/sa-base.yaml

@@ -1,22 +1,41 @@
 spring:
   # 数据库连接信息
   datasource:
-    url: jdbc: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
+    type: com.alibaba.druid.pool.DruidDataSource
-    username: root
+    driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    password: SmartAdmin666
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10
-    min-idle: 10
-    max-active: 100
-    max-wait: 60000
-    time-between-eviction-runs-millis: 60000
-    min-evictable-idle-time-millis: 300000
-    filters: stat
     druid:
-      username: druid
+      # 主数据源
-      password: 1024lab
+      master:
-      login:
+        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: false
+        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
+      # Druid监控
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        login-username: druid
+        login-password: 1024
+        web-stat-filter:
+          enabled: true
+          url-pattern: /*
+          exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
       method:
         pointcut: net.lab1024.sa..*Service.*
 

smart-admin-api-java17-springboot3/sa-base/src/main/resources/test/sa-base.yaml

@@ -1,22 +1,41 @@
 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
+    type: com.alibaba.druid.pool.DruidDataSource
-    username: root
-    password: SmartAdmin666
     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:
-      username: druid
+      # 主数据源
-      password: 1024
+      master:
-      login:
+        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: false
+        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
+      # Druid监控
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        login-username: druid
+        login-password: 1024
+        web-stat-filter:
+          enabled: true
+          url-pattern: /*
+          exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
       method:
         pointcut: net.lab1024.sa..*Service.*