ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-10-26 04:58:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

style: 优化全局代码格式

Browse Source
This commit is contained in:
Charles7c
2024-01-10 22:08:45 +08:00
parent 4fefdc75c2
commit 35e31233c5
97 changed files with 861 additions and 1127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/SpringCacheConfiguration.java
View File

@@ -58,8 +58,8 @@ public class SpringCacheConfiguration extends CachingConfigurerSupport {
@Bean
public RedisCacheConfiguration redisCacheConfiguration(CacheProperties cacheProperties) {
ObjectMapper objectMapperCopy = objectMapper.copy();
objectMapperCopy.activateDefaultTyping(objectMapperCopy.getPolymorphicTypeValidator(),
ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY);
objectMapperCopy.activateDefaultTyping(objectMapperCopy
.getPolymorphicTypeValidator(), ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY);
RedisCacheConfiguration redisCacheConfiguration = RedisCacheConfiguration.defaultCacheConfig()
.serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))
.serializeValuesWith(RedisSerializationContext.SerializationPair

16
continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/easyexcel/ExcelBaseEnumConverter.java
View File

@@ -52,8 +52,9 @@ public class ExcelBaseEnumConverter implements Converter<IBaseEnum<Integer>> {
* 转换为 Java 数据（读取 Excel）
*/
@Override
public IBaseEnum convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty,
GlobalConfiguration globalConfiguration) {
public IBaseEnum convertToJavaData(ReadCellData<?> cellData,
ExcelContentProperty contentProperty,
GlobalConfiguration globalConfiguration) {
return this.getEnum(IBaseEnum.class, Convert.toStr(cellData.getData()));
}
@@ -61,8 +62,9 @@ public class ExcelBaseEnumConverter implements Converter<IBaseEnum<Integer>> {
* 转换为 Excel 数据（写入 Excel）
*/
@Override
public WriteCellData<String> convertToExcelData(IBaseEnum<Integer> value, ExcelContentProperty contentProperty,
GlobalConfiguration globalConfiguration) {
public WriteCellData<String> convertToExcelData(IBaseEnum<Integer> value,
ExcelContentProperty contentProperty,
GlobalConfiguration globalConfiguration) {
if (null == value) {
return new WriteCellData<>(StringConstants.EMPTY);
}
@@ -72,10 +74,8 @@ public class ExcelBaseEnumConverter implements Converter<IBaseEnum<Integer>> {
/**
* 通过 value 获取枚举对象，获取不到时为 {@code null}
*
* @param enumType
* 枚举类型
* @param description
* 描述
* @param enumType 枚举类型
* @param description 描述
* @return 对应枚举 ，获取不到时为 {@code null}
*/
private IBaseEnum<Integer> getEnum(Class<?> enumType, String description) {

13
continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumDeserializer.java
View File

@@ -43,8 +43,8 @@ public class BaseEnumDeserializer extends JsonDeserializer<IBaseEnum> {
public static final BaseEnumDeserializer SERIALIZER_INSTANCE = new BaseEnumDeserializer();
@Override
public IBaseEnum deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
throws IOException {
public IBaseEnum deserialize(JsonParser jsonParser,
DeserializationContext deserializationContext) throws IOException {
Class<?> targetClass = jsonParser.getCurrentValue().getClass();
String fieldName = jsonParser.getCurrentName();
String value = jsonParser.getText();
@@ -54,12 +54,9 @@ public class BaseEnumDeserializer extends JsonDeserializer<IBaseEnum> {
/**
* 通过某字段对应值获取枚举实例，获取不到时为 {@code null}
*
* @param targetClass
* 目标类型
* @param value
* 字段值
* @param fieldName
* 字段名
* @param targetClass 目标类型
* @param value 字段值
* @param fieldName 字段名
* @return 对应枚举实例 ，获取不到时为 {@code null}
*/
private IBaseEnum getEnum(Class<?> targetClass, String value, String fieldName) {

5
continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/SimpleDeserializersWrapper.java
View File

@@ -49,8 +49,9 @@ import com.fasterxml.jackson.databind.type.ClassKey;
public class SimpleDeserializersWrapper extends SimpleDeserializers {
@Override
public JsonDeserializer<?> findEnumDeserializer(Class<?> type, DeserializationConfig config,
BeanDescription beanDesc) throws JsonMappingException {
public JsonDeserializer<?> findEnumDeserializer(Class<?> type,
DeserializationConfig config,
BeanDescription beanDesc) throws JsonMappingException {
JsonDeserializer<?> deser = super.findEnumDeserializer(type, config, beanDesc);
if (null != deser) {
return deser;

8
continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionFilterImpl.java
View File

@@ -49,9 +49,11 @@ public class DataPermissionFilterImpl implements DataPermissionFilter {
DataPermissionCurrentUser currentUser = new DataPermissionCurrentUser();
currentUser.setUserId(Convert.toStr(loginUser.getId()));
currentUser.setDeptId(Convert.toStr(loginUser.getDeptId()));
currentUser.setRoles(loginUser.getRoles().stream()
.map(r -> new DataPermissionCurrentUser.CurrentUserRole(Convert.toStr(r.getId()),
DataScope.valueOf(r.getDataScope().name())))
currentUser.setRoles(loginUser.getRoles()
.stream()
.map(r -> new DataPermissionCurrentUser.CurrentUserRole(Convert.toStr(r.getId()), DataScope.valueOf(r
.getDataScope()
.name())))
.collect(Collectors.toSet()));
return currentUser;
}

18
continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java
View File

@@ -48,8 +48,7 @@ public class MyBatisPlusMetaObjectHandler implements MetaObjectHandler {
/**
* 插入数据时填充
*
* @param metaObject
* 元对象
* @param metaObject 元对象
*/
@Override
public void insertFill(MetaObject metaObject) {
@@ -77,8 +76,7 @@ public class MyBatisPlusMetaObjectHandler implements MetaObjectHandler {
/**
* 修改数据时填充
*
* @param metaObject
* 元对象
* @param metaObject 元对象
*/
@Override
public void updateFill(MetaObject metaObject) {
@@ -106,14 +104,10 @@ public class MyBatisPlusMetaObjectHandler implements MetaObjectHandler {
/**
* 填充字段值
*
* @param metaObject
* 元数据对象
* @param fieldName
* 要填充的字段名
* @param fillFieldValue
* 要填充的字段值
* @param isOverride
* 如果字段值不为空，是否覆盖（true：覆盖；false：不覆盖）
* @param metaObject 元数据对象
* @param fieldName 要填充的字段名
* @param fillFieldValue 要填充的字段值
* @param isOverride 如果字段值不为空，是否覆盖（true：覆盖；false：不覆盖）
*/
private void fillFieldValue(MetaObject metaObject, String fieldName, Object fillFieldValue, boolean isOverride) {
if (metaObject.hasSetter(fieldName)) {

3
continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/resp/CaptchaResp.java
View File

@@ -47,7 +47,6 @@ public class CaptchaResp implements Serializable {
/**
* 验证码图片（Base64编码，带图片格式：data:image/gif;base64）
*/
@Schema(description = "验证码图片（Base64编码，带图片格式：data:image/gif;base64）",
example = "data:image/png;base64,iVBORw0KGgoAAAAN...")
@Schema(description = "验证码图片（Base64编码，带图片格式：data:image/gif;base64）", example = "data:image/png;base64,iVBORw0KGgoAAAAN...")
private String img;
}

21
continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/SecureUtils.java
View File

@@ -38,10 +38,8 @@ public class SecureUtils {
/**
* 公钥加密
*
* @param data
* 要加密的内容
* @param publicKey
* 公钥
* @param data 要加密的内容
* @param publicKey 公钥
* @return 公钥加密并 Base64 加密后的内容
*/
public static String encryptByRsaPublicKey(String data, String publicKey) {
@@ -51,8 +49,7 @@ public class SecureUtils {
/**
* 私钥解密
*
* @param data
* 要解密的内容（Base64 加密过）
* @param data 要解密的内容（Base64 加密过）
* @return 解密后的内容
*/
public static String decryptByRsaPrivateKey(String data) {
@@ -64,10 +61,8 @@ public class SecureUtils {
/**
* 私钥解密
*
* @param data
* 要解密的内容（Base64 加密过）
* @param privateKey
* 私钥
* @param data 要解密的内容（Base64 加密过）
* @param privateKey 私钥
* @return 解密后的内容
*/
public static String decryptByRsaPrivateKey(String data, String privateKey) {
@@ -77,10 +72,8 @@ public class SecureUtils {
/**
* MD5 加密
*
* @param data
* 要加密的内容
* @param salt
* 盐
* @param data 要加密的内容
* @param salt 盐
* @return 加密后的内容
*/
public static String md5Salt(String data, String salt) {

9
continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/helper/LoginHelper.java
View File

@@ -50,8 +50,7 @@ public class LoginHelper {
/**
* 用户登录并缓存用户信息
*
* @param loginUser
* 登录用户信息
* @param loginUser 登录用户信息
* @return 令牌
*/
public static String login(LoginUser loginUser) {
@@ -93,8 +92,7 @@ public class LoginHelper {
/**
* 根据 Token 获取登录用户信息
*
* @param token
* 用户 Token
* @param token 用户 Token
* @return 登录用户信息
*/
public static LoginUser getLoginUser(String token) {
@@ -135,8 +133,7 @@ public class LoginHelper {
/**
* 获取登录用户昵称
*
* @param userId
* 登录用户 ID
* @param userId 登录用户 ID
* @return 登录用户昵称
*/
public static String getNickname(Long userId) {