odboy/cutejava
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(core):更换jdk17新特性

Browse Source
This commit is contained in:
odboy
2025-10-31 14:28:58 +08:00
parent 4021df78e8
commit 237d664e8a
35 changed files with 104 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/base/CsObject.java
+2
View File
@@ -16,6 +16,7 @@
package cn.odboy.base;
import java.io.Serial;
import java.io.Serializable;
/**
@@ -25,5 +26,6 @@ import java.io.Serializable;
* @date 2022-01-12
*/
public class CsObject implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
}
cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/context/BootApplication.java
+8 -10
View File
@@ -42,15 +42,13 @@ public class BootApplication {
Environment env = application.getEnvironment();
String ip = InetAddress.getLocalHost().getHostAddress();
String port = env.getProperty("server.port");
String path = StrUtil.isEmpty(env.getProperty("config.servlet.context-path")) ?
"" :
env.getProperty("config.servlet.context-path");
log.info(
"\n----------------------------------------------------------\n\t" +
"Application is running! Access URLs:\n\t" +
"Local: \t\thttp://localhost:" + port + path + "/\n\t" +
"External: \thttp://" + ip + ":" + port + path + "/\n\t"
+ "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n"
+ "----------------------------------------------------------");
String path = StrUtil.isEmpty(env.getProperty("config.servlet.context-path")) ? "" : env.getProperty("config.servlet.context-path");
log.info("""
----------------------------------------------------------
\tApplication is running! Access URLs:
\tLocal: \t\thttp://localhost:{}{}
\tExternal: \thttp://{}:{}{}
\tSwagger文档: \thttp://{}:{}{}/doc.html
----------------------------------------------------------""", port, path, ip, port, path, ip, port, path);
}
}
cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/doc/SwaggerConfig.java
-48
View File
@@ -1,48 +0,0 @@
///*
// * Copyright 2021-2025 Odboy
// *
// * Licensed under the Apache License, Version 2.0 (the "License");
// * you may not use this file except in compliance with the License.
// * You may obtain a copy of the License at
// *
// * http://www.apache.org/licenses/LICENSE-2.0
// *
// * Unless required by applicable law or agreed to in writing, software
// * distributed under the License is distributed on an "AS IS" BASIS,
// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// * See the License for the specific language governing permissions and
// * limitations under the License.
// */
//
//package cn.odboy.framework.doc;
//
//import cn.odboy.framework.properties.AppProperties;
//import io.swagger.v3.oas.models.Components;
//import io.swagger.v3.oas.models.OpenAPI;
//import io.swagger.v3.oas.models.info.Info;
//import io.swagger.v3.oas.models.security.SecurityRequirement;
//import io.swagger.v3.oas.models.security.SecurityScheme;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.context.annotation.Bean;
//import org.springframework.context.annotation.Configuration;
//
///**
// * api页面 /doc.html
// */
//@Configuration
//public class SwaggerConfig {
// @Autowired
// private AppProperties properties;
//
// @Bean
// public OpenAPI customOpenAPI() {
// // 添加开关控制
// if (!properties.getSwagger().getEnabled()) {
// return new OpenAPI();
// }
// return new OpenAPI().components(new Components().addSecuritySchemes("Authorization",
// new SecurityScheme().name("Authorization").type(SecurityScheme.Type.APIKEY).in(SecurityScheme.In.HEADER)))
// .info(new Info().title("CuteJava 接口文档").version("1.4.1").description("一个简单且易上手的自动化运维平台"))
// .addSecurityItem(new SecurityRequirement().addList("Authorization"));
// }
//}
cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/exception/handler/GlobalExceptionHandler.java
+2 -2
View File
@@ -76,8 +76,8 @@ public class GlobalExceptionHandler {
log.error(ExceptionUtil.stacktraceToString(e));
ObjectError objectError = e.getBindingResult().getAllErrors().get(0);
String message = objectError.getDefaultMessage();
if (objectError instanceof FieldError) {
message = ((FieldError) objectError).getField() + ": " + message;
if (objectError instanceof FieldError fieldError) {
message = fieldError.getField() + ": " + message;
}
return buildResponseEntity(ApiError.error(message));
}
cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/CsMpQUtil.java
+21 -57
View File
@@ -33,7 +33,6 @@ import lombok.extern.slf4j.Slf4j;
import java.lang.reflect.Field;
import java.util.*;
import java.util.stream.Collectors;
/**
* 查询条件创建工具
@@ -78,62 +77,28 @@ public class CsMpQUtil {
return StrUtil.toUnderlineCase(attributeName);
}
private static <R> void handleWrapper(
CsMpQuery q,
QueryWrapper<R> queryWrapper,
String attributeName,
Object fieldVal) {
private static <R> void handleWrapper(CsMpQuery q, QueryWrapper<R> queryWrapper, String attributeName, Object fieldVal) {
switch (q.type()) {
case EQUAL:
queryWrapper.eq(attributeName, fieldVal);
break;
case GREATER_THAN:
queryWrapper.ge(attributeName, fieldVal);
break;
case LESS_THAN:
queryWrapper.le(attributeName, fieldVal);
break;
case LESS_THAN_NQ:
queryWrapper.lt(attributeName, fieldVal);
break;
case INNER_LIKE:
queryWrapper.like(attributeName, fieldVal);
break;
case LEFT_LIKE:
queryWrapper.likeLeft(attributeName, fieldVal);
break;
case RIGHT_LIKE:
queryWrapper.likeRight(attributeName, fieldVal);
break;
case IN:
handleInOrNotQuery(true, queryWrapper, attributeName, fieldVal);
break;
case NOT_IN:
handleInOrNotQuery(false, queryWrapper, attributeName, fieldVal);
break;
case NOT_EQUAL:
queryWrapper.ne(attributeName, fieldVal);
break;
case NOT_NULL:
queryWrapper.isNotNull(attributeName);
break;
case IS_NULL:
queryWrapper.isNull(attributeName);
break;
case BETWEEN:
handleBetweenQuery(queryWrapper, fieldVal, attributeName);
break;
default:
break;
case EQUAL -> queryWrapper.eq(attributeName, fieldVal);
case GREATER_THAN -> queryWrapper.ge(attributeName, fieldVal);
case LESS_THAN -> queryWrapper.le(attributeName, fieldVal);
case LESS_THAN_NQ -> queryWrapper.lt(attributeName, fieldVal);
case INNER_LIKE -> queryWrapper.like(attributeName, fieldVal);
case LEFT_LIKE -> queryWrapper.likeLeft(attributeName, fieldVal);
case RIGHT_LIKE -> queryWrapper.likeRight(attributeName, fieldVal);
case IN -> handleInOrNotQuery(true, queryWrapper, attributeName, fieldVal);
case NOT_IN -> handleInOrNotQuery(false, queryWrapper, attributeName, fieldVal);
case NOT_EQUAL -> queryWrapper.ne(attributeName, fieldVal);
case NOT_NULL -> queryWrapper.isNotNull(attributeName);
case IS_NULL -> queryWrapper.isNull(attributeName);
case BETWEEN -> handleBetweenQuery(queryWrapper, fieldVal, attributeName);
default -> {
}
}
}
private static <R> void handleInOrNotQuery(
boolean b,
QueryWrapper<R> queryWrapper,
String attributeName,
Object fieldVal) {
Collection<?> wrapNotInVal = (Collection<?>) fieldVal;
private static <R> void handleInOrNotQuery(boolean b, QueryWrapper<R> queryWrapper, String attributeName, Object fieldVal) {
Collection<?> wrapNotInVal = (Collection<?>)fieldVal;
if (CollectionUtil.isNotEmpty(wrapNotInVal)) {
Optional<?> anyValOptional = wrapNotInVal.stream().findAny();
if (anyValOptional.isPresent()) {
@@ -159,7 +124,7 @@ public class CsMpQUtil {
private static <R> void handleBetweenQuery(QueryWrapper<R> queryWrapper, Object fieldVal, String finalAttributeName) {
if (fieldVal instanceof List) {
List<Object> between = new ArrayList<>((List<?>) fieldVal);
List<Object> between = new ArrayList<>((List<?>)fieldVal);
int minLength = 2;
if (CollectionUtil.isNotEmpty(between) && between.size() >= minLength) {
queryWrapper.between(finalAttributeName, between.get(0), between.get(1));
@@ -180,8 +145,7 @@ public class CsMpQUtil {
* @param <R> /
*/
private static <R> void handleBlurryQuery(QueryWrapper<R> queryWrapper, String blurry, Object fieldVal) {
List<String> blurryList =
Arrays.stream(blurry.split(",")).filter(StrUtil::isNotBlank).distinct().collect(Collectors.toList());
List<String> blurryList = Arrays.stream(blurry.split(",")).filter(StrUtil::isNotBlank).distinct().toList();
queryWrapper.and(wrapper -> {
for (String blurryItem : blurryList) {
String column = StrUtil.toUnderlineCase(blurryItem);
@@ -213,7 +177,7 @@ public class CsMpQUtil {
}
public static void main(String[] args) {
QueryWrapper<TestDomain> query = new QueryWrapper<TestDomain>();
QueryWrapper<TestDomain> query = new QueryWrapper<>();
query.or(wrapper -> wrapper.eq("username", 1).or().eq("nickname", 2));
query.eq("id", 1);
query.orderByDesc("id");
cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/properties/AppProperties.java
-1
View File
@@ -34,7 +34,6 @@ public class AppProperties {
private ContentRsaEncodeSettingModel rsa;
private JwtAuthSettingModel jwt;
private UserLoginSettingModel login;
private SwaggerApiDocSettingModel swagger;
private ThreadPoolSettingModel asyncTaskPool;
private CaptchaModel captcha;
private StorageOSSModel oss;
cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/SwaggerApiDocSettingModel.java
-31
View File
@@ -1,31 +0,0 @@
/*
* Copyright 2021-2025 Odboy
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.odboy.framework.properties.model;
import cn.odboy.base.CsObject;
import lombok.Getter;
import lombok.Setter;
/**
* @author odboy
* @date 2025-04-13
*/
@Getter
@Setter
public class SwaggerApiDocSettingModel extends CsObject {
private Boolean enabled;
}
cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/properties/model/UserLoginCaptchaSettingModel.java
+12 -13
View File
@@ -75,30 +75,29 @@ public class UserLoginCaptchaSettingModel extends CsObject {
public Captcha getCaptcha() {
Captcha captcha;
switch (codeType) {
case ARITHMETIC:
case ARITHMETIC -> {
// 算术类型 https://gitee.com/whvse/EasyCaptcha
captcha = new FixedArithmeticCaptcha(width, height);
// 几位数运算, 默认是两位
captcha.setLen(length);
break;
case CHINESE:
}
case CHINESE -> {
captcha = new ChineseCaptcha(width, height);
captcha.setLen(length);
break;
case CHINESE_GIF:
}
case CHINESE_GIF -> {
captcha = new ChineseGifCaptcha(width, height);
captcha.setLen(length);
break;
case GIF:
}
case GIF -> {
captcha = new GifCaptcha(width, height);
captcha.setLen(length);
break;
case SPEC:
}
case SPEC -> {
captcha = new SpecCaptcha(width, height);
captcha.setLen(length);
break;
default:
throw new BadRequestException("验证码配置信息错误！正确配置查看 LoginCodeEnum ");
}
default -> throw new BadRequestException("验证码配置信息错误！正确配置查看 LoginCodeEnum ");
}
if (StrUtil.isNotBlank(fontName)) {
captcha.setFont(new Font(fontName, Font.PLAIN, fontSize));
@@ -118,7 +117,7 @@ public class UserLoginCaptchaSettingModel extends CsObject {
int opt = num(3);
// 计算结果
int res = new int[]{n1 + n2, n1 - n2, n1 * n2}[opt];
int res = new int[] {n1 + n2, n1 - n2, n1 * n2}[opt];
// 转换为字符运算符
char optChar = "+-x".charAt(opt);
cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/redis/CsRedisHelper.java
+2 -3
View File
@@ -259,11 +259,10 @@ public class CsRedisHelper {
if (value == null) {
return null;
}
if (value instanceof List<?>) {
List<?> list = (List<?>) value;
if (value instanceof List<?> list) {
// 检查每个元素是否为指定类型
if (list.stream().allMatch(clazz::isInstance)) {
return list.stream().map(clazz::cast).collect(Collectors.toList());
return list.stream().map(clazz::cast).toList();
}
}
return null;
cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/server/converters/DateStringArraysToListDateConverter.java
+1 -1
View File
@@ -42,6 +42,6 @@ public class DateStringArraysToListDateConverter implements Converter<String[],
} catch (ParseException e) {
throw new IllegalArgumentException("Invalid date string: " + s);
}
}).collect(Collectors.toList());
}).toList();
}
}
cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/CsWsServer.java
+2 -2
View File
@@ -100,7 +100,7 @@ public class CsWsServer {
/**
* 精准推送消息
*/
public void sendMessage(CsWsMessage message, @PathParam("sid") String sid) throws IOException {
public void sendMessage(CsWsMessage message, @PathParam("sid") String sid) {
String body = JSON.toJSONString(message);
// log.info("推送消息到{}, 推送内容:{}", sid, message);
try {
@@ -138,7 +138,7 @@ public class CsWsServer {
if (o == null || getClass() != o.getClass()) {
return false;
}
CsWsServer that = (CsWsServer) o;
CsWsServer that = (CsWsServer)o;
return Objects.equals(session, that.session) && Objects.equals(sid, that.sid);
}
cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/CsAnonTagUtil.java
+6 -18
View File
@@ -61,24 +61,12 @@ public class CsAnonTagUtil {
PathPatternsRequestCondition pathPatternsCondition = infoEntry.getKey().getPathPatternsCondition();
if (pathPatternsCondition != null) {
switch (Objects.requireNonNull(request)) {
case GET:
get.addAll(pathPatternsCondition.getPatternValues());
break;
case POST:
post.addAll(pathPatternsCondition.getPatternValues());
break;
case PUT:
put.addAll(pathPatternsCondition.getPatternValues());
break;
case PATCH:
patch.addAll(pathPatternsCondition.getPatternValues());
break;
case DELETE:
delete.addAll(pathPatternsCondition.getPatternValues());
break;
default:
all.addAll(pathPatternsCondition.getPatternValues());
break;
case GET -> get.addAll(pathPatternsCondition.getPatternValues());
case POST -> post.addAll(pathPatternsCondition.getPatternValues());
case PUT -> put.addAll(pathPatternsCondition.getPatternValues());
case PATCH -> patch.addAll(pathPatternsCondition.getPatternValues());
case DELETE -> delete.addAll(pathPatternsCondition.getPatternValues());
default -> all.addAll(pathPatternsCondition.getPatternValues());
}
}
}
cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/CsBigDecimalUtil.java
+8 -8
View File
@@ -35,14 +35,14 @@ public final class CsBigDecimalUtil {
* @return 转换后的 BigDecimal
*/
private static BigDecimal toBigDecimal(Object obj) {
if (obj instanceof BigDecimal) {
return (BigDecimal) obj;
} else if (obj instanceof Long) {
return BigDecimal.valueOf((Long) obj);
} else if (obj instanceof Integer) {
return BigDecimal.valueOf((Integer) obj);
} else if (obj instanceof Double) {
return new BigDecimal(String.valueOf(obj));
if (obj instanceof BigDecimal b) {
return b;
} else if (obj instanceof Long l) {
return BigDecimal.valueOf(l);
} else if (obj instanceof Integer i) {
return BigDecimal.valueOf(i);
} else if (obj instanceof Double d) {
return new BigDecimal(d);
} else {
throw new IllegalArgumentException("Unsupported type");
}
cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/CsCollUtil.java
+3 -3
View File
@@ -47,7 +47,7 @@ public final class CsCollUtil extends cn.hutool.core.collection.CollUtil {
* 使用方式: list = CollUtil.streamDistinct(list, Object::getXXX)
*/
public static <T, K> List<T> streamDistinct(List<T> data, Function<? super T, ? extends K> keyMapper) {
return data.stream().filter(distinctPredicate(keyMapper)).collect(Collectors.toList());
return data.stream().filter(distinctPredicate(keyMapper)).toList();
}
/**
@@ -64,7 +64,7 @@ public final class CsCollUtil extends cn.hutool.core.collection.CollUtil {
public static <T, U extends Comparable<? super U>> List<T> streamAscSort(
List<T> data,
Function<? super T, ? extends U> keyExtractor) {
return data.stream().sorted(Comparator.comparing(keyExtractor)).collect(Collectors.toList());
return data.stream().sorted(Comparator.comparing(keyExtractor)).toList();
}
/**
@@ -81,7 +81,7 @@ public final class CsCollUtil extends cn.hutool.core.collection.CollUtil {
public static <T, U extends Comparable<? super U>> List<T> streamDescSort(
List<T> data,
Function<? super T, ? extends U> keyExtractor) {
return data.stream().sorted(Comparator.comparing(keyExtractor).reversed()).collect(Collectors.toList());
return data.stream().sorted(Comparator.comparing(keyExtractor).reversed()).toList();
}
/**
cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/CsDateUtil.java
+2 -2
View File
@@ -91,7 +91,7 @@ public class CsDateUtil {
result.append(minutes).append("分");
}
if (seconds > 0 || result.length() == 0) {
if (seconds > 0 || result.isEmpty()) {
result.append(seconds).append("秒");
}
@@ -141,7 +141,7 @@ public class CsDateUtil {
}
// 如果所有单位都是0，则显示0毫秒
if (result.length() == 0) {
if (result.isEmpty()) {
result.append("0毫秒");
}
cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/CsFileUtil.java
+2 -3
View File
@@ -188,8 +188,7 @@ public final class CsFileUtil extends cn.hutool.core.io.FileUtil {
List<Map<String, Object>> sanitizedList = list.parallelStream().map(map -> {
Map<String, Object> sanitizedMap = new LinkedHashMap<>();
map.forEach((key, value) -> {
if (value instanceof String) {
String strValue = (String) value;
if (value instanceof String strValue) {
// 检查并处理以特殊字符开头的值
if (strValue.startsWith(SYMBOL_EQUAL) || strValue.startsWith(SYMBOL_ADD) ||
strValue.startsWith(SYMBOL_SUBTRACT) || strValue.startsWith(
@@ -203,7 +202,7 @@ public final class CsFileUtil extends cn.hutool.core.io.FileUtil {
}
});
return sanitizedMap;
}).collect(Collectors.toList());
}).toList();
// 一次性写出内容, 使用默认样式，强制输出标题
writer.write(sanitizedList, true);
SXSSFSheet sheet = (SXSSFSheet) writer.getSheet();
cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/CsJsonUtil.java
+2 -2
View File
@@ -32,12 +32,12 @@ import java.util.Map;
@UtilityClass
public final class CsJsonUtil {
public static <K, V> Map<K, V> toMap(String jsonStr, Class<K> kClass, Class<V> vClass) {
return JSON.parseObject(jsonStr, new TypeReference<Map<K, V>>() {
return JSON.parseObject(jsonStr, new TypeReference<>() {
});
}
public static <V> List<V> toList(String jsonStr, Class<V> vClass) {
return JSON.parseObject(jsonStr, new TypeReference<List<V>>() {
return JSON.parseObject(jsonStr, new TypeReference<>() {
});
}
cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/CsListUtil.java
+1 -6
View File
@@ -40,12 +40,7 @@ public final class CsListUtil {
* @param classifier 对象T属性表达式, 比如: User::getName
*/
public static <T, K> List<T> distinctByArgs(List<T> items, Function<? super T, ? extends K> classifier) {
return items.stream()
.collect(Collectors.groupingBy(classifier))
.values()
.stream()
.map(monitorItem -> monitorItem.iterator().next())
.collect(Collectors.toList());
return items.stream().collect(Collectors.groupingBy(classifier)).values().stream().map(monitorItem -> monitorItem.iterator().next()).toList();
}
/**
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java
+1 -1
View File
@@ -138,7 +138,7 @@ public class SystemAuthController {
// 保存
redisHelper.set(uuid, captchaValue, properties.getLogin().getCaptchaSetting().getExpiration(), TimeUnit.MINUTES);
// 验证码信息
Map<String, Object> imgResult = new HashMap<String, Object>(2) {{
Map<String, Object> imgResult = new HashMap<>(2) {{
put("img", captcha.toBase64());
put("uuid", uuid);
}};
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java
+1 -1
View File
@@ -79,7 +79,7 @@ public class SystemDeptController {
}
}
// 编辑部门时不显示自己以及自己下级的数据, 避免出现PID数据环形问题
depts = depts.stream().filter(i -> !ids.contains(i.getId())).collect(Collectors.toList());
depts = depts.stream().filter(i -> !ids.contains(i.getId())).toList();
}
deptSet.addAll(depts);
}
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java
+1 -1
View File
@@ -133,7 +133,7 @@ public class SystemRoleController {
*/
private int checkRoleLevels(Integer level) {
List<Integer> levels =
systemRoleService.queryRoleByUsersId(CsSecurityHelper.getCurrentUserId()).stream().map(SystemRoleTb::getLevel).collect(Collectors.toList());
systemRoleService.queryRoleByUsersId(CsSecurityHelper.getCurrentUserId()).stream().map(SystemRoleTb::getLevel).toList();
int min = Collections.min(levels);
if (level != null) {
if (level < min) {
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java
+4 -4
View File
@@ -143,8 +143,8 @@ public class SystemUserController {
public ResponseEntity<Object> removeUserByIds(@RequestBody Set<Long> ids) {
for (Long id : ids) {
Integer currentLevel = Collections.min(
systemRoleService.queryRoleByUsersId(CsSecurityHelper.getCurrentUserId()).stream().map(SystemRoleTb::getLevel).collect(Collectors.toList()));
Integer optLevel = Collections.min(systemRoleService.queryRoleByUsersId(id).stream().map(SystemRoleTb::getLevel).collect(Collectors.toList()));
systemRoleService.queryRoleByUsersId(CsSecurityHelper.getCurrentUserId()).stream().map(SystemRoleTb::getLevel).toList());
Integer optLevel = Collections.min(systemRoleService.queryRoleByUsersId(id).stream().map(SystemRoleTb::getLevel).toList());
if (currentLevel > optLevel) {
throw new BadRequestException("角色权限不足, 不能删除：" + systemUserService.getUserById(id).getUsername());
}
@@ -203,7 +203,7 @@ public class SystemUserController {
*/
private void checkLevel(SystemUserTb args) {
Integer currentLevel = Collections.min(
systemRoleService.queryRoleByUsersId(CsSecurityHelper.getCurrentUserId()).stream().map(SystemRoleTb::getLevel).collect(Collectors.toList()));
systemRoleService.queryRoleByUsersId(CsSecurityHelper.getCurrentUserId()).stream().map(SystemRoleTb::getLevel).toList());
Integer optLevel = systemRoleService.getDeptLevelByRoles(args.getRoles());
if (currentLevel > optLevel) {
throw new BadRequestException("角色权限不足");
@@ -234,7 +234,7 @@ public class SystemUserController {
ext.put("email", m.getEmail());
ext.put("phone", m.getPhone());
return CsSelectOptionVo.builder().label(m.getNickName()).value(String.valueOf(m.getId())).ext(ext).build();
}).collect(Collectors.toList());
}).toList();
return ResponseEntity.ok(collect);
}
}
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLockAspect.java
+2 -1
View File
@@ -75,7 +75,8 @@ public class BizLockAspect {
Object[] args = joinPoint.getArgs();
for (int i = 0; i < parameterNames.length; i++) {
context.setVariable(parameterNames[i], args[i]);
context.setVariable("p" + i, args[i]); // 支持#p0,#p1格式
// 支持#p0,#p1格式
context.setVariable("p" + i, args[i]);
}
// 设置方法相关信息
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/AuthorityConfig.java
+1 -1
View File
@@ -35,7 +35,7 @@ public class AuthorityConfig {
*/
public Boolean check(String... permissions) {
// 获取当前用户的所有权限
List<String> roleList = CsSecurityHelper.getCurrentUser().getAuthorities().stream().map(GrantedAuthority::getAuthority).collect(Collectors.toList());
List<String> roleList = CsSecurityHelper.getCurrentUser().getAuthorities().stream().map(GrantedAuthority::getAuthority).toList();
// 判断当前用户的所有权限是否包含接口上定义的权限
return roleList.contains("admin") || Arrays.stream(permissions).anyMatch(roleList::contains);
}
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java
+5 -8
View File
@@ -55,17 +55,14 @@ public class SystemDataService {
for (SystemRoleTb role : roleList) {
SystemDataScopeEnum dataScopeEnum = SystemDataScopeEnum.find(role.getDataScope());
switch (Objects.requireNonNull(dataScopeEnum)) {
case THIS_LEVEL:
deptIds.add(user.getDept().getId());
break;
case CUSTOMIZE:
deptIds.addAll(queryCustomDataPermissionList(deptIds, role));
break;
default:
case THIS_LEVEL -> deptIds.add(user.getDept().getId());
case CUSTOMIZE -> deptIds.addAll(queryCustomDataPermissionList(deptIds, role));
default -> {
return new ArrayList<>();
}
}
}
return deptIds.stream().distinct().collect(Collectors.toList());
return deptIds.stream().distinct().toList();
}
/**
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java
+1 -1
View File
@@ -294,7 +294,7 @@ public class SystemDeptService {
public CsPageResult<SystemDeptTb> buildDeptTree(List<SystemDeptTb> deptList) {
Set<SystemDeptTb> trees = new LinkedHashSet<>();
Set<SystemDeptTb> deptSet = new LinkedHashSet<>();
List<String> deptNames = deptList.stream().map(SystemDeptTb::getName).collect(Collectors.toList());
List<String> deptNames = deptList.stream().map(SystemDeptTb::getName).toList();
boolean isChild;
for (SystemDeptTb dept : deptList) {
isChild = false;
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java
+2 -2
View File
@@ -155,7 +155,7 @@ public class SystemMenuService {
menuSet.add(systemMenuMapper.selectById(id));
menuSet = this.queryChildMenu(menuList, menuSet);
}
List<Long> menuIds = menuSet.stream().map(SystemMenuTb::getId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
List<Long> menuIds = menuSet.stream().map(SystemMenuTb::getId).filter(Objects::nonNull).distinct().toList();
if (CollUtil.isNotEmpty(menuIds)) {
CsSpringBeanHolder.getBean(SystemMenuService.class).removeRoleMenuByMenuIds(menuIds);
systemMenuMapper.deleteByIds(menuIds);
@@ -323,7 +323,7 @@ public class SystemMenuService {
}
}
if (CollUtil.isNotEmpty(trees)) {
trees = menus.stream().filter(s -> !ids.contains(s.getId())).collect(Collectors.toList());
trees = menus.stream().filter(s -> !ids.contains(s.getId())).toList();
}
return trees;
}
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java
+3 -3
View File
@@ -213,7 +213,7 @@ public class SystemRoleService {
for (SystemRoleTb role : roles) {
roleSet.add(getRoleById(role.getId()));
}
return Collections.min(roleSet.stream().map(SystemRoleTb::getLevel).collect(Collectors.toList()));
return Collections.min(roleSet.stream().map(SystemRoleTb::getLevel).toList());
}
/**
@@ -228,7 +228,7 @@ public class SystemRoleService {
// 如果是管理员直接返回
if (user.getIsAdmin()) {
permissions.add("admin");
return permissions.stream().map(SystemRoleCodeVo::new).collect(Collectors.toList());
return permissions.stream().map(SystemRoleCodeVo::new).toList();
}
List<SystemRoleTb> roles = systemRoleMapper.selectRoleByUserId(user.getId());
permissions = roles.stream()
@@ -236,7 +236,7 @@ public class SystemRoleService {
.map(SystemMenuTb::getPermission)
.filter(StrUtil::isNotBlank)
.collect(Collectors.toSet());
return permissions.stream().map(SystemRoleCodeVo::new).collect(Collectors.toList());
return permissions.stream().map(SystemRoleCodeVo::new).toList();
}
/**
cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java
+2 -2
View File
@@ -267,12 +267,12 @@ public class SystemUserService {
public void exportUserExcel(List<SystemUserTb> users, HttpServletResponse response) throws IOException {
List<Map<String, Object>> list = new ArrayList<>();
for (SystemUserTb user : users) {
List<String> roles = user.getRoles().stream().map(SystemRoleTb::getName).collect(Collectors.toList());
List<String> roles = user.getRoles().stream().map(SystemRoleTb::getName).toList();
Map<String, Object> map = new LinkedHashMap<>();
map.put("用户名", user.getUsername());
map.put("角色", roles);
map.put("部门", user.getDept().getName());
map.put("岗位", user.getJobs().stream().map(SystemJobTb::getName).collect(Collectors.toList()));
map.put("岗位", user.getJobs().stream().map(SystemJobTb::getName).toList());
map.put("邮箱", user.getEmail());
map.put("状态", user.getEnabled() ? "启用" : "禁用");
map.put("手机号码", user.getPhone());
cutejava-springboot3/cutejava-module-system/src/main/resources/template/SystemQuartzJobTaskAlarmTemplate.ftl
-1
View File
@@ -65,7 +65,6 @@
后台管理系统 All Rights Reserved.
</div>
</div>
</div>
</body>
</html>
cutejava-springboot3/cutejava-module-task/src/main/java/cn/odboy/task/core/TaskJobBean.java
+3 -3
View File
@@ -86,7 +86,7 @@ public class TaskJobBean extends QuartzJobBean implements InterruptableJob {
*/
private void executeNormalTask(TaskInstanceInfoService taskInstanceInfoService, TaskInstanceDetailService taskInstanceDetailService, long id, JobDataMap dataMap, List<TaskTemplateNodeVo> taskTemplateNodeVos) {
// ========================== 初始化执行明细 ==========================
List<TaskInstanceDetailTb> taskInstanceDetails = taskTemplateNodeVos.stream().map(taskTemplateNodeVo -> buildTaskInstanceDetail(id, taskTemplateNodeVo)).collect(Collectors.toList());
List<TaskInstanceDetailTb> taskInstanceDetails = taskTemplateNodeVos.stream().map(taskTemplateNodeVo -> buildTaskInstanceDetail(id, taskTemplateNodeVo)).toList();
taskInstanceDetailService.saveBatch(taskInstanceDetails);
Map<String, Long> codeIdMap = taskInstanceDetails.stream().collect(Collectors.toMap(TaskInstanceDetailTb::getBizCode, TaskInstanceDetailTb::getId));
// ========================== 顺序执行 ==========================
@@ -124,9 +124,9 @@ public class TaskJobBean extends QuartzJobBean implements InterruptableJob {
}
}
TaskInstanceStepDetailService taskInstanceStepDetailService = CsSpringBeanHolder.getBean(TaskInstanceStepDetailService.class);
List<String> bizCodeList = taskInstanceDetails.stream().map(TaskInstanceDetailTb::getBizCode).distinct().collect(Collectors.toList());
List<String> bizCodeList = taskInstanceDetails.stream().map(TaskInstanceDetailTb::getBizCode).distinct().toList();
List<TaskInstanceDetailTb> taskInstanceDetailTbs = taskInstanceDetailService.queryByInstanceIdAndBizCodeList(id, bizCodeList);
List<Long> taskInstanceDetailIds = taskInstanceDetailTbs.stream().map(TaskInstanceDetailTb::getId).collect(Collectors.toList());
List<Long> taskInstanceDetailIds = taskInstanceDetailTbs.stream().map(TaskInstanceDetailTb::getId).toList();
// 根据ID删除明细
taskInstanceDetailService.removeByIds(taskInstanceDetailIds);
// 根据明细删除步骤
cutejava-springboot3/cutejava-module-task/src/main/java/cn/odboy/task/dal/dataobject/TaskInstanceStepDetailTb.java
+1 -1
View File
@@ -40,7 +40,7 @@ import java.util.Date;
@Setter
@ToString
@TableName("task_instance_step_detail")
@Schema(name = "TaskInstanceStepDetailTb对象", description = "")
@Schema(name = "TaskInstanceStepDetailTb对象")
public class TaskInstanceStepDetailTb extends CsObject {
@TableField(fill = FieldFill.INSERT)
@Schema(name = "创建时间: yyyy-MM-dd HH:mm:ss", hidden = true)
cutejava-springboot3/cutejava-starter/src/test/java/cn/odboy/SystemApplicationTests.java
-3
View File
@@ -63,8 +63,5 @@ public class SystemApplicationTests {
systemUserService.saveUser(systemUser);
}
}
public static void main(String[] args) {
}
}
cutejava-springboot3/pom.xml
+3 -3
View File
@@ -36,7 +36,7 @@
<jjwt.version>0.12.6</jjwt.version>
<!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 -->
<jna.version>5.8.0</jna.version>
<mail.version>2.1.5</mail.version>
<mail.version>1.4.7</mail.version>
<undertow.version>2.3.20.Final</undertow.version>
<freemarker.version>2.3.34</freemarker.version>
<p6spy.version>3.9.1</p6spy.version>
@@ -320,8 +320,8 @@
<!-- 邮件依赖 -->
<dependency>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>${mail.version}</version>
</dependency>