From a910a70c853a50a563dfccd5e3db4530be69662d Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Mon, 25 Mar 2024 20:02:47 +0800 Subject: [PATCH] =?UTF-8?q?feat=20:=20=E5=B0=86=E9=AA=8C=E8=AF=81=E7=A0=81?= =?UTF-8?q?=E6=94=B9=E7=AE=80=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/admin-api/pom.xml | 5 -- .../controller/MapperSwitchController.java | 2 +- .../admin/entity}/dto/MappingSwitchDto.java | 2 +- .../admin/service/MappingSwitchService.java | 2 +- .../impl/MappingSwitchServiceImpl.java | 6 +-- .../fateverse/auth/config/CaptchaConfig.java | 2 +- sql/log.sql | 51 +++++++------------ 7 files changed, 23 insertions(+), 47 deletions(-) rename admin/{admin-api/src/main/java/cn/fateverse/admin => admin-biz/src/main/java/cn/fateverse/admin/entity}/dto/MappingSwitchDto.java (95%) diff --git a/admin/admin-api/pom.xml b/admin/admin-api/pom.xml index b2f0df0..99fdf4a 100644 --- a/admin/admin-api/pom.xml +++ b/admin/admin-api/pom.xml @@ -25,10 +25,5 @@ common-swagger true - - cn.fateverse - common-decrypt - - \ No newline at end of file diff --git a/admin/admin-biz/src/main/java/cn/fateverse/admin/controller/MapperSwitchController.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/controller/MapperSwitchController.java index 3b348f3..15630a1 100644 --- a/admin/admin-biz/src/main/java/cn/fateverse/admin/controller/MapperSwitchController.java +++ b/admin/admin-biz/src/main/java/cn/fateverse/admin/controller/MapperSwitchController.java @@ -1,6 +1,6 @@ package cn.fateverse.admin.controller; -import cn.fateverse.admin.dto.MappingSwitchDto; +import cn.fateverse.admin.entity.dto.MappingSwitchDto; import cn.fateverse.admin.entity.vo.MappingSwitchVo; import cn.fateverse.admin.query.MappingSwitchQuery; import cn.fateverse.admin.service.MappingSwitchService; diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/dto/MappingSwitchDto.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/entity/dto/MappingSwitchDto.java similarity index 95% rename from admin/admin-api/src/main/java/cn/fateverse/admin/dto/MappingSwitchDto.java rename to admin/admin-biz/src/main/java/cn/fateverse/admin/entity/dto/MappingSwitchDto.java index 475fd56..5f9005e 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/dto/MappingSwitchDto.java +++ b/admin/admin-biz/src/main/java/cn/fateverse/admin/entity/dto/MappingSwitchDto.java @@ -1,4 +1,4 @@ -package cn.fateverse.admin.dto; +package cn.fateverse.admin.entity.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/admin/admin-biz/src/main/java/cn/fateverse/admin/service/MappingSwitchService.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/service/MappingSwitchService.java index 8941c93..bc549d9 100644 --- a/admin/admin-biz/src/main/java/cn/fateverse/admin/service/MappingSwitchService.java +++ b/admin/admin-biz/src/main/java/cn/fateverse/admin/service/MappingSwitchService.java @@ -1,6 +1,6 @@ package cn.fateverse.admin.service; -import cn.fateverse.admin.dto.MappingSwitchDto; +import cn.fateverse.admin.entity.dto.MappingSwitchDto; import cn.fateverse.admin.entity.vo.MappingSwitchVo; import cn.fateverse.admin.query.MappingSwitchQuery; import cn.fateverse.common.core.result.page.TableDataInfo; diff --git a/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/MappingSwitchServiceImpl.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/MappingSwitchServiceImpl.java index e144027..38c83fc 100644 --- a/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/MappingSwitchServiceImpl.java +++ b/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/MappingSwitchServiceImpl.java @@ -1,16 +1,13 @@ package cn.fateverse.admin.service.impl; -import cn.fateverse.admin.dto.MappingSwitchDto; +import cn.fateverse.admin.entity.dto.MappingSwitchDto; import cn.fateverse.admin.entity.vo.MappingSwitchVo; import cn.fateverse.admin.query.MappingSwitchQuery; import cn.fateverse.admin.service.MappingSwitchService; -import cn.fateverse.common.core.constant.UserConstants; import cn.fateverse.common.core.entity.PageInfo; import cn.fateverse.common.core.exception.CustomException; import cn.fateverse.common.core.result.page.TableDataInfo; -import cn.fateverse.common.core.utils.ReflectUserUtils; import cn.fateverse.common.core.utils.TableSupport; -import cn.fateverse.common.log.enums.OperateType; import cn.fateverse.common.mybatis.utils.PageUtils; import cn.fateverse.common.security.entity.MappingSwitchInfo; import cn.fateverse.common.security.utils.SecurityUtils; @@ -19,7 +16,6 @@ import org.jetbrains.annotations.NotNull; import org.springframework.data.redis.core.Cursor; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.ScanOptions; -import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; diff --git a/auth/src/main/java/cn/fateverse/auth/config/CaptchaConfig.java b/auth/src/main/java/cn/fateverse/auth/config/CaptchaConfig.java index be546d2..fd78645 100644 --- a/auth/src/main/java/cn/fateverse/auth/config/CaptchaConfig.java +++ b/auth/src/main/java/cn/fateverse/auth/config/CaptchaConfig.java @@ -34,7 +34,7 @@ public class CaptchaConfig { //鱼眼 com.google.code.kaptcha.impl.FishEyeGimpy //阴影 com.google.code.kaptcha.impl.ShadowGimpy // properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_STRING,"123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ#$!@&%"); - properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_STRING,"123456789#$@&%"); + properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_STRING,"1234567890"); properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.ShadowGimpy"); DefaultKaptcha defaultKaptcha = new DefaultKaptcha(); Config config = new Config(properties); diff --git a/sql/log.sql b/sql/log.sql index 5f3110b..c6c1f37 100644 --- a/sql/log.sql +++ b/sql/log.sql @@ -1,39 +1,22 @@ /* Navicat Premium Data Transfer - Source Server : fateverse-demo + Source Server : fateverse Source Server Type : MySQL Source Server Version : 80036 - Source Host : 10.7.127.184:3307 - Source Schema : fateverse_demo_log + Source Host : 10.7.127.184:3306 + Source Schema : fateverse_log Target Server Type : MySQL Target Server Version : 80036 File Encoding : 65001 - Date: 01/02/2024 11:33:29 + Date: 25/03/2024 14:34:46 */ SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; --- ---------------------------- --- Table structure for sys_login_infor --- ---------------------------- -DROP TABLE IF EXISTS `sys_login_infor`; -CREATE TABLE `sys_login_infor` ( - `info_id` bigint NOT NULL COMMENT '访问ID', - `user_name` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '用户账号', - `ipaddr` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '登录IP地址', - `login_location` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '登录地点', - `browser` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '浏览器类型', - `os` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '操作系统', - `state` char(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '0' COMMENT '登录状态（0成功 1失败）', - `msg` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '提示消息', - `login_time` datetime NULL DEFAULT NULL COMMENT '访问时间', - PRIMARY KEY (`info_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '系统访问记录' ROW_FORMAT = Dynamic; - -- ---------------------------- -- Table structure for sys_login_infor_1 -- ---------------------------- @@ -49,7 +32,7 @@ CREATE TABLE `sys_login_infor_1` ( `msg` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '提示消息', `login_time` datetime NULL DEFAULT NULL COMMENT '访问时间', PRIMARY KEY (`info_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '系统访问记录' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '系统访问记录' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Table structure for sys_login_infor_2 @@ -66,7 +49,7 @@ CREATE TABLE `sys_login_infor_2` ( `msg` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '提示消息', `login_time` datetime NULL DEFAULT NULL COMMENT '访问时间', PRIMARY KEY (`info_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '系统访问记录' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '系统访问记录' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Table structure for sys_operation_log_1 @@ -75,6 +58,7 @@ DROP TABLE IF EXISTS `sys_operation_log_1`; CREATE TABLE `sys_operation_log_1` ( `oper_id` bigint NOT NULL COMMENT '日志主键', `title` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '模块标题', + `application_name` varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '应用名称', `business_type` int NULL DEFAULT 0 COMMENT '业务类型（0其它 1新增 2修改 3删除）', `method` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '方法名称', `request_method` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '请求方式', @@ -84,15 +68,15 @@ CREATE TABLE `sys_operation_log_1` ( `oper_url` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '请求URL', `oper_ip` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '主机地址', `oper_location` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '操作地点', - `oper_param` longblob NULL COMMENT '请求参数', - `json_result` longblob NULL COMMENT '返回参数', + `oper_param` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '请求参数', + `json_result` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '返回参数', `state` int NULL DEFAULT 0 COMMENT '操作状态（0正常 1异常）', - `error_msg` longblob NULL COMMENT '错误消息', - `error_stack_trace` longblob NULL COMMENT '错误异常栈', + `error_msg` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '错误消息', + `error_stack_trace` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '错误异常栈', `oper_time` datetime NULL DEFAULT NULL COMMENT '操作时间', `consume_time` bigint NULL DEFAULT NULL COMMENT '消耗时间', PRIMARY KEY (`oper_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '操作日志记录' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '操作日志记录' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Table structure for sys_operation_log_2 @@ -101,6 +85,7 @@ DROP TABLE IF EXISTS `sys_operation_log_2`; CREATE TABLE `sys_operation_log_2` ( `oper_id` bigint NOT NULL COMMENT '日志主键', `title` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '模块标题', + `application_name` varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '应用名称', `business_type` int NULL DEFAULT 0 COMMENT '业务类型（0其它 1新增 2修改 3删除）', `method` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '方法名称', `request_method` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '请求方式', @@ -110,14 +95,14 @@ CREATE TABLE `sys_operation_log_2` ( `oper_url` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '请求URL', `oper_ip` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '主机地址', `oper_location` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '操作地点', - `oper_param` longblob NULL COMMENT '请求参数', - `json_result` longblob NULL COMMENT '返回参数', + `oper_param` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '请求参数', + `json_result` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '返回参数', `state` int NULL DEFAULT 0 COMMENT '操作状态（0正常 1异常）', - `error_msg` longblob NULL COMMENT '错误消息', + `error_msg` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '错误消息', + `error_stack_trace` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '错误异常栈', `oper_time` datetime NULL DEFAULT NULL COMMENT '操作时间', `consume_time` bigint NULL DEFAULT NULL COMMENT '消耗时间', - `error_stack_trace` longblob NULL COMMENT '错误异常栈', PRIMARY KEY (`oper_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '操作日志记录' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '操作日志记录' ROW_FORMAT = DYNAMIC; SET FOREIGN_KEY_CHECKS = 1;