🎉 3.0.0.RELEASE 系统架构升级至 SpringCloud 2021

package.json

@@ -1,6 +1,6 @@
 {
   "name": "saber-admin",
-  "version": "2.9.1",
+  "version": "3.0.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

public/index.html

@@ -15,7 +15,7 @@
   <link rel="stylesheet" href="<%= BASE_URL %>cdn/iconfont/index.css">
   <link rel="stylesheet" href="<%= BASE_URL %>cdn/iconfont/avue/iconfont.css">
   <link rel="stylesheet" href="<%= BASE_URL %>cdn/iconfont/saber/iconfont.css">
-  <link rel="stylesheet" href="<%= BASE_URL %>cdn/avue/2.9.5/index.css">
+  <link rel="stylesheet" href="<%= BASE_URL %>cdn/avue/2.9.12/index.css">
   <script src="<%= BASE_URL %>cdn/xlsx/FileSaver.min.js"></script>
   <script src="<%= BASE_URL %>cdn/xlsx/xlsx.full.min.js"></script>
   <link rel="icon" href="<%= BASE_URL %>favicon.png">
@@ -108,7 +108,7 @@
 <script src="<%= BASE_URL %>cdn/vue-router/3.0.1/vue-router.min.js" charset="utf-8"></script>
 <script src="<%= BASE_URL %>cdn/axios/1.0.0/axios.min.js" charset="utf-8"></script>
 <script src="<%= BASE_URL %>cdn/element-ui/2.15.6/index.js" charset="utf-8"></script>
-<script src="<%= BASE_URL %>cdn/avue/2.9.5/avue.min.js" charset="utf-8"></script>
+<script src="<%= BASE_URL %>cdn/avue/2.9.12/avue.min.js" charset="utf-8"></script>
 <script src="<%= BASE_URL %>cdn/nutflow/wf-design-base/index.umd.min.js" charset="utf-8"></script>
 </body>
 

src/lang/en.js

@@ -1,69 +1,80 @@
 export default {
-  title: 'Avue is a framework',
-  tip: 'tip',
+  title: 'Saber Admin',
   logoutTip: 'Exit the system, do you want to continue?',
   submitText: 'submit',
   cancelText: 'cancel',
   search: 'Please input search content',
   menuTip: 'none menu list',
-  wel: {
-    info: 'Good morning, Smallwei, Avuex is a framework',
-    dept: 'a certain technology department',
-    team: 'Team ranking',
-    project: 'Project access',
-    count: 'Item number',
-    data: {
-      subtitle: 'real time',
-      column1: 'Classified statistics',
-      column2: 'Annex statistics',
-      column3: 'Article statistics',
-      key1: 'C',
-      key2: 'A',
-      key3: 'A',
-      text1: 'Total Record Number of Classifications',
-      text2: 'Number of attachments Uploaded',
-      text3: 'Comment frequency'
-    },
-    data2: {
-      column1: 'Registration today',
-      column2: 'Login today',
-      column3: 'Subscription today',
-      column4: 'Todays review'
-    },
-    data3: {
-      column1: 'Conversion rate（Day 28%）',
-      column2: 'Attendance rate（Day 11%）',
-      column3: 'Attendance rate（Day 33%）'
+  common: {
+    condition: 'condition',
+    display: 'display',
+    hide: 'hide'
+  },
+  tip: {
+    select: 'Please select',
+    input: 'Please input'
+  },
+  upload: {
+    upload: 'upload',
+    tip: 'Drag files here，/'
+  },
+  date: {
+    start: 'Start date',
+    end: 'End date',
+    t: 'today',
+    y: 'yesterday',
+    n: 'nearly 7',
+    a: 'whole'
+  },
+  form: {
+    printBtn: 'print',
+    mockBtn: 'mock',
+    submitBtn: 'submit',
+    emptyBtn: 'empty'
+  },
+  crud: {
+    filter: {
+      addBtn: 'add',
+      clearBtn: 'clear',
+      resetBtn: 'reset',
+      cancelBtn: 'cancel',
+      submitBtn: 'submit'
     },
-    data4: {
-      column1: 'Error log',
-      column2: 'Data display',
-      column3: 'Privilege management',
-      column4: 'user management'
+    column: {
+      name: 'name',
+      hide: 'hide',
+      fixed: 'fixed',
+      filters: 'filters',
+      sortable: 'sortable',
+      index: 'index',
+      width: 'width'
     },
-    table: {
-      rw: 'Work Tasks',
-      nr: 'Work content',
-      sj: 'Working hours',
-    }
-  },
-  route: {
-    info: 'info',
-    website: 'website',
-    avuexwebsite: 'avuex',
-    dashboard: 'dashboard',
-    more: 'more',
-    tags: 'tags',
-    store: 'store',
-    permission: 'permission',
-    api: 'api',
-    logs: 'logs',
-    table: 'table',
-    form: 'form',
-    top: 'backtop',
-    data: 'data',
-    error: 'error',
-    test: 'test'
+    tipStartTitle: 'Currently selected',
+    tipEndTitle: 'items',
+    editTitle: 'edit',
+    copyTitle: 'copy',
+    addTitle: 'add',
+    viewTitle: 'view',
+    filterTitle: 'filter',
+    showTitle: 'showTitle',
+    menu: 'menu',
+    addBtn: 'add',
+    show: 'show',
+    hide: 'hide',
+    open: 'open',
+    shrink: 'shrink',
+    printBtn: 'print',
+    excelBtn: 'excel',
+    updateBtn: 'update',
+    cancelBtn: 'cancel',
+    searchBtn: 'search',
+    emptyBtn: 'empty',
+    menuBtn: 'menu',
+    saveBtn: 'save',
+    viewBtn: 'view',
+    editBtn: 'edit',
+    copyBtn: 'copy',
+    delBtn: 'delete'
   },
   login: {
     title: 'Login ',
@@ -108,4 +119,4 @@ export default {
     closeOthers: 'Close Others',
     closeAll: 'Close All'
   }
-}
+};

src/lang/zh.js

@@ -1,69 +1,80 @@
 export default {
-  tip: '提示',
-  title: 'Saber企业平台',
+  title: 'Saber企业管理平台',
   logoutTip: '退出系统, 是否继续?',
   submitText: '确定',
   cancelText: '取消',
   search: '请输入搜索内容',
   menuTip: '没有发现菜单',
-  wel: {
-    info: '早安，Smallwei，Avuex一款超乎你想象的框架！',
-    dept: '我是avue团队下的一个部门-哈皮部门-哈皮职位',
-    team: '团队内排名',
-    project: '项目访问',
-    count: '项目数',
-    data: {
-      subtitle: '实时',
-      column1: '分类统计',
-      column2: '附件统计',
-      column3: '文章统计',
-      key1: '分',
-      key2: '附',
-      key3: '评',
-      text1: '当前分类总记录数',
-      text2: '当前上传的附件数',
-      text3: '评论次数'
-    },
-    data2: {
-      column1: '今日注册',
-      column2: '今日登录',
-      column3: '今日订阅',
-      column4: '今日评论'
-    },
-    data3: {
-      column1: '转化率（日同比 28%）',
-      column2: '签到率（日同比 11%）',
-      column3: '签到率（日同比 11%）'
+  common: {
+    condition: '条件',
+    display: '显示',
+    hide: '隐藏'
+  },
+  tip: {
+    select: '请选择',
+    input: '请输入'
+  },
+  upload: {
+    upload: '点击上传',
+    tip: '将文件拖到此处，或'
+  },
+  date: {
+    start: '开始日期',
+    end: '结束日期',
+    t: '今日',
+    y: '昨日',
+    n: '近7天',
+    a: '全部'
+  },
+  form: {
+    printBtn: '打 印',
+    mockBtn: '模 拟',
+    submitBtn: '提 交',
+    emptyBtn: '清 空'
+  },
+  crud: {
+    filter: {
+      addBtn: '新增条件',
+      clearBtn: '清空数据',
+      resetBtn: '清空条件',
+      cancelBtn: '取 消',
+      submitBtn: '确 定'
     },
-    data4: {
-      column1: '错误日志',
-      column2: '数据展示',
-      column3: '权限管理',
-      column4: '用户管理'
+    column: {
+      name: '列名',
+      hide: '隐藏',
+      fixed: '冻结',
+      filters: '过滤',
+      sortable: '排序',
+      index: '顺序',
+      width: '宽度'
     },
-    table: {
-      rw: '工作任务',
-      nr: '工作内容',
-      sj: '工作时间'
-    }
-  },
-  route: {
-    info: '个人信息',
-    website: 'bladex官网',
-    avuexwebsite: 'avuex官网',
-    dashboard: '首页',
-    more: '更多',
-    tags: '标签',
-    store: '本地存储',
-    api: '全局函数',
-    logs: '日志监控',
-    table: '表格',
-    form: '表单',
-    top: '返回顶部',
-    data: '数据展示',
-    permission: '权限',
-    error: '异常页面',
-    test: '测试页面'
+    tipStartTitle: '当前表格已选择',
+    tipEndTitle: '项',
+    editTitle: '编 辑',
+    copyTitle: '复 制',
+    addTitle: '新 增',
+    viewTitle: '查 看',
+    filterTitle: '过滤条件',
+    showTitle: '列显隐',
+    menu: '操作',
+    addBtn: '新 增',
+    show: '显 示',
+    hide: '隐 藏',
+    open: '展 开',
+    shrink: '收 缩',
+    printBtn: '打 印',
+    excelBtn: '导 出',
+    updateBtn: '修 改',
+    cancelBtn: '取 消',
+    searchBtn: '搜 索',
+    emptyBtn: '清 空',
+    menuBtn: '功 能',
+    saveBtn: '保 存',
+    viewBtn: '查 看',
+    editBtn: '编 辑',
+    copyBtn: '复 制',
+    delBtn: '删 除'
   },
   login: {
     title: '登录 ',
@@ -107,4 +118,4 @@ export default {
     closeOthers: '关闭其它',
     closeAll: '关闭所有'
   }
-}
+};

src/views/wel/index.vue

@@ -9,10 +9,10 @@
       <el-col :span="24">
         <basic-container>
           <p style="text-align: center">
-            <img src="https://img.shields.io/badge/Release-V2.9.1-green.svg" alt="Downloads"/>
+            <img src="https://img.shields.io/badge/Release-V3.0.0-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.SR12-blue.svg" alt="Coverage Status"/>
-            <img src="https://img.shields.io/badge/Spring%20Boot-2.3.12.RELEASE-blue.svg" alt="Downloads"/>
+            <img src="https://img.shields.io/badge/Spring%20Cloud-2021-blue.svg" alt="Coverage Status"/>
+            <img src="https://img.shields.io/badge/Spring%20Boot-2.7-blue.svg" alt="Downloads"/>
             <a target="_blank" href="https://bladex.vip">
               <img src="https://img.shields.io/badge/Saber%20Author-Small%20Chill-ff69b4.svg" alt="Downloads"/>
             </a>
@@ -44,7 +44,7 @@
             </el-collapse-item>
             <el-collapse-item title="为何需要BladeX" name="3">
               <div>1.经历过较长的线上生产，积累了很多企业痛点的解决方案</div>
-              <div>2.一套代码兼容MySql、Oracle、PostgreSQL、SqlServer，适应企业各种不同场景的需求</div>
+              <div>2.一套代码兼容MySql、Oracle、PostgreSQL、SqlServer、达梦，适应企业各种不同场景的需求</div>
               <div>3.集成了很多企业急切所需的例如多租户、Oauth2授权认证、工作流、分布式事务等等功能</div>
               <div>4.深度定制了Flowable工作流，完美支持SpringCloud分布式服务的场景，以远程调用的方式进行操作</div>
               <div>5.升级了核心驱动，新功能完全可以开箱即用，而开源版需要自己再花时间进行集成，需要花掉更多的时间成本</div>
@@ -139,6 +139,37 @@
         <el-row>
           <basic-container>
             <el-collapse v-model="logActiveNames" @change="handleChange">
+              <el-collapse-item title="3.0.0.RELEASE发布，系统架构升级至 SpringCloud 2021" name="27">
+                <div>1.[升级]SpringCloud 至 2021.0.3</div>
+                <div>2.[升级]SpringBoot 至 2.7.1</div>
+                <div>3.[升级]SpringBootAdmin 至 2.7.1</div>
+                <div>4.[升级]AlibabaCloud 至 2021.0.1.0</div>
+                <div>5.[升级]Mybatis-Plus 至 3.5.2</div>
+                <div>6.[升级]Mybatis-Plus-Generator 至 3.5.3</div>
+                <div>7.[升级]Nacos 至 2.1.0</div>
+                <div>8.[升级]Seata 至 1.5.2</div>
+                <div>9.[升级]Log4J 至 2.18.0</div>
+                <div>10.[升级]JackSon 至 2.13.3</div>
+                <div>11.[升级]FastJson 至 1.2.83</div>
+                <div>12.[升级]Avue 至 2.9.12</div>
+                <div>13.[新增]基于Oauth2的单点登录</div>
+                <div>14.[新增]灰度服务发布与调用</div>
+                <div>15.[新增]代码生成增加element和feign模版</div>
+                <div>16.[优化]自动装配模块采用新版@AutoConfiguration注解</div>
+                <div>17.[优化]TencentCosTemplate避免oom的情况</div>
+                <div>18.[优化]TreeNode类</div>
+                <div>19.[优化]Gateway鉴权逻辑</div>
+                <div>20.[修复]BladeRedis incr方法失效的问题</div>
+                <div>21.[修复]租户产品包更新后缓存未刷新的问题</div>
+                <div>22.[修复]绑定租户产品包后普通管理员权限配置丢失按钮选项的问题</div>
+                <div>23.[修复]流程设计器监听无法删除的问题</div>
+                <div>24.[修复]用户excel导出条件为空的判断逻辑</div>
+                <div>25.[删除]Hystrix接入以Sentinel取代</div>
+                <div>26.[删除]Ribbon接入以LoadBalancer取代</div>
+                <div>27.[删除]Zipkin接入</div>
+                <div>28.[删除]Turbine接入</div>
+                <div>29.[替代]后续版本将对接SkyWalking取代Zipkin与Turbine</div>
+              </el-collapse-item>
               <el-collapse-item title="2.9.1.RELEASE发布，新增达梦数据库支持，集成NutFlow流程设计器" name="26">
                 <div>1.[升级]Mybatis-Plus 至 3.5.1</div>
                 <div>2.[升级]Mybatis-Plus-Generator 至 3.5.2</div>
@@ -730,7 +761,7 @@
     data() {
       return {
         activeNames: ['1', '2', '3', '5'],
-        logActiveNames: ['26']
+        logActiveNames: ['27']
       };
     },
     computed: {