diff --git a/.editorconfig b/.editorconfig index 46b4828d..725337b7 100755 --- a/.editorconfig +++ b/.editorconfig @@ -17,6 +17,6 @@ indent_size = 4 indent_style = space indent_size = 2 -# 对后缀名为 md 的文件生效 +# 对后缀名为 .md 的文件生效 [*.md] trim_trailing_whitespace = false diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md index ad8944ca..29e98a75 100644 --- a/.gitee/ISSUE_TEMPLATE.zh-CN.md +++ b/.gitee/ISSUE_TEMPLATE.zh-CN.md @@ -5,6 +5,7 @@ ### 报错信息 （注意格式化） + ```angular2 这里粘贴代码或者、日志 @@ -12,4 +13,4 @@ ###问题描述（包括回显步骤、截图 ） -此项没有直接关闭、不予解决 +此项没有直接关闭、感谢理解 diff --git a/README.md b/README.md index cc5965ea..08690739 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@

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

- 基于 Spring Cloud Hoxton 、Spring Boot 2.2、 OAuth2 的RBAC权限管理系统 @@ -18,8 +18,6 @@ 部署文档 | 前端解决方案 | 1.0 版本 | PigX在线体验 | PigX白皮书 - - #### 快速构架微服务应用 ```xml @@ -39,10 +37,10 @@ 依赖 | 版本 ---|--- Spring Boot | 2.2.1.RELEASE -Spring Cloud | Hoxton.RC2 +Spring Cloud | Hoxton.RELEASE Spring Security OAuth2 | 2.3.6 Mybatis Plus | 3.2.0 -hutool | 5.0.5 +hutool | 5.0.6 Avue | 2.2.0 @@ -56,7 +54,8 @@ pig └── pig-common -- 系统公共模块 ├── pig-common-core -- 公共工具类核心包 ├── pig-common-log -- 日志服务 - └── pig-common-security -- 安全工具类 + ├── pig-common-security -- 安全工具类 + └── pig-common-swagger -- 接口文档 ├── pig-config -- 配置中心[8888] ├── pig-eureka -- 服务注册与发现[8761] ├── pig-gateway -- Spring Cloud Gateway网关[9999] diff --git a/pig-auth/pom.xml b/pig-auth/pom.xml index 93050217..788bbc35 100755 --- a/pig-auth/pom.xml +++ b/pig-auth/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 2.5.2.snapshot + 2.6.0 pig-auth @@ -39,13 +39,13 @@ com.pig4cloud pig-upms-api - 2.5.2.snapshot + 2.6.0 com.pig4cloud pig-common-security - 2.5.2.snapshot + 2.6.0 diff --git a/pig-auth/src/main/resources/bootstrap.yml b/pig-auth/src/main/resources/bootstrap.yml index 1aba7c5b..62e89f2e 100755 --- a/pig-auth/src/main/resources/bootstrap.yml +++ b/pig-auth/src/main/resources/bootstrap.yml @@ -24,4 +24,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pig-eureka:8761/eureka/ + defaultZone: http://pig:pig@pig-eureka:8761/eureka diff --git a/pig-common/pig-common-core/pom.xml b/pig-common/pig-common-core/pom.xml index c819bda6..3fafc177 100755 --- a/pig-common/pig-common-core/pom.xml +++ b/pig-common/pig-common-core/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-common - 2.5.2.snapshot + 2.6.0 pig-common-core diff --git a/pig-common/pig-common-log/pom.xml b/pig-common/pig-common-log/pom.xml index 55163fdd..c6d3e62a 100755 --- a/pig-common/pig-common-log/pom.xml +++ b/pig-common/pig-common-log/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-common - 2.5.2.snapshot + 2.6.0 pig-common-log @@ -35,13 +35,13 @@ com.pig4cloud pig-common-core - 2.5.2.snapshot + 2.6.0 com.pig4cloud pig-upms-api - 2.5.2.snapshot + 2.6.0 diff --git a/pig-common/pig-common-security/pom.xml b/pig-common/pig-common-security/pom.xml index 94798c92..8043359d 100755 --- a/pig-common/pig-common-security/pom.xml +++ b/pig-common/pig-common-security/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-common - 2.5.2.snapshot + 2.6.0 pig-common-security @@ -35,7 +35,7 @@ com.pig4cloud pig-common-core - 2.5.2.snapshot + 2.6.0 @@ -50,7 +50,7 @@ com.pig4cloud pig-upms-api - 2.5.2.snapshot + 2.6.0 diff --git a/pig-common/pig-common-swagger/pom.xml b/pig-common/pig-common-swagger/pom.xml index cbda8e9b..735fd888 100644 --- a/pig-common/pig-common-swagger/pom.xml +++ b/pig-common/pig-common-swagger/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pig-common - 2.5.2.snapshot + 2.6.0 pig-common-swagger diff --git a/pig-common/pom.xml b/pig-common/pom.xml index 8b608d7b..efc5fed9 100755 --- a/pig-common/pom.xml +++ b/pig-common/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 2.5.2.snapshot + 2.6.0 pig-common diff --git a/pig-config/pom.xml b/pig-config/pom.xml index 2b44479f..26acbc87 100755 --- a/pig-config/pom.xml +++ b/pig-config/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 2.5.2.snapshot + 2.6.0 pig-config diff --git a/pig-config/src/main/resources/bootstrap.yml b/pig-config/src/main/resources/bootstrap.yml index 822c7b88..7119616f 100755 --- a/pig-config/src/main/resources/bootstrap.yml +++ b/pig-config/src/main/resources/bootstrap.yml @@ -19,7 +19,7 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pig-eureka:8761/eureka/ + defaultZone: http://pig:pig@pig-eureka:8761/eureka # 暴露监控端点 management: diff --git a/pig-eureka/pom.xml b/pig-eureka/pom.xml index f1414d2d..27a62a23 100755 --- a/pig-eureka/pom.xml +++ b/pig-eureka/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 2.5.2.snapshot + 2.6.0 pig-eureka diff --git a/pig-eureka/src/main/resources/bootstrap.yml b/pig-eureka/src/main/resources/bootstrap.yml index 74ff0751..ad0bc82d 100755 --- a/pig-eureka/src/main/resources/bootstrap.yml +++ b/pig-eureka/src/main/resources/bootstrap.yml @@ -22,7 +22,7 @@ eureka: register-with-eureka: false fetch-registry: false service-url: - defaultZone: http://pig:pig@${eureka.instance.hostname}:${server.port}/eureka/ + defaultZone: http://pig:pig@${eureka.instance.hostname}:${server.port}/eureka server: eviction-interval-timer-in-ms: 4000 enable-self-preservation: false diff --git a/pig-gateway/pom.xml b/pig-gateway/pom.xml index 9587483c..dcbd2a56 100755 --- a/pig-gateway/pom.xml +++ b/pig-gateway/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 2.5.2.snapshot + 2.6.0 pig-gateway @@ -54,7 +54,7 @@ com.pig4cloud pig-common-core - 2.5.2.snapshot + 2.6.0 @@ -65,7 +65,7 @@ com.pig4cloud pig-common-swagger - 2.5.2.snapshot + 2.6.0 diff --git a/pig-gateway/src/main/resources/bootstrap.yml b/pig-gateway/src/main/resources/bootstrap.yml index 906a5c41..891a704c 100755 --- a/pig-gateway/src/main/resources/bootstrap.yml +++ b/pig-gateway/src/main/resources/bootstrap.yml @@ -24,6 +24,6 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pig-eureka:8761/eureka/ + defaultZone: http://pig:pig@pig-eureka:8761/eureka diff --git a/pig-upms/pig-upms-api/pom.xml b/pig-upms/pig-upms-api/pom.xml index edbf0fca..d22fee79 100755 --- a/pig-upms/pig-upms-api/pom.xml +++ b/pig-upms/pig-upms-api/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-upms - 2.5.2.snapshot + 2.6.0 pig-upms-api @@ -35,7 +35,7 @@ com.pig4cloud pig-common-core - 2.5.2.snapshot + 2.6.0 diff --git a/pig-upms/pig-upms-biz/pom.xml b/pig-upms/pig-upms-biz/pom.xml index e44ba9ce..d063b8f9 100644 --- a/pig-upms/pig-upms-biz/pom.xml +++ b/pig-upms/pig-upms-biz/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-upms - 2.5.2.snapshot + 2.6.0 pig-upms-biz @@ -34,25 +34,25 @@ com.pig4cloud pig-upms-api - 2.5.2.snapshot + 2.6.0 com.pig4cloud pig-common-security - 2.5.2.snapshot + 2.6.0 com.pig4cloud pig-common-log - 2.5.2.snapshot + 2.6.0 com.pig4cloud pig-common-swagger - 2.5.2.snapshot + 2.6.0 diff --git a/pig-upms/pig-upms-biz/src/main/resources/bootstrap.yml b/pig-upms/pig-upms-biz/src/main/resources/bootstrap.yml index 6b139c78..7c1a4b98 100644 --- a/pig-upms/pig-upms-biz/src/main/resources/bootstrap.yml +++ b/pig-upms/pig-upms-biz/src/main/resources/bootstrap.yml @@ -23,4 +23,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pig-eureka:8761/eureka/ + defaultZone: http://pig:pig@pig-eureka:8761/eureka diff --git a/pig-upms/pom.xml b/pig-upms/pom.xml index 80564910..35593c1c 100755 --- a/pig-upms/pom.xml +++ b/pig-upms/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 2.5.2.snapshot + 2.6.0 pig-upms diff --git a/pig-visual/pig-codegen/pom.xml b/pig-visual/pig-codegen/pom.xml index b55d22b0..d311a86d 100755 --- a/pig-visual/pig-codegen/pom.xml +++ b/pig-visual/pig-codegen/pom.xml @@ -22,7 +22,7 @@ com.pig4cloud pig-visual - 2.5.2.snapshot + 2.6.0 pig-codegen @@ -35,7 +35,7 @@ com.pig4cloud pig-common-swagger - 2.5.2.snapshot + 2.6.0 @@ -56,13 +56,13 @@ com.pig4cloud pig-common-core - 2.5.2.snapshot + 2.6.0 com.pig4cloud pig-common-security - 2.5.2.snapshot + 2.6.0 diff --git a/pig-visual/pig-codegen/src/main/resources/bootstrap.yml b/pig-visual/pig-codegen/src/main/resources/bootstrap.yml index f5fe09ed..d4f8f045 100755 --- a/pig-visual/pig-codegen/src/main/resources/bootstrap.yml +++ b/pig-visual/pig-codegen/src/main/resources/bootstrap.yml @@ -23,7 +23,7 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pig-eureka:8761/eureka/ + defaultZone: http://pig:pig@pig-eureka:8761/eureka logging: level: root: info diff --git a/pig-visual/pig-monitor/pom.xml b/pig-visual/pig-monitor/pom.xml index 429e3ae7..4dcb5eba 100755 --- a/pig-visual/pig-monitor/pom.xml +++ b/pig-visual/pig-monitor/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-visual - 2.5.2.snapshot + 2.6.0 pig-monitor diff --git a/pig-visual/pig-monitor/src/main/resources/bootstrap.yml b/pig-visual/pig-monitor/src/main/resources/bootstrap.yml index b81ffad8..991d74d5 100755 --- a/pig-visual/pig-monitor/src/main/resources/bootstrap.yml +++ b/pig-visual/pig-monitor/src/main/resources/bootstrap.yml @@ -23,4 +23,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pig-eureka:8761/eureka/ + defaultZone: http://pig:pig@pig-eureka:8761/eureka diff --git a/pig-visual/pom.xml b/pig-visual/pom.xml index 39643017..f82ca351 100755 --- a/pig-visual/pom.xml +++ b/pig-visual/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 2.5.2.snapshot + 2.6.0 pig-visual diff --git a/pom.xml b/pom.xml index add4e2de..b2f0dd1d 100755 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ com.pig4cloud pig - 2.5.2.snapshot + 2.6.0 ${project.artifactId} pom https://www.pig4cloud.com @@ -39,14 +39,14 @@ UTF-8 1.8 1.8 - 2.2.0 - 5.0.5 + 0.1.2 + 5.0.6 3.2.0 0.0.9 1.7 2.1.0 2.9.2 - 1.9.6 + 1.9.6 2.3.6.RELEASE