From: Tang Cheng <cheng.tang@supwisdom.com>
Date: Wed, 3 Jul 2019 15:02:11 +0000 (+0800)
Subject: 将 api/common 增加到了无需权限访问
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=9ec516c8d46506dc2a1e96baab85769944d8a4f7;p=epayment%2Ffood_payapi.git

将 api/common 增加到了无需权限访问
---

diff --git a/src/main/kotlin/com/supwisdom/dlpay/framework/controller/framework_controller.kt b/src/main/kotlin/com/supwisdom/dlpay/framework/controller/framework_controller.kt
index b385f9ba..3d2e5d21 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/framework/controller/framework_controller.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/framework/controller/framework_controller.kt
@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RestController
 
 
 @RestController
-@RequestMapping("/common")
+@RequestMapping("/api/common")
 class AboutController {
     @GetMapping("/version")
     fun version(): ResponseEntity<Any> {
diff --git a/src/main/kotlin/com/supwisdom/dlpay/security.kt b/src/main/kotlin/com/supwisdom/dlpay/security.kt
index a2488e07..78430d74 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/security.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/security.kt
@@ -168,9 +168,9 @@ class WebSecurityConfig {
                         .authorizeRequests()
                         .antMatchers("/api/auth/**").permitAll()
                         .antMatchers("/api/notify/**").permitAll()
-                        .antMatchers("/api/common/version").permitAll()
+                        .antMatchers("/api/common/**").permitAll()
                         .antMatchers("/api/userinfor").hasAnyRole("ADMIN", "THIRD_ADMIN")
-                        .antMatchers("/api/common/**").hasAnyRole("THIRD_COMMON", "THIRD_ADMIN")
+//                        .antMatchers("/api/common/**").hasAnyRole("THIRD_COMMON", "THIRD_ADMIN")
                         .antMatchers("/api/consume/**").hasRole("THIRD_CONSUME")
                         .antMatchers("/api/recharge/**").hasRole("THIRD_DEPOSIT")
                         .antMatchers("/api/user/**").hasRole("THIRD_ADMIN")
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index e191f79e..8776e421 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,6 +1,6 @@
 #######################################springboot配置 start#################################
 spring.application.name=supwisdom.payapi
-spring.cloud.consul.discovery.health-check-path=${management.context-path}/health
+spring.cloud.consul.discovery.health-check-path=${management.context-path}/api/common/version
 spring.cloud.consul.discovery.health-check-interval=10s
 spring.cloud.consul.discovery.instanceId=${spring.application.name}:${spring.application.instance_id:${random.value}}
 # 单库数据库配置