From 1bfc0e728a92f057b54a61af8bb9a714ce9fca1e Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@gmail.com>
Date: Mon, 16 Oct 2023 16:02:31 +0800
Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=20=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=20nacos=20=E7=99=BB=E5=BD=95=E8=AD=A6=E5=91=8A?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ServerStateController.java     | 42 +++++++++----------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/pigx-register/src/main/java/com/alibaba/nacos/console/controller/ServerStateController.java b/pigx-register/src/main/java/com/alibaba/nacos/console/controller/ServerStateController.java
index 22cd26ae4..39c95b60b 100644
--- a/pigx-register/src/main/java/com/alibaba/nacos/console/controller/ServerStateController.java
+++ b/pigx-register/src/main/java/com/alibaba/nacos/console/controller/ServerStateController.java
@@ -16,19 +16,16 @@
 
 package com.alibaba.nacos.console.controller;
 
-import cn.hutool.core.io.FileUtil;
 import com.alibaba.nacos.common.model.RestResult;
 import com.alibaba.nacos.common.model.RestResultUtils;
 import com.alibaba.nacos.sys.module.ModuleState;
 import com.alibaba.nacos.sys.module.ModuleStateHolder;
 import lombok.SneakyThrows;
-import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -41,26 +38,25 @@ import java.util.Map;
 @RequestMapping("/v1/console/server")
 public class ServerStateController {
 
-    private static final String ANNOUNCEMENT_FILE = "conf/announcement.conf";
+	private static final String ANNOUNCEMENT_FILE = "classpath:conf/announcement.conf";
 
-    /**
-     * Get server state of current server.
-     *
-     * @return state json.
-     */
-    @GetMapping("/state")
-    public ResponseEntity<Map<String, String>> serverState() {
-        Map<String, String> serverState = new HashMap<>(4);
-        for (ModuleState each : ModuleStateHolder.getInstance().getAllModuleStates()) {
-            each.getStates().forEach((s, o) -> serverState.put(s, null == o ? null : o.toString()));
-        }
-        return ResponseEntity.ok().body(serverState);
-    }
+	/**
+	 * Get server state of current server.
+	 * @return state json.
+	 */
+	@GetMapping("/state")
+	public ResponseEntity<Map<String, String>> serverState() {
+		Map<String, String> serverState = new HashMap<>(4);
+		for (ModuleState each : ModuleStateHolder.getInstance().getAllModuleStates()) {
+			each.getStates().forEach((s, o) -> serverState.put(s, null == o ? null : o.toString()));
+		}
+		return ResponseEntity.ok().body(serverState);
+	}
+
+	@SneakyThrows
+	@GetMapping("/announcement")
+	public RestResult<String> getAnnouncement() {
+		return RestResultUtils.success();
+	}
 
-    @SneakyThrows
-    @GetMapping("/announcement")
-    public RestResult<String> getAnnouncement() {
-        ClassPathResource resource = new ClassPathResource(ANNOUNCEMENT_FILE);
-        return RestResultUtils.success(FileUtil.readString(resource.getFile(), Charset.defaultCharset()));
-    }
 }