feat:healthy接口新增token验证

2 files changed, 15 insertions, 2 deletions

diff --git a/src/main/java/net/geedge/confagent/controller/HealthyController.java b/src/main/java/net/geedge/confagent/controller/HealthyController.java
index 28495f0..5673d41 100644
--- a/src/main/java/net/geedge/confagent/controller/HealthyController.java
+++ b/src/main/java/net/geedge/confagent/controller/HealthyController.java
@@ -6,7 +6,10 @@ import cn.hutool.log.Log;
 import net.geedge.confagent.annotation.UnCheckToken;
 import net.geedge.confagent.util.ConfagentUtil;
 import net.geedge.confagent.util.R;
+import net.geedge.confagent.util.RCode;
+import net.geedge.confagent.util.Tool;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -38,7 +41,7 @@ public class HealthyController extends BaseController{
 
     @GetMapping
     @UnCheckToken
-    public R checkHealthy()  {
+    public R checkHealthy(@RequestHeader(value="Authorization",required = false) String token)  {
 
         buildHealthyURL();
 
@@ -47,6 +50,14 @@ public class HealthyController extends BaseController{
         result.put("confagent","UP");
         result.put("prometheus",checkState(prometheusHealthy.toString()));
         result.put("snmpExporter",checkState(snmpExporterHealthy.toString()));
+
+        if(Tool.StrUtil.isNotBlank(token)){
+            if(ConfagentUtil.checkToken(token).getCode() == RCode.SUCCESS.getCode()){
+                result.put("auth","TRUE");
+            }else{
+                result.put("auth","FALSE");
+            }
+        }
         return R.ok(result);
     }
 
diff --git a/src/main/java/net/geedge/confagent/controller/PrometheusController.java b/src/main/java/net/geedge/confagent/controller/PrometheusController.java
index 4967229..2434269 100644
--- a/src/main/java/net/geedge/confagent/controller/PrometheusController.java
+++ b/src/main/java/net/geedge/confagent/controller/PrometheusController.java
@@ -75,7 +75,9 @@ public class PrometheusController extends BaseController{
 
         if(!Tool.MapUtil.isEmpty(cmdLine)){
             writeServiceConfigFile(cmdLine,prometheusCmdLinePath);
-            reload = true;
+            if(Tool.StrUtil.equals(profile,"prod") && Tool.SystemUtil.getOsInfo().isLinux()){
+                Tool.RuntimeUtil.exec("systemctl restart prometheus");
+            }
         }
         if(!Tool.MapUtil.isEmpty(prometheusConf)){
             Tool.YamlUtil.writeAsMap(prometheusConf,prometheusConfPath);