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

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

@@ -25,10 +25,5 @@
<artifactId>common-swagger</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>cn.fateverse</groupId>
<artifactId>common-decrypt</artifactId>
<!-- <optional>true</optional>-->
</dependency>
</dependencies>
</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;
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;

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.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;
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;

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;
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;