diff --git a/package.json b/package.json
index c8ecab9..24c0a76 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saber-admin",
- "version": "4.3.0",
+ "version": "4.4.0",
"scripts": {
"dev": "vite --host",
"prod": "vite --mode production",
diff --git a/src/config/website.js b/src/config/website.js
index 28a55f7..54f6089 100755
--- a/src/config/website.js
+++ b/src/config/website.js
@@ -45,7 +45,7 @@ export default {
//auth配置
auth: {
// 使用后端工程 @org.springblade.test.Sm2KeyGenerator 获取
- publicKey: '请配置国密sm2公钥',
+ publicKey: '048ecaec81db406275b5fd8a18164c4a58cc8575159b89d3cb61871cab34bd267fe0a7543277d4c9cfd13c946c507c3e8dfe0121b845ba968221eaf64a242cf7f0',
},
// 授权地址
authUrl: 'http://localhost/blade-auth/oauth/render',
diff --git a/src/mac/index.vue b/src/mac/index.vue
index f3bb5d3..8d9bf98 100644
--- a/src/mac/index.vue
+++ b/src/mac/index.vue
@@ -3,15 +3,12 @@
-
+
{{userInfo.username}}
-
-
-
退出主题
@@ -386,4 +383,4 @@ export default {
.app-item:hover {
border: 2px solid rgba(255, 255, 255, 0.5);
}
-
\ No newline at end of file
+
diff --git a/src/views/monitor/log/api.vue b/src/views/monitor/log/api.vue
index 8667dcd..0c185d4 100644
--- a/src/views/monitor/log/api.vue
+++ b/src/views/monitor/log/api.vue
@@ -121,7 +121,7 @@ export default {
},
beforeOpen (done, type) {
if (["edit", "view"].includes(type)) {
- getApiLogs(this.form.strId).then(res => {
+ getApiLogs(this.form.id).then(res => {
this.form = res.data.data;
});
}
diff --git a/src/views/monitor/log/error.vue b/src/views/monitor/log/error.vue
index baef610..444a5b9 100644
--- a/src/views/monitor/log/error.vue
+++ b/src/views/monitor/log/error.vue
@@ -128,7 +128,7 @@ export default {
},
beforeOpen (done, type) {
if (["edit", "view"].includes(type)) {
- getErrorLogs(this.form.strId).then(res => {
+ getErrorLogs(this.form.id).then(res => {
this.form = res.data.data;
});
}
diff --git a/src/views/monitor/log/usual.vue b/src/views/monitor/log/usual.vue
index f508e43..fdf53f3 100644
--- a/src/views/monitor/log/usual.vue
+++ b/src/views/monitor/log/usual.vue
@@ -120,7 +120,7 @@ export default {
},
beforeOpen (done, type) {
if (["edit", "view"].includes(type)) {
- getUsualLogs(this.form.strId).then(res => {
+ getUsualLogs(this.form.id).then(res => {
this.form = res.data.data;
});
}
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 9c60dbf..aec0db6 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -2,7 +2,7 @@
-
@@ -156,9 +156,24 @@
+
+ 1.[升级]Spring 至 6.1.15
+ 2.[升级]SpringBoot 至 3.2.12
+ 3.[新增]黑名单与白名单IP配置功能
+ 4.[新增]自定义URL拦截功能,默认屏蔽外部访问actuator接口
+ 5.[新增]脱敏工具类
+ 6.[新增]BladeRedis工具类代替RedisUtil工具类
+ 7.[新增]基于Redisson,支持redis pub/sub 发布
+ 8.[新增]@TenantIgnore注解用于接口排除租户逻辑
+ 9.[优化]jackson序列化时支持空字符串转换为null对象
+ 10.[优化]调整 sql 日志打印实现逻辑
+ 11.[优化]关闭 mybatis 默认的日志
+ 12.[优化]默认放行feign接口,特定前缀的feign接口不再二次鉴权
+
- 1.[升级]SpringBoot 至 6.1.14
+ 1.[升级]Spring 至 6.1.14
2.[升级]SpringBoot 至 3.2.10
3.[升级]SpringCloud 至 2023.0.3
4.[升级]SpringCloud Alibaba 至 2023.0.1.2
@@ -646,7 +661,7 @@ export default {
data() {
return {
activeNames: ['1', '2', '3', '5'],
- logActiveNames: ['39']
+ logActiveNames: ['40']
};
},
computed: {