clay/fateverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/clay' into clay

Browse Source 
# Conflicts:
#	auth/src/main/java/cn/fateverse/auth/config/CaptchaConfig.java
#	visual/pom.xml
This commit is contained in:
clay
2024-04-10 14:31:57 +08:00
parent cde8e3a928 a910a70c85
commit e29ad1565f
8 changed files with 32 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
README.md
View File

@@ -8,6 +8,15 @@
## 快速开始 ## 快速开始
### 相关地址
- 演示地址:
1. vue版本 [http://vue.fateverse.cn/](http://vue.fateverse.cn/)
- 项目地址:
- 前端gitee地址: [https://gitee.com/fateverse/fateverse-vue](https://gitee.com/fateverse/fateverse-vue)
- 后端gitee地址: [https://gitee.com/fateverse/fateverse](https://gitee.com/fateverse/fateverse)
- 前端github地址: [https://github.com/fateverse/fateverse-vue](https://github.com/fateverse/fateverse-vue)
- 后端github地址: [https://github.com/fateverse/fateverse](https://github.com/fateverse/fateverse)
### 核心依赖 ### 核心依赖
| 依赖 | 版本 | | 依赖 | 版本 |

5
admin/admin-api/pom.xml
View File

@@ -25,10 +25,5 @@
<artifactId>common-swagger</artifactId> <artifactId>common-swagger</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>cn.fateverse</groupId>
<artifactId>common-decrypt</artifactId>
<!-- <optional>true</optional>-->
</dependency>
</dependencies> </dependencies>
</project> </project>

2
admin/admin-biz/src/main/java/cn/fateverse/admin/controller/MapperSwitchController.java
View File

@@ -1,6 +1,6 @@
package cn.fateverse.admin.controller; 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.entity.vo.MappingSwitchVo;
import cn.fateverse.admin.query.MappingSwitchQuery; import cn.fateverse.admin.query.MappingSwitchQuery;
import cn.fateverse.admin.service.MappingSwitchService; import cn.fateverse.admin.service.MappingSwitchService;

2
admin/admin-api/src/main/java/cn/fateverse/admin/dto/MappingSwitchDto.java → admin/admin-biz/src/main/java/cn/fateverse/admin/entity/dto/MappingSwitchDto.java
View File

@@ -1,4 +1,4 @@
package cn.fateverse.admin.dto; package cn.fateverse.admin.entity.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

2
admin/admin-biz/src/main/java/cn/fateverse/admin/service/MappingSwitchService.java
View File

@@ -1,6 +1,6 @@
package cn.fateverse.admin.service; 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.entity.vo.MappingSwitchVo;
import cn.fateverse.admin.query.MappingSwitchQuery; import cn.fateverse.admin.query.MappingSwitchQuery;
import cn.fateverse.common.core.result.page.TableDataInfo; import cn.fateverse.common.core.result.page.TableDataInfo;

6
admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/MappingSwitchServiceImpl.java
View File

@@ -1,16 +1,13 @@
package cn.fateverse.admin.service.impl; 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.entity.vo.MappingSwitchVo;
import cn.fateverse.admin.query.MappingSwitchQuery; import cn.fateverse.admin.query.MappingSwitchQuery;
import cn.fateverse.admin.service.MappingSwitchService; 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.entity.PageInfo;
import cn.fateverse.common.core.exception.CustomException; import cn.fateverse.common.core.exception.CustomException;
import cn.fateverse.common.core.result.page.TableDataInfo; 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.core.utils.TableSupport;
import cn.fateverse.common.log.enums.OperateType;
import cn.fateverse.common.mybatis.utils.PageUtils; import cn.fateverse.common.mybatis.utils.PageUtils;
import cn.fateverse.common.security.entity.MappingSwitchInfo; import cn.fateverse.common.security.entity.MappingSwitchInfo;
import cn.fateverse.common.security.utils.SecurityUtils; 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.Cursor;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.ScanOptions; import org.springframework.data.redis.core.ScanOptions;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;

1
notice/notice-biz/src/main/java/cn/fateverse/notice/handler/ChannelHandlerPool.java
View File

@@ -14,6 +14,7 @@ import io.netty.util.AttributeKey;
import io.netty.util.concurrent.GlobalEventExecutor; import io.netty.util.concurrent.GlobalEventExecutor;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Predicate; import java.util.function.Predicate;

51
sql/log.sql
View File

@@ -1,39 +1,22 @@
/* /*
Navicat Premium Data Transfer Navicat Premium Data Transfer
Source Server : fateverse-demo Source Server : fateverse
Source Server Type : MySQL Source Server Type : MySQL
Source Server Version : 80036 Source Server Version : 80036
Source Host : 10.7.127.184:3307 Source Host : 10.7.127.184:3306
Source Schema : fateverse_demo_log Source Schema : fateverse_log
Target Server Type : MySQL Target Server Type : MySQL
Target Server Version : 80036 Target Server Version : 80036
File Encoding : 65001 File Encoding : 65001
Date: 01/02/2024 11:33:29 Date: 25/03/2024 14:34:46
*/ */
SET NAMES utf8mb4; SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0; 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 -- 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 '提示消息', `msg` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '提示消息',
`login_time` datetime NULL DEFAULT NULL COMMENT '访问时间', `login_time` datetime NULL DEFAULT NULL COMMENT '访问时间',
PRIMARY KEY (`info_id`) USING BTREE 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 -- 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 '提示消息', `msg` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '提示消息',
`login_time` datetime NULL DEFAULT NULL COMMENT '访问时间', `login_time` datetime NULL DEFAULT NULL COMMENT '访问时间',
PRIMARY KEY (`info_id`) USING BTREE 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 -- 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` ( CREATE TABLE `sys_operation_log_1` (
`oper_id` bigint NOT NULL COMMENT '日志主键', `oper_id` bigint NOT NULL COMMENT '日志主键',
`title` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' 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删除）', `business_type` int NULL DEFAULT 0 COMMENT '业务类型（0其它 1新增 2修改 3删除）',
`method` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '方法名称', `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 '请求方式', `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_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_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_location` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '操作地点',
`oper_param` longblob NULL COMMENT '请求参数', `oper_param` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '请求参数',
`json_result` longblob NULL COMMENT '返回参数', `json_result` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '返回参数',
`state` int NULL DEFAULT 0 COMMENT '操作状态（0正常 1异常）', `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` longblob NULL COMMENT '错误异常栈', `error_stack_trace` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '错误异常栈',
`oper_time` datetime NULL DEFAULT NULL COMMENT '操作时间', `oper_time` datetime NULL DEFAULT NULL COMMENT '操作时间',
`consume_time` bigint NULL DEFAULT NULL COMMENT '消耗时间', `consume_time` bigint NULL DEFAULT NULL COMMENT '消耗时间',
PRIMARY KEY (`oper_id`) USING BTREE 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 -- 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` ( CREATE TABLE `sys_operation_log_2` (
`oper_id` bigint NOT NULL COMMENT '日志主键', `oper_id` bigint NOT NULL COMMENT '日志主键',
`title` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' 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删除）', `business_type` int NULL DEFAULT 0 COMMENT '业务类型（0其它 1新增 2修改 3删除）',
`method` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '方法名称', `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 '请求方式', `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_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_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_location` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '操作地点',
`oper_param` longblob NULL COMMENT '请求参数', `oper_param` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '请求参数',
`json_result` longblob NULL COMMENT '返回参数', `json_result` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '返回参数',
`state` int NULL DEFAULT 0 COMMENT '操作状态（0正常 1异常）', `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 '操作时间', `oper_time` datetime NULL DEFAULT NULL COMMENT '操作时间',
`consume_time` bigint NULL DEFAULT NULL COMMENT '消耗时间', `consume_time` bigint NULL DEFAULT NULL COMMENT '消耗时间',
`error_stack_trace` longblob NULL COMMENT '错误异常栈',
PRIMARY KEY (`oper_id`) USING BTREE 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; SET FOREIGN_KEY_CHECKS = 1;