From 477c18f08b2918f24f56d4e082146cdd35b0264c Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Thu, 06 Jun 2024 12:01:50 +0800
Subject: [PATCH] 错误引入信息清除
---
blade-auth/src/main/java/org/springblade/auth/granter/BladeTokenGranter.java | 1
blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java | 2
blade-auth/src/main/java/org/springblade/system/controller/RoleController.java | 2
blade-auth/src/main/java/org/springblade/system/dto/RoleMenuDTO.java | 0
blade-auth/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java | 32 ++--------
blade-auth/src/main/java/org/springblade/system/wrapper/DeptWrapper.java | 18 -----
blade-auth/src/main/java/org/springblade/auth/config/BladeAuthorizationServerConfiguration.java | 2
blade-auth/src/main/java/org/springblade/system/dto/RoleDTO.java | 0
blade-auth/src/main/java/org/springblade/system/user/entity/User.java | 5 +
blade-auth/src/main/java/org/springblade/system/dto/PostDTO.java | 0
blade-auth/src/main/java/org/springblade/system/controller/TenantController.java | 4
blade-auth/src/main/java/org/springblade/system/user/cache/UserCache.java | 18 ------
blade-auth/src/main/java/org/springblade/system/wrapper/RegionWrapper.java | 18 -----
blade-auth/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java | 19 ------
blade-auth/src/main/java/org/springblade/system/entity/AuthClient.java | 5 +
blade-auth/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java | 7 -
blade-auth/src/main/java/org/springblade/system/mapper/MenuMapper.java | 1
blade-auth/src/main/java/org/springblade/system/dto/MenuDTO.java | 0
blade-auth/src/main/java/org/springblade/system/wrapper/MenuWrapper.java | 18 -----
blade-auth/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java | 5 -
blade-auth/src/main/java/org/springblade/system/dto/DeptDTO.java | 0
blade-auth/src/main/java/org/springblade/system/dto/ParamDTO.java | 0
blade-auth/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java | 5 -
23 files changed, 30 insertions(+), 132 deletions(-)
diff --git a/blade-auth/src/main/java/org/springblade/auth/config/BladeAuthorizationServerConfiguration.java b/blade-auth/src/main/java/org/springblade/auth/config/BladeAuthorizationServerConfiguration.java
index fdb4544..de74a42 100644
--- a/blade-auth/src/main/java/org/springblade/auth/config/BladeAuthorizationServerConfiguration.java
+++ b/blade-auth/src/main/java/org/springblade/auth/config/BladeAuthorizationServerConfiguration.java
@@ -20,10 +20,8 @@
import lombok.SneakyThrows;
import org.springblade.auth.constant.AuthConstant;
import org.springblade.auth.granter.BladeTokenGranter;
-//import org.springblade.auth.service.BladeClientDetailsServiceImpl;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.social.props.SocialProperties;
-import org.springblade.system.user.feign.IUserClient;
import org.springblade.system.user.service.IUserService;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/blade-auth/src/main/java/org/springblade/auth/granter/BladeTokenGranter.java b/blade-auth/src/main/java/org/springblade/auth/granter/BladeTokenGranter.java
index e672314..6c73fca 100644
--- a/blade-auth/src/main/java/org/springblade/auth/granter/BladeTokenGranter.java
+++ b/blade-auth/src/main/java/org/springblade/auth/granter/BladeTokenGranter.java
@@ -18,7 +18,6 @@
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.social.props.SocialProperties;
-import org.springblade.system.user.feign.IUserClient;
import org.springblade.system.user.service.IUserService;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer;
diff --git a/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java b/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java
index bc54b1c..f306ecb 100644
--- a/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java
+++ b/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java
@@ -27,7 +27,7 @@
import org.springblade.core.jwt.props.JwtProperties;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.tool.utils.*;
-import org.springblade.system.cache.ParamCache;
+import org.springblade.common.cache.ParamCache;
import org.springblade.system.entity.Tenant;
import org.springblade.system.service.IRoleService;
import org.springblade.system.service.ITenantService;
diff --git a/blade-auth/src/main/java/org/springblade/system/controller/RoleController.java b/blade-auth/src/main/java/org/springblade/system/controller/RoleController.java
index ff1cce0..7c269be 100644
--- a/blade-auth/src/main/java/org/springblade/system/controller/RoleController.java
+++ b/blade-auth/src/main/java/org/springblade/system/controller/RoleController.java
@@ -13,7 +13,7 @@
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.utils.Func;
-import org.springblade.system.cache.SysCache;
+import org.springblade.common.cache.SysCache;
import org.springblade.system.entity.Role;
import org.springblade.system.service.IRoleService;
import org.springblade.system.user.cache.UserCache;
diff --git a/blade-auth/src/main/java/org/springblade/system/controller/TenantController.java b/blade-auth/src/main/java/org/springblade/system/controller/TenantController.java
index 423497c..60fb624 100644
--- a/blade-auth/src/main/java/org/springblade/system/controller/TenantController.java
+++ b/blade-auth/src/main/java/org/springblade/system/controller/TenantController.java
@@ -48,8 +48,8 @@
import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
import static org.springblade.core.tenant.constant.TenantBaseConstant.TENANT_DATASOURCE_CACHE;
import static org.springblade.core.tenant.constant.TenantBaseConstant.TENANT_DATASOURCE_EXIST_KEY;
-import static org.springblade.system.cache.SysCache.TENANT_PACKAGE_ID;
-import static org.springblade.system.cache.SysCache.TENANT_TENANT_ID;
+import static org.springblade.common.cache.SysCache.TENANT_PACKAGE_ID;
+import static org.springblade.common.cache.SysCache.TENANT_TENANT_ID;
/**
* 控制器
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/dto/DeptDTO.java b/blade-auth/src/main/java/org/springblade/system/dto/DeptDTO.java
similarity index 100%
rename from blade-service-api/blade-system-api/src/main/java/org/springblade/system/dto/DeptDTO.java
rename to blade-auth/src/main/java/org/springblade/system/dto/DeptDTO.java
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/dto/MenuDTO.java b/blade-auth/src/main/java/org/springblade/system/dto/MenuDTO.java
similarity index 100%
rename from blade-service-api/blade-system-api/src/main/java/org/springblade/system/dto/MenuDTO.java
rename to blade-auth/src/main/java/org/springblade/system/dto/MenuDTO.java
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/dto/ParamDTO.java b/blade-auth/src/main/java/org/springblade/system/dto/ParamDTO.java
similarity index 100%
rename from blade-service-api/blade-system-api/src/main/java/org/springblade/system/dto/ParamDTO.java
rename to blade-auth/src/main/java/org/springblade/system/dto/ParamDTO.java
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/dto/PostDTO.java b/blade-auth/src/main/java/org/springblade/system/dto/PostDTO.java
similarity index 100%
rename from blade-service-api/blade-system-api/src/main/java/org/springblade/system/dto/PostDTO.java
rename to blade-auth/src/main/java/org/springblade/system/dto/PostDTO.java
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/dto/RoleDTO.java b/blade-auth/src/main/java/org/springblade/system/dto/RoleDTO.java
similarity index 100%
rename from blade-service-api/blade-system-api/src/main/java/org/springblade/system/dto/RoleDTO.java
rename to blade-auth/src/main/java/org/springblade/system/dto/RoleDTO.java
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/dto/RoleMenuDTO.java b/blade-auth/src/main/java/org/springblade/system/dto/RoleMenuDTO.java
similarity index 100%
rename from blade-service-api/blade-system-api/src/main/java/org/springblade/system/dto/RoleMenuDTO.java
rename to blade-auth/src/main/java/org/springblade/system/dto/RoleMenuDTO.java
diff --git a/blade-auth/src/main/java/org/springblade/system/entity/AuthClient.java b/blade-auth/src/main/java/org/springblade/system/entity/AuthClient.java
index 3164841..939fb66 100644
--- a/blade-auth/src/main/java/org/springblade/system/entity/AuthClient.java
+++ b/blade-auth/src/main/java/org/springblade/system/entity/AuthClient.java
@@ -48,6 +48,11 @@
@ApiModelProperty(value = "客户端密钥")
private String clientSecret;
/**
+ * 客户端名称
+ */
+ @ApiModelProperty(value = "客户端名称")
+ private String clientName;
+ /**
* 资源集合
*/
@ApiModelProperty(value = "资源集合")
diff --git a/blade-auth/src/main/java/org/springblade/system/mapper/MenuMapper.java b/blade-auth/src/main/java/org/springblade/system/mapper/MenuMapper.java
index c4f9850..58a841c 100644
--- a/blade-auth/src/main/java/org/springblade/system/mapper/MenuMapper.java
+++ b/blade-auth/src/main/java/org/springblade/system/mapper/MenuMapper.java
@@ -21,7 +21,6 @@
import org.springblade.system.dto.MenuDTO;
import org.springblade.system.entity.Menu;
import org.springblade.system.vo.MenuVO;
-
import java.util.List;
import java.util.Map;
diff --git a/blade-auth/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java b/blade-auth/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java
index 1fde029..edd9dab 100644
--- a/blade-auth/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java
+++ b/blade-auth/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java
@@ -1,31 +1,14 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
package org.springblade.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-//import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.node.ForestNodeMerger;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
-import org.springblade.system.cache.SysCache;
+import org.springblade.common.cache.SysCache;
import org.springblade.system.entity.Dept;
import org.springblade.system.mapper.DeptMapper;
import org.springblade.system.service.IDeptService;
diff --git a/blade-auth/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java b/blade-auth/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java
index a3acb62..9197308 100644
--- a/blade-auth/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java
+++ b/blade-auth/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java
@@ -29,8 +29,7 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.system.cache.SysCache;
-import org.springblade.system.dto.MenuDTO;
+import org.springblade.common.cache.SysCache;
import org.springblade.system.entity.*;
import org.springblade.system.mapper.MenuMapper;
import org.springblade.system.service.IMenuService;
@@ -41,7 +40,7 @@
import org.springblade.system.wrapper.MenuWrapper;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
-
+import org.springblade.system.dto.MenuDTO;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/blade-auth/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java b/blade-auth/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java
index 3c5cf9a..2264898 100644
--- a/blade-auth/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java
+++ b/blade-auth/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java
@@ -19,7 +19,6 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-//import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
@@ -29,12 +28,10 @@
import org.springblade.system.service.IRegionService;
import org.springblade.system.vo.RegionVO;
import org.springframework.stereotype.Service;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-
-import static org.springblade.system.cache.RegionCache.*;
+import static org.springblade.common.cache.RegionCache.*;
/**
diff --git a/blade-auth/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java b/blade-auth/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
index ea883c3..8885c36 100644
--- a/blade-auth/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
+++ b/blade-auth/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
@@ -1,19 +1,3 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
package org.springblade.system.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -21,23 +5,21 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.AllArgsConstructor;
import org.springblade.core.cache.utils.CacheUtil;
-//import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.tenant.TenantId;
-import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.DesUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.system.cache.ParamCache;
+import org.springblade.common.cache.ParamCache;
import org.springblade.system.entity.*;
import org.springblade.system.mapper.TenantMapper;
import org.springblade.system.service.*;
import org.springblade.system.user.entity.User;
import org.springblade.system.user.enums.UserEnum;
-import org.springblade.system.user.feign.IUserClient;
+import org.springblade.system.user.service.IUserService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -66,7 +48,7 @@
private final IPostService postService;
private final IRoleMenuService roleMenuService;
private final IDictBizService dictBizService;
- private final IUserClient userClient;
+ private final IUserService userClient;
@Override
public IPage<Tenant> selectTenantPage(IPage<Tenant> page, Tenant tenant) {
@@ -151,8 +133,8 @@
user.setUserType(UserEnum.WEB.getCategory());
user.setIsDeleted(BladeConstant.DB_NOT_DELETED);
boolean temp = super.saveOrUpdate(tenant);
- R<Boolean> result = userClient.saveUser(user);
- if (!result.isSuccess()) {
+ boolean result = userClient.save(user);
+ if (!result) {
// throw new ServiceException(result.getMsg());
}
return temp;
@@ -172,8 +154,8 @@
// throw new ServiceException("不可删除管理租户!");
}
boolean tenantTemp = this.deleteLogic(ids);
- R<Boolean> result = userClient.removeUser(StringUtil.join(tenantIds));
- if (!result.isSuccess()) {
+ Boolean result = userClient.removeUser(StringUtil.join(tenantIds));
+ if (!result) {
// throw new ServiceException(result.getMsg());
}
return tenantTemp;
diff --git a/blade-auth/src/main/java/org/springblade/system/user/cache/UserCache.java b/blade-auth/src/main/java/org/springblade/system/user/cache/UserCache.java
index c5a9096..6746dd7 100644
--- a/blade-auth/src/main/java/org/springblade/system/user/cache/UserCache.java
+++ b/blade-auth/src/main/java/org/springblade/system/user/cache/UserCache.java
@@ -1,29 +1,11 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
package org.springblade.system.user.cache;
import org.springblade.core.cache.utils.CacheUtil;
-import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.core.tool.utils.StringPool;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.system.user.entity.User;
-import org.springblade.system.user.feign.IUserClient;
import org.springblade.system.user.service.IUserService;
import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;
diff --git a/blade-auth/src/main/java/org/springblade/system/user/entity/User.java b/blade-auth/src/main/java/org/springblade/system/user/entity/User.java
index 576b32d..e3bb95b 100644
--- a/blade-auth/src/main/java/org/springblade/system/user/entity/User.java
+++ b/blade-auth/src/main/java/org/springblade/system/user/entity/User.java
@@ -92,5 +92,10 @@
*/
private String postId;
+ /**
+ * 客户端id
+ */
+ private String clientId;
+
}
diff --git a/blade-auth/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/blade-auth/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
index 7666426..93608d6 100644
--- a/blade-auth/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
+++ b/blade-auth/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
@@ -30,18 +30,15 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tenant.BladeTenantProperties;
-import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.*;
-import org.springblade.system.cache.ParamCache;
-import org.springblade.system.cache.SysCache;
+import org.springblade.common.cache.ParamCache;
+import org.springblade.common.cache.SysCache;
import org.springblade.system.entity.Tenant;
import org.springblade.system.enums.DictEnum;
-import org.springblade.system.feign.ISysClient;
import org.springblade.system.service.IRoleService;
-import org.springblade.system.service.ITenantService;
import org.springblade.system.user.cache.UserCache;
import org.springblade.system.user.entity.*;
import org.springblade.system.user.enums.UserEnum;
diff --git a/blade-auth/src/main/java/org/springblade/system/wrapper/DeptWrapper.java b/blade-auth/src/main/java/org/springblade/system/wrapper/DeptWrapper.java
index db44a74..45e13bb 100644
--- a/blade-auth/src/main/java/org/springblade/system/wrapper/DeptWrapper.java
+++ b/blade-auth/src/main/java/org/springblade/system/wrapper/DeptWrapper.java
@@ -1,19 +1,3 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
package org.springblade.system.wrapper;
import org.springblade.core.mp.support.BaseEntityWrapper;
@@ -22,7 +6,7 @@
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.common.cache.DictCache;
-import org.springblade.system.cache.SysCache;
+import org.springblade.common.cache.SysCache;
import org.springblade.system.entity.Dept;
import org.springblade.system.enums.DictEnum;
import org.springblade.system.vo.DeptVO;
diff --git a/blade-auth/src/main/java/org/springblade/system/wrapper/MenuWrapper.java b/blade-auth/src/main/java/org/springblade/system/wrapper/MenuWrapper.java
index 937055a..9cd8a2f 100644
--- a/blade-auth/src/main/java/org/springblade/system/wrapper/MenuWrapper.java
+++ b/blade-auth/src/main/java/org/springblade/system/wrapper/MenuWrapper.java
@@ -1,19 +1,3 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
package org.springblade.system.wrapper;
import org.springblade.core.mp.support.BaseEntityWrapper;
@@ -22,7 +6,7 @@
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.common.cache.DictCache;
-import org.springblade.system.cache.SysCache;
+import org.springblade.common.cache.SysCache;
import org.springblade.system.entity.Menu;
import org.springblade.system.enums.DictEnum;
import org.springblade.system.vo.MenuVO;
diff --git a/blade-auth/src/main/java/org/springblade/system/wrapper/RegionWrapper.java b/blade-auth/src/main/java/org/springblade/system/wrapper/RegionWrapper.java
index d78c82c..0dc4221 100644
--- a/blade-auth/src/main/java/org/springblade/system/wrapper/RegionWrapper.java
+++ b/blade-auth/src/main/java/org/springblade/system/wrapper/RegionWrapper.java
@@ -1,25 +1,9 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
package org.springblade.system.wrapper;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.node.ForestNodeMerger;
import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.system.cache.RegionCache;
+import org.springblade.common.cache.RegionCache;
import org.springblade.system.entity.Region;
import org.springblade.system.vo.RegionVO;
--
Gitblit v1.9.3