From bd2589853c9bc98d410b643938310153e96dc266 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Sat, 18 Jan 2025 18:22:40 +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/defaultSettings.js            |  2 +-
 src/pages/Dashboard/Workplace.js  | 18 ++++++++++++++++--
 src/pages/Monitor/Log/LogApi.js   |  2 +-
 src/pages/Monitor/Log/LogError.js |  2 +-
 src/pages/Monitor/Log/LogUsual.js |  2 +-
 src/services/notice.js            |  4 ++--
 7 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index af55886..4ea3daa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sword-admin",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "description": "An out-of-box UI solution for enterprise applications",
   "private": true,
   "scripts": {
diff --git a/src/defaultSettings.js b/src/defaultSettings.js
index 476fbdf..2ef9048 100644
--- a/src/defaultSettings.js
+++ b/src/defaultSettings.js
@@ -18,7 +18,7 @@ module.exports = {
   pwa: true,
   auth: {
     // 使用后端工程 @org.springblade.test.Sm2KeyGenerator 获取
-    publicKey: '请配置国密sm2公钥',
+    publicKey: '048ecaec81db406275b5fd8a18164c4a58cc8575159b89d3cb61871cab34bd267fe0a7543277d4c9cfd13c946c507c3e8dfe0121b845ba968221eaf64a242cf7f0',
   },
   // 第三方登陆授权地址
   authUrl: 'http://localhost/blade-auth/oauth/render',
diff --git a/src/pages/Dashboard/Workplace.js b/src/pages/Dashboard/Workplace.js
index 5b296e1..c134c9e 100644
--- a/src/pages/Dashboard/Workplace.js
+++ b/src/pages/Dashboard/Workplace.js
@@ -20,7 +20,7 @@ class Workplace extends PureComponent {
           <Row gutter={24}>
             <Col span={24}>
               <div style={{ textAlign: 'center' }}>
-                <img src="https://img.shields.io/badge/Release-V4.2.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/Spring%20Cloud-2023-blue.svg"
@@ -212,7 +212,21 @@ class Workplace extends PureComponent {
             </Row>
             <Row gutter={24}>
               <Card className={styles.card} bordered={false}>
-                <Collapse bordered={false} defaultActiveKey={['39']}>
+                <Collapse bordered={false} defaultActiveKey={['40']}>
+                  <Panel header="4.4.0发布 新增黑白名单、脱敏工具、BladeRedis新版工具" key="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>
+                  </Panel>
                   <Panel header="4.3.0发布 多租户支持线程模式指定租户ID与忽略租户" key="39">
                     <div>1.[升级]SpringBoot 至 6.1.14</div>
                     <div>2.[升级]SpringBoot 至 3.2.10</div>
diff --git a/src/pages/Monitor/Log/LogApi.js b/src/pages/Monitor/Log/LogApi.js
index c0b62da..63fd118 100644
--- a/src/pages/Monitor/Log/LogApi.js
+++ b/src/pages/Monitor/Log/LogApi.js
@@ -109,7 +109,7 @@ class LogApi extends PureComponent {
           loading={loading}
           data={apiData}
           columns={columns}
-          pkField="strId"
+          pkField="id"
         />
       </Panel>
     );
diff --git a/src/pages/Monitor/Log/LogError.js b/src/pages/Monitor/Log/LogError.js
index 6605eb2..da335e5 100644
--- a/src/pages/Monitor/Log/LogError.js
+++ b/src/pages/Monitor/Log/LogError.js
@@ -100,7 +100,7 @@ class LogError extends PureComponent {
           loading={loading}
           data={errorData}
           columns={columns}
-          pkField="strId"
+          pkField="id"
         />
       </Panel>
     );
diff --git a/src/pages/Monitor/Log/LogUsual.js b/src/pages/Monitor/Log/LogUsual.js
index b1e3a13..4d98a16 100644
--- a/src/pages/Monitor/Log/LogUsual.js
+++ b/src/pages/Monitor/Log/LogUsual.js
@@ -109,7 +109,7 @@ class LogUsual extends PureComponent {
           loading={loading}
           data={usualData}
           columns={columns}
-          pkField="strId"
+          pkField="id"
         />
       </Panel>
     );
diff --git a/src/services/notice.js b/src/services/notice.js
index 5f72c37..ba1dc5e 100644
--- a/src/services/notice.js
+++ b/src/services/notice.js
@@ -16,7 +16,7 @@ export async function remove(params) {
   return request('/api/blade-desk/notice/remove', {
     method: 'POST',
     body: func.toFormData(params),
-    cryptoToken: true,
+    cryptoToken: false,
   });
 }
 
@@ -24,7 +24,7 @@ export async function submit(params) {
   return request('/api/blade-desk/notice/submit', {
     method: 'POST',
     body: params,
-    cryptoToken: true,
+    cryptoToken: false,
   });
 }