Merge pull request #76 from zhangbin1010/dev

Dev
zhangbinhub · Aug 25, 2019 · 956e1f6 · 956e1f6
2 parents 380486b + b3acfd3
commit 956e1f6
Show file tree

Hide file tree

Showing 21 changed files with 21 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -1,13 +1,13 @@
 # acp-admin-cloud
-###### v3.0.4 [版本更新日志](doc/version_history.md)
+###### v3.0.5 [版本更新日志](doc/version_history.md)
 - 使用Application Construction Platform 应用构建平台作为脚手架
 - 基于 Spring Cloud
 - 该项目是前后端分离架构中的“后端部分”。前端工程[请移步](https://github.com/zhangbin1010/acp-admin)
 
 ## 相关组件版本
 - [Spring Boot 2.1.7.RELEASE](https://projects.spring.io/spring-boot)
 - [Spring Cloud Greenwich.SR2](http://projects.spring.io/spring-cloud)
-- [Acp 6.1.3](https://github.com/zhangbin1010/acp)
+- [Acp 6.1.4](https://github.com/zhangbin1010/acp)
 
 ## 技术栈
 - flowable

diff --git a/cloud/admin-server/src/main/resources/bootstrap.yml b/cloud/admin-server/src/main/resources/bootstrap.yml
@@ -19,7 +19,7 @@ spring:
           - "classpath:/META-INF/spring-boot-admin-server-ui/"
           - "classpath:/static/"
 info:
-  version: 3.0.4
+  version: 3.0.5
   app-name: ${spring.application.name}
   tags:
     environment: ${spring.profiles.active}

diff --git a/cloud/config-refresh-server/src/main/resources/bootstrap.yml b/cloud/config-refresh-server/src/main/resources/bootstrap.yml
@@ -13,7 +13,7 @@ spring:
     sender:
       type: kafka
 info:
-  version: 3.0.4
+  version: 3.0.5
   app-name: ${spring.application.name}
   tags:
     environment: ${spring.profiles.active}

diff --git a/cloud/config-server/src/main/resources/bootstrap.yml b/cloud/config-server/src/main/resources/bootstrap.yml
@@ -5,7 +5,7 @@ server:
     max-threads: 1000
     uri-encoding: UTF-8
 info:
-  version: 3.0.4
+  version: 3.0.5
   app-name: ${spring.application.name}
   tags:
     environment: ${spring.profiles.active}

diff --git a/cloud/eureka-server/src/main/resources/bootstrap.yml b/cloud/eureka-server/src/main/resources/bootstrap.yml
@@ -10,7 +10,7 @@ spring:
   thymeleaf:
     cache: false
 info:
-  version: 3.0.4
+  version: 3.0.5
   app-name: ${spring.application.name}
   tags:
     environment: ${spring.profiles.active}

diff --git a/cloud/file-server/src/main/resources/bootstrap.yml b/cloud/file-server/src/main/resources/bootstrap.yml
@@ -27,7 +27,7 @@ spring:
         max-interval: 5000 #最长重试间隔
         multiplier: 1.1 #每次重试失败后，重试间隔所增加的倍数
 info:
-  version: 3.0.4
+  version: 3.0.5
   app-name: ${spring.application.name}
   tags:
     environment: ${spring.profiles.active}

diff --git a/cloud/gateway-server/src/main/resources/bootstrap.yml b/cloud/gateway-server/src/main/resources/bootstrap.yml
@@ -66,7 +66,7 @@ spring:
                 name: GateWayHystrix
                 fallbackUri: forward:/hystrixhandle
 info:
-  version: 3.0.4
+  version: 3.0.5
   app-name: ${spring.application.name}
   tags:
     environment: ${spring.profiles.active}

diff --git a/cloud/log-server/src/main/resources/bootstrap.yml b/cloud/log-server/src/main/resources/bootstrap.yml
@@ -27,7 +27,7 @@ spring:
         max-interval: 5000 #最长重试间隔
         multiplier: 1.1 #每次重试失败后，重试间隔所增加的倍数
 info:
-  version: 3.0.4
+  version: 3.0.5
   app-name: ${spring.application.name}
   tags:
     environment: ${spring.profiles.active}

diff --git a/cloud/oauth-server/src/main/kotlin/pers/acp/admin/oauth/base/OauthBaseDomain.kt b/cloud/oauth-server/src/main/kotlin/pers/acp/admin/oauth/base/OauthBaseDomain.kt
@@ -24,7 +24,8 @@ constructor(protected val userRepository: UserRepository) : BaseDomain() {
      * @return true|false
      */
     protected fun isSuper(user: User): Boolean =
-            user.roleSet.map { it.code }.toList().contains(RoleCode.SUPER)
+            user.roleSet.map { it.code }.toList().contains(RoleCode.SUPER) ||
+                    user.roleSet.map { it.levels }.toIntArray().min() == 0
 
     /**
      * 获取指定用户所属角色中最高级别

diff --git a/cloud/oauth-server/src/main/kotlin/pers/acp/admin/oauth/controller/api/RoleController.kt b/cloud/oauth-server/src/main/kotlin/pers/acp/admin/oauth/controller/api/RoleController.kt
@@ -93,9 +93,6 @@ constructor(private val logAdapter: LogAdapter, private val roleDomain: RoleDoma
         if (CommonTools.isNullStr(rolePO.appId)) {
             throw ServerException("应用ID不能为空")
         }
-        if (!roleCodeList.contains(rolePO.code)) {
-            throw ServerException("角色编码非法，请重新输入")
-        }
         return ResponseEntity.status(HttpStatus.CREATED).body(roleDomain.doCreate(rolePO, user.name))
     }
 
@@ -119,9 +116,6 @@ constructor(private val logAdapter: LogAdapter, private val roleDomain: RoleDoma
     @AcpCloudDuplicateSubmission
     @Throws(ServerException::class)
     fun update(user: OAuth2Authentication, @RequestBody @Valid rolePO: RolePo): ResponseEntity<Role> {
-        if (!roleCodeList.contains(rolePO.code)) {
-            throw ServerException("角色编码非法，请重新输入")
-        }
         if (CommonTools.isNullStr(rolePO.id)) {
             throw ServerException("ID不能为空")
         }

diff --git a/cloud/oauth-server/src/main/resources/bootstrap.yml b/cloud/oauth-server/src/main/resources/bootstrap.yml
@@ -27,7 +27,7 @@ spring:
         max-interval: 5000 #最长重试间隔
         multiplier: 1.1 #每次重试失败后，重试间隔所增加的倍数
 info:
-  version: 3.0.4
+  version: 3.0.5
   app-name: ${spring.application.name}
   tags:
     environment: ${spring.profiles.active}

diff --git a/cloud/oauth-server/src/test/resources/bootstrap.yml b/cloud/oauth-server/src/test/resources/bootstrap.yml
@@ -27,7 +27,7 @@ spring:
         max-interval: 5000 #最长重试间隔
         multiplier: 1.1 #每次重试失败后，重试间隔所增加的倍数
 info:
-  version: 3.0.4
+  version: 3.0.5
   app-name: ${spring.application.name}
   tags:
     environment: ${spring.profiles.active}

diff --git a/cloud/route-server/src/main/resources/bootstrap.yml b/cloud/route-server/src/main/resources/bootstrap.yml
@@ -27,7 +27,7 @@ spring:
         max-interval: 5000 #最长重试间隔
         multiplier: 1.1 #每次重试失败后，重试间隔所增加的倍数
 info:
-  version: 3.0.4
+  version: 3.0.5
   app-name: ${spring.application.name}
   tags:
     environment: ${spring.profiles.active}

diff --git a/cloud/workflow-server/src/main/resources/bootstrap.yml b/cloud/workflow-server/src/main/resources/bootstrap.yml
@@ -27,7 +27,7 @@ spring:
         max-interval: 5000 #最长重试间隔
         multiplier: 1.1 #每次重试失败后，重试间隔所增加的倍数
 info:
-  version: 3.0.4
+  version: 3.0.5
   app-name: ${spring.application.name}
   tags:
     environment: ${spring.profiles.active}

diff --git a/doc/version_history.md b/doc/version_history.md
@@ -1,4 +1,8 @@
 ## 版本更新记录
+##### v3.0.5
+> - [Upgrade] 升级核心库至 6.1.4
+> - [Upgrade] 角色编码可自定义输入
+> - [Upgrade] 升级 kotlin 至 1.3.50
 ##### v3.0.4
 > - [Upgrade] 优化 gradle 脚本，每个模块重新设置 group
 > - [Upgrade] Config server 增加api文档配置

diff --git a/gradle.properties b/gradle.properties
@@ -1,9 +1,9 @@
 gradleVersion=5.5.1
 group=pers.acp.admin
-version=3.0.4
+version=3.0.5
 encoding=UTF-8
 mavenCentralUrl=https://repo.spring.io/plugins-release
 #mavenCentralUrl=https://maven.aliyun.com/repository/public
 org.gradle.jvmargs=-XX:MaxPermSize=512m -Xmx1024m -Xss2m
 javaVersion=11
-kotlinVersion=1.3.41
+kotlinVersion=1.3.50
diff --git a/libs/acp-client-6.1.3.jar → libs/acp-client-6.1.4.jar b/libs/acp-client-6.1.3.jar → libs/acp-client-6.1.4.jar
diff --git a/libs/acp-core-6.1.3.jar → libs/acp-core-6.1.4.jar b/libs/acp-core-6.1.3.jar → libs/acp-core-6.1.4.jar
diff --git a/libs/acp-packet-6.1.3.jar → libs/acp-packet-6.1.4.jar b/libs/acp-packet-6.1.3.jar → libs/acp-packet-6.1.4.jar
diff --git a/libs/acp-spring-boot-starter-6.1.3.jar → libs/acp-spring-boot-starter-6.1.4.jar b/libs/acp-spring-boot-starter-6.1.3.jar → libs/acp-spring-boot-starter-6.1.4.jar
diff --git a/libs/acp-spring-cloud-starter-6.1.3.jar → libs/acp-spring-cloud-starter-6.1.4.jar b/libs/acp-spring-cloud-starter-6.1.3.jar → libs/acp-spring-cloud-starter-6.1.4.jar