From 8947b4b9fddac9709f357c32843d04da259f2d80 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Sun, 14 Jul 2024 23:25:32 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=204.1.0.RELEASE=20=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8D=87=E7=BA=A7=E4=B8=BA=E5=9B=BD=E5=AF=86?=
 =?UTF-8?q?=E7=AE=97=E6=B3=95=EF=BC=8C=E6=95=B0=E6=8D=AE=E5=BA=93password?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=86=85=E5=AE=B9=E6=97=A0=E9=9C=80=E5=8F=98?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                        | 15 ++++++++-------
 package.json                     |  5 +++--
 src/defaultSettings.js           |  4 ++++
 src/pages/Dashboard/Workplace.js | 17 +++++++++++++++--
 src/services/user.js             |  2 ++
 src/utils/sm2.js                 | 16 ++++++++++++++++
 6 files changed, 48 insertions(+), 11 deletions(-)
 create mode 100644 src/utils/sm2.js

diff --git a/README.md b/README.md
index cd4c844..90bca51 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
  <p align="center">
-      <img src="https://img.shields.io/badge/Release-V4.0.0-green.svg" alt="Downloads">
+      <img src="https://img.shields.io/badge/Release-V4.1.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">
@@ -32,12 +32,13 @@
 | 技术栈                  | 版本         |
 |----------------------|------------|
 | Java                 | 17+        |
-| Spring               | 6.1.5      |
-| Spring Boot          | 3.2.4      |
-| Spring Cloud         | 2023.0.1   |
-| Spring Cloud Alibaba | 2022.0.0.0 |
-| Nacos Alibaba        | 2.3.1      |
-| Mybatis Plus         | 3.5.6      |
+| NodeJS               | 18+        |
+| Spring               | 6.1.10     |
+| Spring Boot          | 3.2.7      |
+| Spring Cloud         | 2023.0.2   |
+| Spring Cloud Alibaba | 2023.0.1.0 |
+| Nacos Alibaba        | 2.3.2      |
+| Mybatis Plus         | 3.5.7      |
 
 
 ## 工程结构
diff --git a/package.json b/package.json
index 057d1ef..b474310 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,11 @@
 {
   "name": "sword-admin",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "An out-of-box UI solution for enterprise applications",
   "private": true,
   "scripts": {
     "presite": "cd functions && npm install",
-    "start": "cross-env MOCK=none PORT=1888 umi dev",
+    "start": "export NODE_OPTIONS=--openssl-legacy-provider && cross-env MOCK=none PORT=1888 umi dev",
     "start:no-mock": "cross-env MOCK=none PORT=1888 umi dev",
     "start:mock": "cross-env APP_TYPE=site PORT=1888 umi dev",
     "build": "umi build",
@@ -39,6 +39,7 @@
     "bizcharts-plugin-slider": "^2.1.1-beta.1",
     "classnames": "^2.2.6",
     "crypto-js": "^4.0.0",
+    "sm-crypto": "^0.3.13",
     "dva": "^2.4.1",
     "enquire-js": "^0.2.1",
     "hash.js": "^1.1.7",
diff --git a/src/defaultSettings.js b/src/defaultSettings.js
index 50d34c9..da382e6 100644
--- a/src/defaultSettings.js
+++ b/src/defaultSettings.js
@@ -16,6 +16,10 @@ module.exports = {
     disableLocal: false,
   },
   pwa: true,
+  auth: {
+    // 使用后端工程 @org.springblade.test.Sm2KeyGenerator 获取
+    publicKey: '04e6862d0819ec55e9d7d8bb961ccc8c2b7d86b6845ac333d1d9ab8af6a892cebb3d30f952da4111971908eb02829459170bdd338e7a27fa57d6300dc290d052b5',
+  },
   // 第三方登陆授权地址
   authUrl: 'http://localhost/blade-auth/oauth/render',
   // 报表设计器地址(cloud端口为8108,boot端口为80)
diff --git a/src/pages/Dashboard/Workplace.js b/src/pages/Dashboard/Workplace.js
index e749326..505a4f7 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.0.0-green.svg" alt="Downloads" />
+                <img src="https://img.shields.io/badge/Release-V4.1.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,20 @@ class Workplace extends PureComponent {
             </Row>
             <Row gutter={24}>
               <Card className={styles.card} bordered={false}>
-                <Collapse bordered={false} defaultActiveKey={['36']}>
+                <Collapse bordered={false} defaultActiveKey={['37']}>
+                  <Panel header="4.1.0发布 登录认证升级国密算法，数据库password字段无需变动" key="37">
+                    <div>1.[升级]SpringBoot 至 3.2.7</div>
+                    <div>2.[升级]SpringCloud 至 2023.0.2</div>
+                    <div>3.[升级]AlibabaCloud 至 2023.0.1.0</div>
+                    <div>4.[升级]Nacos 至 2.3.2</div>
+                    <div>5.[升级]MybatisPlus 至 3.5.7</div>
+                    <div>6.[新增]登录认证升级为国密sm2算法，数据库字段无需变动</div>
+                    <div>7.[新增]oss内网上传后转换返回外网地址</div>
+                    <div>8.[新增]saber2与saber3支持nodejs18编译</div>
+                    <div>9.[优化]完善swagger与springdoc的配置</div>
+                    <div>10.[优化]重构StringUtil的format方法</div>
+                    <div>11.[优化]saveOrUpdate方法增加业务字段更新逻辑</div>
+                  </Panel>
                   <Panel header="4.0.0发布 升级 SpringBoot3 SpringCloud2023 JDK17" key="36">
                     <div>1.[升级]JDK 至 Java17</div>
                     <div>2.[升级]SpringBoot 至 3.2.4</div>
diff --git a/src/services/user.js b/src/services/user.js
index 8180a91..eae9499 100644
--- a/src/services/user.js
+++ b/src/services/user.js
@@ -3,11 +3,13 @@ import request from '../utils/request';
 import func from '../utils/Func';
 import { getCaptchaKey } from '../utils/authority';
 import { captchaMode } from '../defaultSettings';
+import encrypt from '../utils/sm2'
 
 // =====================用户===========================
 
 export async function accountLogin(params) {
   const values = params;
+  values.password = encrypt(params.password);
   values.grantType = captchaMode ? 'captcha' : 'password';
   values.scope = 'all';
   return request('/api/blade-auth/token', {
diff --git a/src/utils/sm2.js b/src/utils/sm2.js
new file mode 100644
index 0000000..18e24e6
--- /dev/null
+++ b/src/utils/sm2.js
@@ -0,0 +1,16 @@
+import { sm2 } from 'sm-crypto';
+import { auth } from '../defaultSettings';
+
+
+/**
+ * sm2 加密方法
+ * @param data
+ * @returns {*}
+ */
+export default function encrypt(data) {
+  try {
+    return sm2.doEncrypt(data, auth.publicKey, 0);
+  } catch {
+    return '';
+  }
+}