From 5633a5c74b7e97dfcbd4e05ed09b23e41dda76d8 Mon Sep 17 00:00:00 2001
From: Tang Cheng <cheng.tang@supwisdom.com>
Date: Wed, 3 Jul 2019 23:02:11 +0800
Subject: [PATCH] =?utf8?q?=E5=B0=86=20api/common=20=E5=A2=9E=E5=8A=A0?=
 =?utf8?q?=E5=88=B0=E4=BA=86=E6=97=A0=E9=9C=80=E6=9D=83=E9=99=90=E8=AE=BF?=
 =?utf8?q?=E9=97=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../dlpay/framework/controller/framework_controller.kt        | 2 +-
 src/main/kotlin/com/supwisdom/dlpay/security.kt               | 4 ++--
 src/main/resources/application.properties                     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

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 ed682ed6..4b81a024 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/security.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/security.kt
@@ -179,9 +179,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}}
 # 单库数据库配置
-- 
2.17.1