mirror of
				https://github.com/continew-org/continew-admin.git
				synced 2025-10-31 22:57:17 +08:00 
			
		
		
		
	build: continew-starter 2.13.2 => 2.13.3
1.EncryptHelper 包位置调整 2.Starter加密已支持密码编码器,移除 BCryptEncryptor,使用 FieldEncrypt(Algorithm.PASSWORD_ENCODER) 3.Starter优化:MenuServiceImpl 重写 tree 方法,采用单根节点树 4.Starter修复:移除 DeptResp、MenuResp 内 getId 方法 5.其他 Starter 隐式修复
This commit is contained in:
		| @@ -21,11 +21,11 @@ import com.baomidou.mybatisplus.annotation.TableField; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | ||||
| import lombok.Data; | ||||
| import top.continew.admin.common.base.model.entity.TenantBaseDO; | ||||
| import top.continew.admin.common.config.mybatis.BCryptEncryptor; | ||||
| import top.continew.admin.common.enums.DisEnableStatusEnum; | ||||
| import top.continew.admin.common.enums.GenderEnum; | ||||
| import top.continew.starter.extension.crud.annotation.DictModel; | ||||
| import top.continew.starter.security.crypto.annotation.FieldEncrypt; | ||||
| import top.continew.starter.security.crypto.enums.Algorithm; | ||||
|  | ||||
| import java.io.Serial; | ||||
| import java.time.LocalDateTime; | ||||
| @@ -57,7 +57,7 @@ public class UserDO extends TenantBaseDO { | ||||
|     /** | ||||
|      * 密码 | ||||
|      */ | ||||
|     @FieldEncrypt(encryptor = BCryptEncryptor.class) | ||||
|     @FieldEncrypt(Algorithm.PASSWORD_ENCODER) | ||||
|     private String password; | ||||
|  | ||||
|     /** | ||||
|   | ||||
| @@ -83,10 +83,4 @@ public class DeptResp extends BaseDetailResp { | ||||
|     @Schema(description = "描述", example = "测试部描述信息") | ||||
|     @ExcelProperty(value = "描述", order = 8) | ||||
|     private String description; | ||||
|  | ||||
|     // TODO 临时修复,等待 ContiNew Starter 2.13.3 发布移除 | ||||
|     @Override | ||||
|     public Long getId() { | ||||
|         return super.getId(); | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -122,10 +122,4 @@ public class MenuResp extends BaseResp { | ||||
|      */ | ||||
|     @Schema(description = "状态", example = "1") | ||||
|     private DisEnableStatusEnum status; | ||||
|  | ||||
|     // TODO 临时修复,等待 ContiNew Starter 2.13.3 发布移除 | ||||
|     @Override | ||||
|     public Long getId() { | ||||
|         return super.getId(); | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -18,6 +18,7 @@ package top.continew.admin.system.service.impl; | ||||
|  | ||||
| import cn.hutool.core.bean.BeanUtil; | ||||
| import cn.hutool.core.collection.CollUtil; | ||||
| import cn.hutool.core.lang.tree.Tree; | ||||
| import cn.hutool.core.util.StrUtil; | ||||
| import com.alicp.jetcache.anno.Cached; | ||||
| import jakarta.annotation.Resource; | ||||
| @@ -42,6 +43,7 @@ import top.continew.starter.cache.redisson.util.RedisUtils; | ||||
| import top.continew.starter.core.constant.StringConstants; | ||||
| import top.continew.starter.core.util.CollUtils; | ||||
| import top.continew.starter.core.util.validation.CheckUtils; | ||||
| import top.continew.starter.extension.crud.model.query.SortQuery; | ||||
|  | ||||
| import java.util.List; | ||||
| import java.util.Set; | ||||
| @@ -60,6 +62,11 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, MenuDO, MenuRes | ||||
|     @Resource | ||||
|     private RoleService roleService; | ||||
|  | ||||
|     @Override | ||||
|     public List<Tree<Long>> tree(MenuQuery query, SortQuery sortQuery, boolean isSimple) { | ||||
|         return this.tree(query, sortQuery, isSimple, true); | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public Long create(MenuReq req) { | ||||
|         this.checkTitleRepeat(req.getTitle(), req.getParentId(), null); | ||||
|   | ||||
| @@ -85,7 +85,7 @@ import top.continew.starter.core.util.validation.CheckUtils; | ||||
| import top.continew.starter.extension.crud.model.query.PageQuery; | ||||
| import top.continew.starter.extension.crud.model.query.SortQuery; | ||||
| import top.continew.starter.extension.crud.model.resp.PageResp; | ||||
| import top.continew.starter.security.crypto.utils.EncryptHelper; | ||||
| import top.continew.starter.security.crypto.util.EncryptHelper; | ||||
|  | ||||
| import java.io.IOException; | ||||
| import java.time.Duration; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user