提交 57e06e03 编写于 作者: pig_冷冷's avatar pig_冷冷

Merge branch 'master' into dev

# Conflicts:
#	pig-auth/pom.xml
#	pig-common/pig-common-core/pom.xml
#	pig-common/pig-common-log/pom.xml
#	pig-common/pig-common-security/pom.xml
#	pig-common/pom.xml
#	pig-config/pom.xml
#	pig-eureka/pom.xml
#	pig-gateway/pom.xml
#	pig-upms/pig-upms-api/pom.xml
#	pig-upms/pig-upms-biz/pom.xml
#	pig-upms/pom.xml
#	pig-visual/pig-codegen/pom.xml
#	pig-visual/pig-monitor/pom.xml
#	pig-visual/pig-zipkin/pom.xml
#	pig-visual/pom.xml
#	pom.xml
<p align="center">
<img src="https://img.shields.io/badge/Avue-1.6.0-green.svg" alt="Build Status">
<img src="https://img.shields.io/badge/Spring%20Cloud-Greenwich.SR2-blue.svg" alt="Coverage Status">
<img src="https://img.shields.io/badge/Spring%20Boot-2.1.6.RELEASE-blue.svg" alt="Downloads">
<img src="https://img.shields.io/badge/Spring%20Boot-2.1.7.RELEASE-blue.svg" alt="Downloads">
</p>
**Pig Microservice Architecture**
- 基于 Spring Cloud Greenwich.SR2 、Spring Security OAuth2 的RBAC权限管理系统
- 基于数据驱动视图的理念封装 Element-ui,即使没有 vue 的使用经验也能快速上手
- 基于数据驱动视图的理念封装 element-ui,即使没有 vue 的使用经验也能快速上手
- 提供对常见容器化支持 Docker、Kubernetes、Rancher2 支持
- 提供 lambda 、stream api 、webflux 的生产实践
<a href="https://pig4cloud.com/#/doc/pig" target="_blank">部署文档</a> | <a target="_blank" href="https://avue.top"> 前端解决方案</a> | <a target="_blank" href="https://gitee.com/log4j/pig/releases/v1.3.2"> 1.0 版本</a> | <a target="_blank" href="https://pigx.pig4cloud.com"> PigX在线体验</a>
<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>
![](https://images.gitee.com/uploads/images/2019/0330/065147_85756aea_410595.png)
#### 核心依赖
依赖 | 版本
---|---
Spring Boot | 2.1.6.RELEASE
Spring Boot | 2.1.7.RELEASE
Spring Cloud | Greenwich.SR2
Spring Security OAuth2 | 2.3.5
Mybatis Plus | 3.1.2
hutool | 4.5.16
hutool | 4.6.1
Avue | 1.6.0
......@@ -60,7 +59,7 @@ pig
2. 不接受`功能请求`的 issue,功能请求可能会被直接关闭。
3. <a href="mailto:wangiegie@gmail.com">wangiegie@gmail.com</a>
3. <a href="mailto:pig4cloud@qq.com">pig4cloud@qq.com</a>
4. QQ群: [175429071](//shang.qq.com/wpa/qunwpa?idkey=ca3737e31f86da3b9e3ee6755a92bbc5c44b37d7cabf81fdb6ef0d2f551669c8)
......@@ -72,5 +71,4 @@ pig
#### 关注我们
![](https://images.gitee.com/uploads/images/2019/0330/065148_f0ada806_410595.jpeg)
![](https://images.gitee.com/uploads/images/2019/0808/102636_659bf088_410595.png)
......@@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</parent>
<artifactId>pig-auth</artifactId>
......@@ -39,13 +39,13 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-upms-api</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</dependency>
<!--security-->
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-security</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</dependency>
<!--JDBC相关-->
<dependency>
......
......@@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</parent>
<artifactId>pig-common-core</artifactId>
......
......@@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</parent>
<artifactId>pig-common-log</artifactId>
......@@ -35,13 +35,13 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-core</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</dependency>
<!--UPMS接口模块-->
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-upms-api</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</dependency>
<!--安全依赖获取上下文信息-->
<dependency>
......
......@@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</parent>
<artifactId>pig-common-security</artifactId>
......@@ -35,7 +35,7 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-core</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</dependency>
<!--安全模块-->
<dependency>
......@@ -50,7 +50,7 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-upms-api</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</dependency>
</dependencies>
</project>
......@@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</parent>
<artifactId>pig-common</artifactId>
......
......@@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</parent>
<artifactId>pig-config</artifactId>
......
......@@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</parent>
<artifactId>pig-eureka</artifactId>
......
......@@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</parent>
<artifactId>pig-gateway</artifactId>
......@@ -54,7 +54,7 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-core</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</dependency>
</dependencies>
......
......@@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-upms</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</parent>
<artifactId>pig-upms-api</artifactId>
......@@ -35,7 +35,7 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-core</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</dependency>
</dependencies>
</project>
......@@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-upms</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</parent>
<artifactId>pig-upms-biz</artifactId>
......@@ -34,19 +34,19 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-upms-api</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</dependency>
<!--安全模块-->
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-security</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</dependency>
<!--日志处理-->
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-log</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</dependency>
<!--配置中心客户端-->
<dependency>
......
......@@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</parent>
<artifactId>pig-upms</artifactId>
......
......@@ -22,7 +22,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-visual</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</parent>
<artifactId>pig-codegen</artifactId>
......@@ -50,13 +50,13 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-core</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</dependency>
<!--安全模块-->
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-security</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</dependency>
<!--代码生成模板引擎-->
<dependency>
......
......@@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-visual</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</parent>
<artifactId>pig-monitor</artifactId>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>pig-visual</artifactId>
<groupId>com.pig4cloud</groupId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
</parent>
<artifactId>pig-visual</artifactId>
......
......@@ -21,20 +21,20 @@
<groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId>
<version>2.3.2-SNAPSHOT</version>
<version>2.3.2</version>
<name>${project.artifactId}</name>
<packaging>pom</packaging>
<url>https://www.pig4cloud.com</url>
<properties>
<spring-boot.version>2.1.6.RELEASE</spring-boot.version>
<spring-boot.version>2.1.7.RELEASE</spring-boot.version>
<spring-cloud.version>Greenwich.SR2</spring-cloud.version>
<spring-platform.version>Cairo-SR8</spring-platform.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<spring-boot-admin.version>2.1.6</spring-boot-admin.version>
<hutool.version>4.5.16</hutool.version>
<hutool.version>4.6.1</hutool.version>
<mybatis-plus.version>3.1.2</mybatis-plus.version>
<kaptcha.version>0.0.9</kaptcha.version>
<velocity.version>1.7</velocity.version>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册