From 6ba499cc783189a0a8e902039557df78fe87979b Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Sat, 18 Jan 2025 18:20:47 +0800
Subject: [PATCH] =?UTF-8?q?:tada:=204.4.0.RELEASE=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=BB=91=E7=99=BD=E5=90=8D=E5=8D=95=E3=80=81=E8=84=B1=E6=95=8F?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E3=80=81BladeRedis=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                    |  2 +-
 src/config/website.js           |  2 +-
 src/views/monitor/log/api.vue   |  2 +-
 src/views/monitor/log/error.vue |  2 +-
 src/views/monitor/log/usual.vue |  2 +-
 src/views/wel/index.vue         | 18 ++++++++++++++++--
 6 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index df8b08f..3b22a22 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "saber-admin",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
diff --git a/src/config/website.js b/src/config/website.js
index afdec98..13391ce 100644
--- a/src/config/website.js
+++ b/src/config/website.js
@@ -40,7 +40,7 @@ export default {
   //auth配置
   auth: {
     // 使用后端工程 @org.springblade.test.Sm2KeyGenerator 获取
-    publicKey: '请配置国密sm2公钥',
+    publicKey: '048ecaec81db406275b5fd8a18164c4a58cc8575159b89d3cb61871cab34bd267fe0a7543277d4c9cfd13c946c507c3e8dfe0121b845ba968221eaf64a242cf7f0',
   },
   // 授权地址
   authUrl: 'http://localhost/blade-auth/oauth/render',
diff --git a/src/views/monitor/log/api.vue b/src/views/monitor/log/api.vue
index 0edbdea..3b5cfbc 100644
--- a/src/views/monitor/log/api.vue
+++ b/src/views/monitor/log/api.vue
@@ -121,7 +121,7 @@
       },
       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 8eed832..bb6a6b1 100644
--- a/src/views/monitor/log/error.vue
+++ b/src/views/monitor/log/error.vue
@@ -128,7 +128,7 @@
       },
       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 0c09f3f..dc525e9 100644
--- a/src/views/monitor/log/usual.vue
+++ b/src/views/monitor/log/usual.vue
@@ -120,7 +120,7 @@
       },
       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 bfce548..6c155d3 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -3,7 +3,7 @@
     <basic-container>
       <third-register></third-register>
       <p style="text-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-14+-green.svg" alt="Build Status"/>
         <img src="https://img.shields.io/badge/Spring%20Cloud-2023-blue.svg" alt="Coverage Status"/>
         <img src="https://img.shields.io/badge/Spring%20Boot-3.2-blue.svg" alt="Downloads"/>
@@ -125,6 +125,20 @@
       <el-row>
         <basic-container>
           <el-collapse v-model="logActiveNames" @change="handleChange">
+            <el-collapse-item title="4.4.0发布 新增黑白名单、脱敏工具、BladeRedis新版工具" name="40">
+              <div>1.[升级]Spring 至 6.1.15</div>
+              <div>2.[升级]SpringBoot 至 3.2.12</div>
+              <div>3.[新增]黑名单与白名单IP配置功能</div>
+              <div>4.[新增]自定义URL拦截功能，默认屏蔽外部访问actuator接口</div>
+              <div>5.[新增]脱敏工具类</div>
+              <div>6.[新增]BladeRedis工具类代替RedisUtil工具类</div>
+              <div>7.[新增]基于Redisson，支持redis pub/sub 发布</div>
+              <div>8.[新增]@TenantIgnore注解用于接口排除租户逻辑</div>
+              <div>9.[优化]jackson序列化时支持空字符串转换为null对象</div>
+              <div>10.[优化]调整 sql 日志打印实现逻辑</div>
+              <div>11.[优化]关闭 mybatis 默认的日志</div>
+              <div>12.[优化]默认放行feign接口，特定前缀的feign接口不再二次鉴权</div>
+            </el-collapse-item>
             <el-collapse-item title="4.3.0发布 多租户支持线程模式指定租户ID与忽略租户" name="39">
               <div>1.[升级]SpringBoot 至 6.1.14</div>
               <div>2.[升级]SpringBoot 至 3.2.10</div>
@@ -570,7 +584,7 @@
     data() {
       return {
         activeNames: ['1', '2', '3', '5'],
-        logActiveNames: ['39']
+        logActiveNames: ['40']
       };
     },
     computed: {