From 5f22a5a288cd508108979ae4c14275d06c8a1da6 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Sat, 18 Jan 2025 18:24:15 +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/mac/index.vue               |  7 ++-----
 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         | 21 ++++++++++++++++++---
 7 files changed, 25 insertions(+), 13 deletions(-)

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 @@
   <div class="desktop">
     <div class="top">
       <el-dropdown trigger="click">
-        <div class="logo"><i class="iconfont icon-pingguo"></i></div>
+        <div class="logo"><i class="iconfont iconicon_setting"></i></div>
         <template #dropdown>
           <el-dropdown-menu>
             <el-dropdown-item>
               <div>{{userInfo.username}}</div>
             </el-dropdown-item>
-            <el-dropdown-item>
-              <top-lock text="锁定屏幕"></top-lock>
-            </el-dropdown-item>
             <el-dropdown-item>
               <div @click="switchTheme">退出主题</div>
             </el-dropdown-item>
@@ -386,4 +383,4 @@ export default {
 .app-item:hover {
   border: 2px solid rgba(255, 255, 255, 0.5);
 }
-</style>
\ No newline at end of file
+</style>
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 @@
   <basic-container>
     <third-register></third-register>
     <p style="text-align: center;">
-      <img src="https://img.shields.io/badge/Release-V4.3.0-green.svg"
+      <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"/>
@@ -156,9 +156,24 @@
           <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>1.[升级]Spring 至 6.1.14</div>
                 <div>2.[升级]SpringBoot 至 3.2.10</div>
                 <div>3.[升级]SpringCloud 至 2023.0.3</div>
                 <div>4.[升级]SpringCloud Alibaba 至 2023.0.1.2</div>
@@ -646,7 +661,7 @@ export default {
   data() {
     return {
       activeNames: ['1', '2', '3', '5'],
-      logActiveNames: ['39']
+      logActiveNames: ['40']
     };
   },
   computed: {