From 471c659f380d73071d1db16650077e029b918ef8 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Wed, 4 Mar 2020 13:10:40 +0800
Subject: [PATCH] =?UTF-8?q?:tada:=202.6.2.RELEASE,=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81Seata1.1,=E6=94=AF=E6=8C=81=E9=98=BF=E9=87=8C?=
 =?UTF-8?q?=E4=BA=91oss?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                        |  6 +++---
 mock/user.js                     | 11 +++++++++++
 package.json                     |  5 +++--
 src/pages/Dashboard/Workplace.js | 16 ++++++++++++----
 4 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 49c3d1f..85650bd 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
  <p align="center">
-      <img src="https://img.shields.io/badge/Release-V2.6.1-green.svg" alt="Downloads">
+      <img src="https://img.shields.io/badge/Release-V2.6.2-green.svg" alt="Downloads">
       <img src="https://img.shields.io/badge/JDK-1.8+-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-Hoxton.SR1-blue.svg" alt="Coverage Status">
-   <img src="https://img.shields.io/badge/Spring%20Boot-2.2.2.RELEASE-blue.svg" alt="Downloads">
+   <img src="https://img.shields.io/badge/Spring%20Cloud-Hoxton.SR2-blue.svg" alt="Coverage Status">
+   <img src="https://img.shields.io/badge/Spring%20Boot-2.2.5.RELEASE-blue.svg" alt="Downloads">
    <a target="_blank" href="https://bladex.vip">
    <img src="https://img.shields.io/badge/Author-Small%20Chill-ff69b4.svg" alt="Downloads">
  </a>
diff --git a/mock/user.js b/mock/user.js
index a738e5a..71ddc89 100644
--- a/mock/user.js
+++ b/mock/user.js
@@ -166,6 +166,17 @@ const proxy = {
       msg: '操作成功',
     });
   },
+  'GET /api/blade-auth/captcha': (req, res) => {
+    res.send({
+      code: 200,
+      success: true,
+      data: {
+        key: 'blade-captcha',
+        image: 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7',
+      },
+      msg: '操作成功',
+    });
+  },
   'POST /api/register': (req, res) => {
     res.send({ status: 'ok', currentAuthority: 'user' });
   },
diff --git a/package.json b/package.json
index e3e159e..d466035 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,13 @@
 {
   "name": "sword",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "An out-of-box UI solution for enterprise applications",
   "private": true,
   "scripts": {
     "presite": "cd functions && npm install",
-    "start": "cross-env APP_TYPE=site PORT=8888 umi dev",
+    "start": "cross-env MOCK=none PORT=8888 umi dev",
     "start:no-mock": "cross-env MOCK=none PORT=8888 umi dev",
+    "start:mock": "cross-env APP_TYPE=site PORT=8888 umi dev",
     "build": "umi build",
     "site": "npm run presite && cross-env APP_TYPE=site npm run build && firebase deploy && npm run docker:push",
     "analyze": "cross-env ANALYZE=1 umi build",
diff --git a/src/pages/Dashboard/Workplace.js b/src/pages/Dashboard/Workplace.js
index 3b87443..850b767 100644
--- a/src/pages/Dashboard/Workplace.js
+++ b/src/pages/Dashboard/Workplace.js
@@ -14,14 +14,14 @@ class Workplace extends PureComponent {
           <Row gutter={24}>
             <Col span={24}>
               <div style={{ textAlign: 'center' }}>
-                <img src="https://img.shields.io/badge/Release-V2.6.1-green.svg" alt="Downloads" />
+                <img src="https://img.shields.io/badge/Release-V2.6.2-green.svg" alt="Downloads" />
                 <img src="https://img.shields.io/badge/JDK-1.8+-green.svg" alt="Build Status" />
                 <img
-                  src="https://img.shields.io/badge/Spring%20Cloud-Hoxton.SR1-blue.svg"
+                  src="https://img.shields.io/badge/Spring%20Cloud-Hoxton.SR2-blue.svg"
                   alt="Coverage Status"
                 />
                 <img
-                  src="https://img.shields.io/badge/Spring%20Boot-2.2.4.RELEASE-blue.svg"
+                  src="https://img.shields.io/badge/Spring%20Boot-2.2.5.RELEASE-blue.svg"
                   alt="Downloads"
                 />
                 <a href="https://bladex.vip">
@@ -206,7 +206,15 @@ class Workplace extends PureComponent {
             </Row>
             <Row gutter={24}>
               <Card className={styles.card} bordered={false}>
-                <Collapse bordered={false} defaultActiveKey={['15']}>
+                <Collapse bordered={false} defaultActiveKey={['16']}>
+                  <Panel header="2.6.1发布 增加登陆验证码，支持seata1.0" key="16">
+                    <div>1.升级SpringBoot 2.2.5.RELEASE</div>
+                    <div>2.升级SpringCloud Hoxton.SR2</div>
+                    <div>3.升级Seata 1.1.0</div>
+                    <div>4.增加阿里云对象存储封装</div>
+                    <div>5.优化BladeFeignTargeter的加载逻辑</div>
+                    <div>6.优化系统配置</div>
+                  </Panel>
                   <Panel header="2.6.1发布 增加登陆验证码，支持seata1.0" key="15">
                     <div>1.升级SpringBoot 2.2.4.RELEASE</div>
                     <div>2.升级Alibaba Cloud 2.2.0.RELEASE</div>