🔖 Releasing / Version tags. 2.7.1

README.md

@@ -1,36 +1,43 @@
 <p align="center">
-  <img src="https://img.shields.io/badge/Avue-2.2-green.svg" alt="Build Status">
-  <img src="https://img.shields.io/badge/Spring%20Cloud-Hoxton.RELEASE-blue.svg" alt="Coverage Status">
-  <img src="https://img.shields.io/badge/Spring%20Boot-2.2.1.RELEASE-blue.svg" alt="Downloads">
+ <img src="https://img.shields.io/badge/Pig-2.7-success.svg" alt="Build Status">
+ <img src="https://img.shields.io/badge/Avue-2.3-green.svg" alt="Build Status">
+ <img src="https://img.shields.io/badge/Spring%20Cloud-Hoxto.SR3-blue.svg" alt="Coverage Status">
+ <img src="https://img.shields.io/badge/Spring%20Boot-2.2.RELEASE-blue.svg" alt="Downloads">
 </p>
-
-**Pig Microservice Architecture**   
 
-- 基于 Spring Cloud Hoxton.RELEASE 、Spring Security OAuth2 的RBAC权限管理系统  
+- 基于 Spring Cloud Hoxton 、Spring Boot 2.2、 OAuth2 的RBAC权限管理系统  
 - 基于数据驱动视图的理念封装 element-ui，即使没有 vue 的使用经验也能快速上手  
 - 提供对常见容器化支持 Docker、Kubernetes、Rancher2 支持  
 - 提供 lambda 、stream api 、webflux 的生产实践   
 
 
-<a href="http://pig4cloud.com/doc/pig" target="_blank">部署文档</a> | <a target="_blank" href="http://avue.top"> 前端解决方案</a> | <a target="_blank" href="https://gitee.com/log4j/pig/releases/v1.3.2"> 1.0  版本</a> | <a target="_blank" href="http://pigx.pig4cloud.com"> PigX在线体验</a>
+<a href="http://pig4cloud.com/doc/pig" target="_blank">部署文档</a> | <a target="_blank" href="https://avuejs.com"> 前端解决方案</a> | <a target="_blank" href="http://pigx.pig4cloud.com"> PigX在线体验</a> | <a target="_blank" href="https://pig4cloud.com/images/20190918.pdf"> PigX白皮书</a> | <a target="_blank" href="https://start.pig4cloud.com"> pig4cloud initializr</a>
 
-![](https://images.gitee.com/uploads/images/2019/0330/065147_85756aea_410595.png)
 
 #### 快速构架微服务应用  
 
-<img src="https://images.gitee.com/uploads/images/2019/0823/120112_98bb9619_410595.gif"/>  
+```xml
+<!-- pig-gen archetype -->
+<dependency>
+    <groupId>com.pig4cloud.archetype</groupId>
+    <artifactId>pig-gen</artifactId>
+    <version>last.version</version>
+</dependency>
+```
+
+<img src="https://images.gitee.com/uploads/images/2019/1026/004238_9a73e1e7_393021.gif"/>  
 
 #### 核心依赖 
 
 
 依赖 | 版本
 ---|---
-Spring Boot |  2.2.1.RELEASE  
-Spring Cloud | Hoxton.RELEASE
+Spring Boot |  2.2.5.RELEASE  
+Spring Cloud | Hoxton.SR3   
 Spring Security OAuth2 | 2.3.6
-Mybatis Plus | 3.2.0
-hutool | 5.0.6
-Avue | 2.2.3
+Mybatis Plus | 3.3.1
+hutool | 5.2.5
+Avue | 2.3.9
 
 
 
@@ -40,38 +47,39 @@ pig-ui  -- https://gitee.com/log4j/pig-ui
 
 pig
 ├── pig-auth -- 授权服务提供[3000]
+├── pig-codegen -- 图形化代码生成[5002]
 └── pig-common -- 系统公共模块 
      ├── pig-common-core -- 公共工具类核心包
      ├── pig-common-log -- 日志服务
-     └── pig-common-security -- 安全工具类
-├── pig-config -- 配置中心[8888]
-├── pig-eureka -- 服务注册与发现[8761]
+     ├── pig-common-security -- 安全工具类
+     └── pig-common-swagger -- 接口文档
+├── pig-register -- Nacos Server[8848]
 ├── pig-gateway -- Spring Cloud Gateway网关[9999]
+├── pig-monitor -- Spring Boot Admin监控 [5001]
 └── pig-upms -- 通用用户权限管理模块
      └── pig-upms-api -- 通用用户权限管理系统公共api模块
      └── pig-upms-biz -- 通用用户权限管理系统业务处理模块[4000]
-└── pig-visual  -- 图形化模块 
-     ├── pig-monitor -- Spring Boot Admin监控 [5001]
-     ├── pig-zipkin -- 链路调用监控 [5002]
-     └── pig-codegen -- 图形化代码生成[5003]
 
 ```
-#### 提交反馈
-
-1. 欢迎提交 issue，请写清楚遇到问题的原因，开发环境，复显步骤。
-
-2. 不接受`功能请求`的 issue，功能请求可能会被直接关闭。  
+#### 开源共建
 
-3. <a href="mailto:pig4cloud@qq.com">pig4cloud@qq.com</a>    
+1. 欢迎提交 [pull request](https://dwz.cn/2KURd5Vf)，注意对应提交对应 `dev` 分支
 
-4. <a target="_blank" href="http://wpa.qq.com/msgrd?v=3&uin=1022756131&site=qq&menu=yes"> 个人QQ: 1022756131</a>
+2. 欢迎提交 [issue](https://gitee.com/log4j/pig/issues)，请写清楚遇到问题的原因、开发环境、复显步骤。
 
-#### 开源协议
+3. 不接受`功能请求`的 [issue](https://gitee.com/log4j/pig/issues)，功能请求可能会被直接关闭。  
 
+4. mail: <a href="mailto:pig4cloud@qq.com">pig4cloud@qq.com</a> | <a target="_blank" href="http://wpa.qq.com/msgrd?v=3&uin=2270033969&site=qq&menu=yes"> QQ: 2270033969</a>    
 
-![](https://images.gitee.com/uploads/images/2019/0330/065147_e07bc645_410595.png)
+#### 公开课
 
+<table>
+  <tr>
+    <td><a href="https://www.bilibili.com/video/av45084065" target="_blank"><img src="https://images.gitee.com/uploads/images/2020/0318/215612_b3d0375d_1824312.jpeg"></a></td>
+    <td><a href="https://www.bilibili.com/video/av77344954" target="_blank"><img src="https://images.gitee.com/uploads/images/2020/0318/215612_f6d298c4_1824312.jpeg"></a></td>
+  </tr>
+</table>
 
-#### 关注我们
+#### 交流群
+![](https://images.gitee.com/uploads/images/2020/0318/215612_66ede32c_1824312.jpeg)
 
-![](https://images.gitee.com/uploads/images/2019/0808/102636_659bf088_410595.png)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pig-ui",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "private": true,
   "scripts": {
     "pre": "cnpm install || yarn --registry https://registry.npm.taobao.org || npm install --registry https://registry.npm.taobao.org ",
@@ -9,8 +9,7 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@smallwei/avue": "2.3.5",
-    "avue-plugin-formdesign": "^1.0.2",
+    "@smallwei/avue": "2.4.1",
     "avue-plugin-ueditor": "^0.0.6",
     "axios": "^0.19.0",
     "babel-polyfill": "^6.26.0",
@@ -19,14 +18,15 @@
     "element-ui": "^2.13.0",
     "js-cookie": "^2.2.1",
     "nprogress": "^0.2.0",
+    "pig-avue-form-design": "1.1.6",
     "script-loader": "^0.7.2",
     "vue": "^2.6.10",
     "vue-axios": "^2.1.4",
     "vue-router": "^3.1.3",
     "vuex": "^3.1.1"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^3.11.0",
+    "@vue/cli-plugin-babel": "^3.12.1",
     "@vue/cli-plugin-eslint": "^3.8.0",
     "@vue/cli-service": "^3.11.0",
     "chai": "^4.2.0",

public/index.html

@@ -13,7 +13,7 @@
     <link rel="stylesheet" href="<%= BASE_URL %>cdn/iconfont/1.0.0/index.css">
     <link rel="stylesheet" href="<%= BASE_URL %>cdn/avue/avue.css">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>Pig微服务快速开发框架</title>
+    <title>pig微服务快速开发框架</title>
 </head>
 
 <body>

src/const/crud/admin/user.js

@@ -125,8 +125,9 @@ export const tableOption = {
   }, {
     label: '状态',
     prop: 'lockFlag',
-    type: 'select',
+    type: 'radio',
     slot: true,
+    border: true,
     span: 24,
     rules: [{
       required: true,

src/const/website.js

@@ -2,12 +2,12 @@ export default {
   title: 'Pig',
   logo: 'Pig',
   key: 'pig',   //配置主键,目前用于存储
-  indexTitle: 'Pig 快速开发框架',
+  indexTitle: 'pig 快速开发框架',
   whiteList: ['/login', '/404', '/401', '/lock'], // 配置无权限可以访问的页面
   whiteTagList: ['/login', '/404', '/401', '/lock' ], // 配置不添加tags页面 （'/advanced-router/mutative-detail/*'——*为通配符）
   lockPage: '/lock',
   tokenTime: 6000,
-  infoTitle: 'Pig 快速开发框架',
+  infoTitle: 'pig 快速开发框架',
   statusWhiteList: [428],
   // 配置首页不可关闭
   isFirstPage: false,

src/main.js

@@ -8,7 +8,7 @@ import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 import Avue from '@smallwei/avue'
 import '@smallwei/avue/lib/index.css'
-import avueFormDesign from 'avue-plugin-formdesign'
+import avueFormDesign from 'pig-avue-form-design'
 import './permission' // 权限
 import './error' // 日志
 import router from './router/router'

src/page/login/index.vue

@@ -6,7 +6,7 @@
              src="/img/logo.png"
              alt="">
         <p class="title">{{website.infoTitle}}</p>
-        <p>©2019 v2.7.0</p>
+        <p>©2019 v2.7.1</p>
       </div>
       <div class="login-border">
         <div class="login-main">

src/router/avue-router.js

@@ -18,7 +18,7 @@ RouterPlugin.install = function(router, store) {
   this.$router.$avueRouter = {
     // 全局配置
     $website: this.$store.getters.website,
-    $defaultTitle: 'Pig微服务快速开发框架',
+    $defaultTitle: 'pig微服务快速开发框架',
     routerList: [],
     group: '',
     safe: this,