🎉 4.4.0.RELEASE 新增黑白名单、脱敏工具、BladeRedis新版工具

This commit is contained in:
smallchill 2025-01-18 18:19:14 +08:00
parent 74669cebe5
commit cd04e83390
18 changed files with 376 additions and 77 deletions

View File

@ -1,5 +1,5 @@
<p align="center">
<img src="https://img.shields.io/badge/Release-V4.3.0-green.svg" alt="Downloads">
<img src="https://img.shields.io/badge/Release-V4.4.0-green.svg" alt="Downloads">
<img src="https://img.shields.io/badge/JDK-17+-green.svg" alt="Build Status">
<img src="https://img.shields.io/badge/license-Apache%202-blue.svg" alt="Build Status">
<img src="https://img.shields.io/badge/Spring%20Cloud-2023-blue.svg" alt="Coverage Status">
@ -33,8 +33,8 @@
|----------------------|------------|
| Java | 17+ |
| NodeJS | 18+ |
| Spring | 6.1.14 |
| Spring Boot | 3.2.10 |
| Spring | 6.1.15 |
| Spring Boot | 3.2.12 |
| Spring Cloud | 2023.0.3 |
| Spring Cloud Alibaba | 2023.0.1.2 |
| Nacos Alibaba | 2.3.2 |

View File

@ -37,6 +37,10 @@
<groupId>org.springblade</groupId>
<artifactId>blade-starter-social</artifactId>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-redis</artifactId>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-user-api</artifactId>

View File

@ -25,11 +25,11 @@ import org.springblade.auth.granter.TokenGranterBuilder;
import org.springblade.auth.granter.TokenParameter;
import org.springblade.auth.utils.TokenUtil;
import org.springblade.common.cache.CacheNames;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.secure.AuthInfo;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.RedisUtil;
import org.springblade.core.tool.utils.WebUtil;
import org.springblade.system.user.entity.UserInfo;
import org.springframework.web.bind.annotation.GetMapping;
@ -50,7 +50,7 @@ import java.util.concurrent.TimeUnit;
@Tag(name = "用户授权认证", description = "授权接口")
public class AuthController {
private RedisUtil redisUtil;
private BladeRedis bladeRedis;
@PostMapping("token")
@Operation(summary = "获取认证token", description = "传入租户ID:tenantId,账号:account,密码:password")
@ -87,7 +87,7 @@ public class AuthController {
String verCode = specCaptcha.text().toLowerCase();
String key = UUID.randomUUID().toString();
// 存入redis并设置过期时间为30分钟
redisUtil.set(CacheNames.CAPTCHA_KEY + key, verCode, 30L, TimeUnit.MINUTES);
bladeRedis.setEx(CacheNames.CAPTCHA_KEY + key, verCode, 30L, TimeUnit.MINUTES);
// 将key和base64返回给前端
return R.data(Kv.init().set("key", key).set("image", specCaptcha.toBase64()));
}

View File

@ -20,6 +20,7 @@ import org.springblade.auth.enums.BladeUserEnum;
import org.springblade.auth.utils.TokenUtil;
import org.springblade.common.cache.CacheNames;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.secure.props.BladeAuthProperties;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.*;
@ -41,7 +42,7 @@ public class CaptchaTokenGranter implements ITokenGranter {
public static final String GRANT_TYPE = "captcha";
private IUserClient userClient;
private RedisUtil redisUtil;
private BladeRedis bladeRedis;
private BladeAuthProperties authProperties;
@ -52,7 +53,7 @@ public class CaptchaTokenGranter implements ITokenGranter {
String key = request.getHeader(TokenUtil.CAPTCHA_HEADER_KEY);
String code = request.getHeader(TokenUtil.CAPTCHA_HEADER_CODE);
// 获取验证码
String redisCode = String.valueOf(redisUtil.get(CacheNames.CAPTCHA_KEY + key));
String redisCode = Func.toStr(bladeRedis.get(CacheNames.CAPTCHA_KEY + key));
// 判断验证码
if (code == null || !StringUtil.equalsIgnoreCase(redisCode, code)) {
throw new ServiceException(TokenUtil.CAPTCHA_NOT_CORRECT);

View File

@ -17,29 +17,25 @@ package org.springblade.core.log.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Hidden;
import io.swagger.v3.oas.annotations.Parameter;
import lombok.AllArgsConstructor;
import org.springblade.core.log.model.LogApi;
import org.springblade.core.log.model.LogApiVo;
import org.springblade.core.log.pojo.LogApiVO;
import org.springblade.core.log.service.ILogApiService;
import org.springblade.core.log.wrapper.LogApiWrapper;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.annotation.PreAuth;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 控制器
@ -59,8 +55,10 @@ public class LogApiController {
* 查询单条
*/
@GetMapping("/detail")
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<LogApi> detail(LogApi log) {
return R.data(logService.getOne(Condition.getQueryWrapper(log)));
LogApi logApi = logService.getOne(Condition.getQueryWrapper(log));
return R.data(LogApiWrapper.build().entity(logApi));
}
/**
@ -68,18 +66,11 @@ public class LogApiController {
*/
@GetMapping("/list")
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<IPage<LogApiVo>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> log, Query query) {
public R<IPage<LogApiVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> log, Query query) {
query.setAscs("create_time");
query.setDescs(StringPool.EMPTY);
IPage<LogApi> pages = logService.page(Condition.getPage(query), Condition.getQueryWrapper(log, LogApi.class));
List<LogApiVo> records = pages.getRecords().stream().map(logApi -> {
LogApiVo vo = BeanUtil.copyProperties(logApi, LogApiVo.class);
vo.setStrId(Func.toStr(logApi.getId()));
return vo;
}).collect(Collectors.toList());
IPage<LogApiVo> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
pageVo.setRecords(records);
return R.data(pageVo);
return R.data(LogApiWrapper.build().pageVO(pages));
}
}

View File

@ -17,29 +17,25 @@ package org.springblade.core.log.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Hidden;
import io.swagger.v3.oas.annotations.Parameter;
import lombok.AllArgsConstructor;
import org.springblade.core.log.model.LogError;
import org.springblade.core.log.model.LogErrorVo;
import org.springblade.core.log.pojo.LogErrorVO;
import org.springblade.core.log.service.ILogErrorService;
import org.springblade.core.log.wrapper.LogErrorWrapper;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.annotation.PreAuth;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 控制器
@ -59,8 +55,10 @@ public class LogErrorController {
* 查询单条
*/
@GetMapping("/detail")
public R<LogError> detail(LogError logError) {
return R.data(errorLogService.getOne(Condition.getQueryWrapper(logError)));
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<LogError> detail(LogError log) {
LogError logError = errorLogService.getOne(Condition.getQueryWrapper(log));
return R.data(LogErrorWrapper.build().entity(logError));
}
/**
@ -68,18 +66,11 @@ public class LogErrorController {
*/
@GetMapping("/list")
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<IPage<LogErrorVo>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> logError, Query query) {
public R<IPage<LogErrorVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> logError, Query query) {
query.setAscs("create_time");
query.setDescs(StringPool.EMPTY);
IPage<LogError> pages = errorLogService.page(Condition.getPage(query), Condition.getQueryWrapper(logError, LogError.class));
List<LogErrorVo> records = pages.getRecords().stream().map(logApi -> {
LogErrorVo vo = BeanUtil.copyProperties(logApi, LogErrorVo.class);
vo.setStrId(Func.toStr(logApi.getId()));
return vo;
}).collect(Collectors.toList());
IPage<LogErrorVo> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
pageVo.setRecords(records);
return R.data(pageVo);
return R.data(LogErrorWrapper.build().pageVO(pages));
}
}

View File

@ -17,29 +17,25 @@ package org.springblade.core.log.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Hidden;
import io.swagger.v3.oas.annotations.Parameter;
import lombok.AllArgsConstructor;
import org.springblade.core.log.model.LogUsual;
import org.springblade.core.log.model.LogUsualVo;
import org.springblade.core.log.pojo.LogUsualVO;
import org.springblade.core.log.service.ILogUsualService;
import org.springblade.core.log.wrapper.LogUsualWrapper;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.annotation.PreAuth;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 控制器
@ -59,8 +55,10 @@ public class LogUsualController {
* 查询单条
*/
@GetMapping("/detail")
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<LogUsual> detail(LogUsual log) {
return R.data(logService.getOne(Condition.getQueryWrapper(log)));
LogUsual logUsual = logService.getOne(Condition.getQueryWrapper(log));
return R.data(LogUsualWrapper.build().entity(logUsual));
}
/**
@ -68,18 +66,11 @@ public class LogUsualController {
*/
@GetMapping("/list")
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<IPage<LogUsualVo>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> log, Query query) {
public R<IPage<LogUsualVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> log, Query query) {
query.setAscs("create_time");
query.setDescs(StringPool.EMPTY);
IPage<LogUsual> pages = logService.page(Condition.getPage(query), Condition.getQueryWrapper(log, LogUsual.class));
List<LogUsualVo> records = pages.getRecords().stream().map(logApi -> {
LogUsualVo vo = BeanUtil.copyProperties(logApi, LogUsualVo.class);
vo.setStrId(Func.toStr(logApi.getId()));
return vo;
}).collect(Collectors.toList());
IPage<LogUsualVo> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
pageVo.setRecords(records);
return R.data(pageVo);
return R.data(LogUsualWrapper.build().pageVO(pages));
}
}

View File

@ -0,0 +1,44 @@
/**
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
* <p>
* 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
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* 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 org.springblade.core.log.pojo;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.log.model.LogApi;
import java.io.Serial;
/**
* LogApiVO
*
* @author Chill
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class LogApiVO extends LogApi {
@Serial
private static final long serialVersionUID = 1L;
/**
* 操作提交的数据
*/
@JsonIgnore
private String params;
}

View File

@ -0,0 +1,54 @@
/**
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
* <p>
* 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
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* 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 org.springblade.core.log.pojo;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.log.model.LogError;
import java.io.Serial;
/**
* LogErrorVO
*
* @author Chill
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class LogErrorVO extends LogError {
@Serial
private static final long serialVersionUID = 1L;
/**
* 操作提交的数据
*/
@JsonIgnore
private String params;
/**
* 堆栈信息
*/
@JsonIgnore
private String stackTrace;
/**
* 异常消息
*/
@JsonIgnore
private String message;
}

View File

@ -0,0 +1,48 @@
/**
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
* <p>
* 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
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* 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 org.springblade.core.log.pojo;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.log.model.LogUsual;
import java.io.Serial;
/**
* LogUsualVO
*
* @author Chill
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class LogUsualVO extends LogUsual {
@Serial
private static final long serialVersionUID = 1L;
/**
* 操作提交的数据
*/
@JsonIgnore
private String params;
/**
* 日志数据
*/
@JsonIgnore
private String logData;
}

View File

@ -0,0 +1,6 @@
/**
* Created by Blade.
*
* @author zhuangqian
*/
package org.springblade.core.log.pojo;

View File

@ -0,0 +1,52 @@
/**
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
* <p>
* 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
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* 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 org.springblade.core.log.wrapper;
import org.springblade.core.log.model.LogApi;
import org.springblade.core.log.pojo.LogApiVO;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.sensitive.SensitiveUtil;
import org.springblade.core.tool.sensitive.SensitiveWord;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.StringUtil;
import java.util.Objects;
/**
* Log包装类,返回视图层所需的字段
*
* @author Chill
*/
public class LogApiWrapper extends BaseEntityWrapper<LogApi, LogApiVO> {
public static LogApiWrapper build() {
return new LogApiWrapper();
}
@Override
public LogApiVO entityVO(LogApi logApi) {
return Objects.requireNonNull(BeanUtil.copyProperties(logApi, LogApiVO.class));
}
public LogApi entity(LogApi logApi) {
String params = logApi.getParams();
if (StringUtil.isNotBlank(params)) {
logApi.setParams(SensitiveUtil.processWithWords(params, SensitiveWord.SECURE.getWords()));
}
return logApi;
}
}

View File

@ -0,0 +1,59 @@
/**
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
* <p>
* 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
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* 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 org.springblade.core.log.wrapper;
import org.springblade.core.log.model.LogError;
import org.springblade.core.log.pojo.LogErrorVO;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.sensitive.SensitiveUtil;
import org.springblade.core.tool.sensitive.SensitiveWord;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.StringUtil;
import java.util.Objects;
/**
* Log包装类,返回视图层所需的字段
*
* @author Chill
*/
public class LogErrorWrapper extends BaseEntityWrapper<LogError, LogErrorVO> {
public static LogErrorWrapper build() {
return new LogErrorWrapper();
}
@Override
public LogErrorVO entityVO(LogError logError) {
return Objects.requireNonNull(BeanUtil.copyProperties(logError, LogErrorVO.class));
}
public LogError entity(LogError logError) {
String params = logError.getParams();
String stackTrace = logError.getStackTrace();
String message = logError.getMessage();
if (StringUtil.isNotBlank(params)) {
logError.setParams(SensitiveUtil.processWithWords(params, SensitiveWord.SECURE.getWords()));
}
if (StringUtil.isNotBlank(stackTrace)) {
logError.setStackTrace(SensitiveUtil.processWithWords(stackTrace, SensitiveWord.SECURE.getWords()));
}
if (StringUtil.isNotBlank(message)) {
logError.setMessage(SensitiveUtil.processWithWords(message, SensitiveWord.SECURE.getWords()));
}
return logError;
}
}

View File

@ -0,0 +1,56 @@
/**
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
* <p>
* 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
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* 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 org.springblade.core.log.wrapper;
import org.springblade.core.log.model.LogUsual;
import org.springblade.core.log.pojo.LogUsualVO;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.sensitive.SensitiveUtil;
import org.springblade.core.tool.sensitive.SensitiveWord;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.StringUtil;
import java.util.Objects;
/**
* Log包装类,返回视图层所需的字段
*
* @author Chill
*/
public class LogUsualWrapper extends BaseEntityWrapper<LogUsual, LogUsualVO> {
public static LogUsualWrapper build() {
return new LogUsualWrapper();
}
@Override
public LogUsualVO entityVO(LogUsual logUsual) {
return Objects.requireNonNull(BeanUtil.copyProperties(logUsual, LogUsualVO.class));
}
public LogUsual entity(LogUsual logUsual) {
String params = logUsual.getParams();
String logData = logUsual.getLogData();
if (StringUtil.isNotBlank(params)) {
logUsual.setParams(SensitiveUtil.processWithWords(params, SensitiveWord.SECURE.getWords()));
}
if (StringUtil.isNotBlank(logData)) {
logUsual.setLogData(SensitiveUtil.processWithWords(logData, SensitiveWord.SECURE.getWords()));
}
return logUsual;
}
}

View File

@ -73,7 +73,7 @@ knife4j:
swagger:
title: SpringBlade 接口文档系统
description: SpringBlade 接口文档系统
version: 4.3.0
version: 4.4.0
license: Powered By SpringBlade
licenseUrl: https://bladex.cn
terms-of-service-url: https://bladex.cn
@ -86,14 +86,14 @@ swagger:
blade:
auth:
#使用 @org.springblade.test.Sm2KeyGenerator 获取,用于国密sm2验签,需和前端保持一致
public-key: 请配置sm2公钥
public-key: ${BLADE_OAUTH2_PUBLIC_KEY}
#使用 @org.springblade.test.Sm2KeyGenerator 获取,用于国密sm2解密,前端无需配置
private-key: 请配置sm2私钥
private-key: ${BLADE_OAUTH2_PRIVATE_KEY}
token:
#使用 @org.springblade.test.SignKeyGenerator 获取
sign-key: 请配置32位签名
sign-key: ${BLADE_TOKEN_SIGN_KEY}
#使用 @org.springblade.test.SignKeyGenerator 获取
aes-key: 请配置cryptoKey
aes-key: ${BLADE_TOKEN_CRYPTO_KEY}
xss:
enabled: true
skip-url:

View File

@ -9,7 +9,9 @@
<packaging>pom</packaging>
<properties>
<revision>4.3.0</revision>
<revision>4.4.0</revision>
<blade.tool.version>4.4.2</blade.tool.version>
<java.version>17</java.version>
<maven.plugin.version>3.11.0</maven.plugin.version>
@ -41,7 +43,7 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-bom</artifactId>
<version>${revision}</version>
<version>${blade.tool.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

View File

@ -1,2 +1,2 @@
REGISTER=192.168.0.157/blade
TAG=4.3.0
TAG=4.4.0

View File

@ -152,7 +152,7 @@ spec:
spec:
containers:
- name: blade-admin
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-admin:4.3.0'
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-admin:4.4.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -386,7 +386,7 @@ spec:
spec:
containers:
- name: blade-auth
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-auth:4.3.0'
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-auth:4.4.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -625,7 +625,7 @@ spec:
spec:
containers:
- name: blade-desk
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-desk:4.3.0'
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-desk:4.4.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -864,7 +864,7 @@ spec:
spec:
containers:
- name: blade-develop
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-develop:4.3.0'
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-develop:4.4.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -1096,7 +1096,7 @@ spec:
spec:
containers:
- name: blade-gateway
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-gateway:4.3.0'
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-gateway:4.4.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -1331,7 +1331,7 @@ spec:
spec:
containers:
- name: blade-log
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-log:4.3.0'
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-log:4.4.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -1565,7 +1565,7 @@ spec:
spec:
containers:
- name: blade-report
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-report:4.3.0'
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-report:4.4.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -1799,7 +1799,7 @@ spec:
spec:
containers:
- name: blade-resource
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-resource:4.3.0'
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-resource:4.4.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -2033,7 +2033,7 @@ spec:
spec:
containers:
- name: blade-system
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-system:4.3.0'
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-system:4.4.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -2262,7 +2262,7 @@ spec:
spec:
containers:
- name: saber-web
image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-web:4.3.0'
image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-web:4.4.0'
ports:
- name: web
containerPort: 80
@ -2487,7 +2487,7 @@ spec:
spec:
containers:
- name: blade-swagger
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-swagger:4.3.0'
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-swagger:4.4.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -3515,7 +3515,7 @@ spec:
spec:
containers:
- name: mysql
image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-db:v4.3.0'
image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-db:v4.4.0'
ports:
- name: mysql
containerPort: 3306