zianxin/pigx
1
0 Fork 0
mirror of http://git.pig4cloud.com/pig/pigx.git synced 2026-11-08 12:39:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://gitee.ltd/pig/pigx into dev

Browse Source 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
冷冷 committed 2018-11-14 10:55:23 +08:00
2 parents 3f44a50980 4068db4c17
commit cea0cafa70
21 files changed
+41 -41
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pigx-auth/pom.xml
+3 -3
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</parent>
<artifactId>pigx-auth</artifactId>
@@ -42,13 +42,13 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-upms-api</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</dependency>
<!--security-->
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common-security</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</dependency>
<!--JDBC相关-->
<dependency>
pigx-common/pigx-common-core/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</parent>
<artifactId>pigx-common-core</artifactId>
pigx-common/pigx-common-job/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</parent>
<artifactId>pigx-common-job</artifactId>
pigx-common/pigx-common-log/pom.xml
+3 -3
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</parent>
<artifactId>pigx-common-log</artifactId>
@@ -38,13 +38,13 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common-core</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</dependency>
<!--UPMS接口模块-->
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-upms-api</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</dependency>
<!--安全依赖获取上下文信息-->
<dependency>
pigx-common/pigx-common-security/pom.xml
+3 -3
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</parent>
<artifactId>pigx-common-security</artifactId>
@@ -38,7 +38,7 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common-core</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</dependency>
<!--安全模块-->
<dependency>
@@ -49,7 +49,7 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-upms-api</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</dependency>
</dependencies>
</project>
pigx-common/pigx-common-swagger/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</parent>
<artifactId>pigx-common-swagger</artifactId>
pigx-common/pigx-common-transaction/pom.xml
+2 -2
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</parent>
<artifactId>pigx-common-transaction</artifactId>
@@ -17,7 +17,7 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common-core</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</dependency>
<!--lcn 模块端控制依赖-->
<dependency>
pigx-common/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</parent>
<artifactId>pigx-common</artifactId>
pigx-config/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</parent>
<artifactId>pigx-config</artifactId>
pigx-config/src/main/resources/config/application-dev.yml
+1 -1
View File
@@ -78,7 +78,7 @@ mybatis-plus:
swagger:
title: PigX Swagger API
description: 全宇宙最牛逼的Spring Cloud微服务开发脚手架
version: 1.7.0
version: 1.7.1
license: Powered By PigX
licenseUrl: https://pig4cloud.com/
terms-of-service-url: https://pig4cloud.com/
pigx-eureka/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</parent>
<artifactId>pigx-eureka</artifactId>
pigx-gateway/pom.xml
+2 -2
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</parent>
<artifactId>pigx-gateway</artifactId>
@@ -63,7 +63,7 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common-core</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</dependency>
<!--缓存-->
<dependency>
pigx-upms/pigx-upms-api/pom.xml
+2 -2
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-upms</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</parent>
<artifactId>pigx-upms-api</artifactId>
@@ -38,7 +38,7 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common-core</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</dependency>
</dependencies>
</project>
pigx-upms/pigx-upms-biz/pom.xml
+5 -5
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-upms</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</parent>
<artifactId>pigx-upms-biz</artifactId>
@@ -37,13 +37,13 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-upms-api</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</dependency>
<!--日志处理-->
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common-log</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</dependency>
<!--缓存依赖-->
<dependency>
@@ -55,7 +55,7 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common-swagger</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</dependency>
<!--eureka 客户端-->
<dependency>
@@ -71,7 +71,7 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common-security</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</dependency>
<!--支持动态路由配置 -->
<dependency>
pigx-upms/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</parent>
<artifactId>pigx-upms</artifactId>
pigx-visual/pigx-codegen/pom.xml
+4 -4
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</parent>
<artifactId>pigx-codegen</artifactId>
@@ -34,19 +34,19 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common-core</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</dependency>
<!--swagger-->
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common-swagger</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</dependency>
<!--安全模块-->
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common-security</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</dependency>
<!--代码生成模板引擎-->
<dependency>
pigx-visual/pigx-daemon/pom.xml
+4 -4
View File
@@ -23,7 +23,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</parent>
<artifactId>pigx-daemon</artifactId>
@@ -41,7 +41,7 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common-job</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</dependency>
<!--mybatis-->
<dependency>
@@ -68,13 +68,13 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common-swagger</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</dependency>
<!-- 安全模块-->
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common-security</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</dependency>
<!--web 模块-->
<dependency>
pigx-visual/pigx-monitor/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</parent>
<artifactId>pigx-monitor</artifactId>
pigx-visual/pigx-tx-manager/pom.xml
+2 -2
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</parent>
<artifactId>pigx-tx-manager</artifactId>
@@ -63,7 +63,7 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common-core</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</dependency>
</dependencies>
<build>
pigx-visual/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</parent>
<artifactId>pigx-visual</artifactId>
pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
<name>${project.artifactId}</name>
<packaging>pom</packaging>
<url>https://www.pig4cloud.com</url>