From cbf621faad4635ce189b3b055f64e9272b80a098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Mon, 30 Mar 2020 22:05:18 +0800 Subject: [PATCH] :bookmark: Releasing / Version tags. 2.7.1 --- README.md | 72 ++++++++++++++++++++---------------- package.json | 8 ++-- public/index.html | 2 +- src/const/crud/admin/user.js | 3 +- src/const/website.js | 4 +- src/main.js | 2 +- src/page/login/index.vue | 2 +- src/router/avue-router.js | 2 +- 8 files changed, 52 insertions(+), 43 deletions(-) diff --git a/README.md b/README.md index f76867f..2a7af2a 100644 --- a/README.md +++ b/README.md @@ -1,36 +1,43 @@

- Build Status - Coverage Status - Downloads + Build Status + Build Status + Coverage Status + Downloads

- -**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 的生产实践 -部署文档 | 前端解决方案 | 1.0 版本 | PigX在线体验 +部署文档 | 前端解决方案 | PigX在线体验 | PigX白皮书 | pig4cloud initializr -![](https://images.gitee.com/uploads/images/2019/0330/065147_85756aea_410595.png) #### 快速构架微服务应用 - +```xml + + + com.pig4cloud.archetype + pig-gen + last.version + +``` + + #### 核心依赖 依赖 | 版本 ---|--- -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. pig4cloud@qq.com +1. 欢迎提交 [pull request](https://dwz.cn/2KURd5Vf)，注意对应提交对应 `dev` 分支 -4. 个人QQ: 1022756131 +2. 欢迎提交 [issue](https://gitee.com/log4j/pig/issues)，请写清楚遇到问题的原因、开发环境、复显步骤。 -#### 开源协议 +3. 不接受`功能请求`的 [issue](https://gitee.com/log4j/pig/issues)，功能请求可能会被直接关闭。 +4. mail: pig4cloud@qq.com | QQ: 2270033969 -![](https://images.gitee.com/uploads/images/2019/0330/065147_e07bc645_410595.png) +#### 公开课 + + + + + +
-#### 关注我们 +#### 交流群 +![](https://images.gitee.com/uploads/images/2020/0318/215612_66ede32c_1824312.jpeg) -![](https://images.gitee.com/uploads/images/2019/0808/102636_659bf088_410595.png) diff --git a/package.json b/package.json index 52df44e..80861c1 100644 --- a/package.json +++ b/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,6 +18,7 @@ "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", @@ -26,7 +26,7 @@ "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", diff --git a/public/index.html b/public/index.html index 5fc0f47..4e6c186 100644 --- a/public/index.html +++ b/public/index.html @@ -13,7 +13,7 @@ - Pig微服务快速开发框架 + pig微服务快速开发框架 diff --git a/src/const/crud/admin/user.js b/src/const/crud/admin/user.js index a38f217..1d1e2a1 100644 --- a/src/const/crud/admin/user.js +++ b/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, diff --git a/src/const/website.js b/src/const/website.js index 34bbb05..6f667c6 100644 --- a/src/const/website.js +++ b/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, diff --git a/src/main.js b/src/main.js index 480e80b..0935554 100644 --- a/src/main.js +++ b/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' diff --git a/src/page/login/index.vue b/src/page/login/index.vue index 53f1ca7..2e77bcb 100644 --- a/src/page/login/index.vue +++ b/src/page/login/index.vue @@ -6,7 +6,7 @@ src="/img/logo.png" alt="">

{{website.infoTitle}}

-

©2019 v2.7.0

+

©2019 v2.7.1