1.message-service 的 soa 包迁移到 admin 模块, 这是后端监控相关功能

2.search-servcie 的 NacosConfigTest 迁移到 admin 模块, 这是 nacos 客户端 test case

message/message-service/src/main/java/cn/reghao/tnb/message/app/config/AppProperties.java → admin/src/main/java/cn/reghao/tnb/admin/config/AppProperties.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.message.app.config;
+package cn.reghao.tnb.admin.config;
 
 import lombok.Getter;
 import lombok.Setter;

message/message-service/src/main/java/cn/reghao/tnb/message/app/soa/controller/TnbGatewayController.java → admin/src/main/java/cn/reghao/tnb/admin/controller/TnbGatewayController.java

@@ -1,8 +1,8 @@
-package cn.reghao.tnb.message.app.soa.controller;
+package cn.reghao.tnb.admin.controller;
 
+import cn.reghao.tnb.admin.model.vo.RouteDefinitionInfo;
+import cn.reghao.tnb.admin.service.RouteService;
 import cn.reghao.tnb.common.web.WebResult;
-import cn.reghao.tnb.message.app.soa.model.vo.RouteDefinitionInfo;
-import cn.reghao.tnb.message.app.soa.service.RouteService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -17,7 +17,7 @@ import java.util.List;
  */
 @Tag(name = "tnb 网关接口")
 @RestController
-@RequestMapping("/api/admin/tnb/gw")
+@RequestMapping("/api/admin1/tnb/gw")
 public class TnbGatewayController {
     private final RouteService routeService;
 

message/message-service/src/main/java/cn/reghao/tnb/message/app/soa/controller/TnbLogController.java → admin/src/main/java/cn/reghao/tnb/admin/controller/TnbLogController.java

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.message.app.soa.controller;
+package cn.reghao.tnb.admin.controller;
 
-import cn.reghao.tnb.common.web.WebResult;
+import cn.reghao.tnb.admin.service.LoggingService;
+import cn.reghao.tnb.admin.service.RuntimeLogService;
 import cn.reghao.tnb.common.db.SelectOption;
-import cn.reghao.tnb.message.app.soa.service.LoggingService;
-import cn.reghao.tnb.message.app.soa.service.RuntimeLogService;
+import cn.reghao.tnb.common.web.WebResult;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.http.MediaType;
@@ -21,7 +21,7 @@ import java.util.stream.Collectors;
  */
 @Tag(name = "tnb 日志接口")
 @RestController
-@RequestMapping("/api/admin/tnb/sys")
+@RequestMapping("/api/admin1/tnb/sys")
 public class TnbLogController {
     private final RuntimeLogService runtimeLogService;
     private final LoggingService loggingService;

message/message-service/src/main/java/cn/reghao/tnb/message/app/soa/controller/TnbServiceController.java → admin/src/main/java/cn/reghao/tnb/admin/controller/TnbServiceController.java

@@ -1,13 +1,13 @@
-package cn.reghao.tnb.message.app.soa.controller;
+package cn.reghao.tnb.admin.controller;
 
-import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
-import cn.reghao.tnb.message.app.soa.model.vo.EurekaInstance;
-import cn.reghao.tnb.message.app.soa.model.vo.EurekaService;
-import cn.reghao.tnb.message.app.soa.model.vo.ServiceInfo;
-import cn.reghao.tnb.message.app.soa.service.TnbEurekaService;
-import cn.reghao.tnb.message.app.soa.service.TnbService;
-import cn.reghao.tnb.message.app.soa.service.TnbZkService;
+import cn.reghao.tnb.common.web.WebResult;
+import cn.reghao.tnb.admin.model.vo.EurekaInstance;
+import cn.reghao.tnb.admin.model.vo.EurekaService;
+import cn.reghao.tnb.admin.model.vo.ServiceInfo;
+import cn.reghao.tnb.admin.service.TnbEurekaService;
+import cn.reghao.tnb.admin.service.TnbService;
+import cn.reghao.tnb.admin.service.TnbZkService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.http.MediaType;
@@ -22,7 +22,7 @@ import java.util.List;
  */
 @Tag(name = "tnb 服务治理接口")
 @RestController
-@RequestMapping("/api/admin/tnb")
+@RequestMapping("/api/admin1/tnb")
 @AuthUser
 public class TnbServiceController {
     private final TnbZkService tnbZkService;

message/message-service/src/main/java/cn/reghao/tnb/message/app/soa/model/dto/RouteAdd.java → admin/src/main/java/cn/reghao/tnb/admin/model/dto/RouteAdd.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.message.app.soa.model.dto;
+package cn.reghao.tnb.admin.model.dto;
 
 import lombok.Getter;
 import lombok.Setter;

message/message-service/src/main/java/cn/reghao/tnb/message/app/soa/model/dto/RouteDelete.java → admin/src/main/java/cn/reghao/tnb/admin/model/dto/RouteDelete.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.message.app.soa.model.dto;
+package cn.reghao.tnb.admin.model.dto;
 
 import lombok.Getter;
 import lombok.Setter;

message/message-service/src/main/java/cn/reghao/tnb/message/app/soa/model/po/BackendSystem.java → admin/src/main/java/cn/reghao/tnb/admin/model/po/BackendSystem.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.message.app.soa.model.po;
+package cn.reghao.tnb.admin.model.po;
 
 import lombok.Getter;
 import lombok.Setter;

message/message-service/src/main/java/cn/reghao/tnb/message/app/soa/model/po/DubboSrv.java → admin/src/main/java/cn/reghao/tnb/admin/model/po/DubboSrv.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.message.app.soa.model.po;
+package cn.reghao.tnb.admin.model.po;
 
 import lombok.Getter;
 import lombok.Setter;

message/message-service/src/main/java/cn/reghao/tnb/message/app/soa/model/po/SpringCloudService.java → admin/src/main/java/cn/reghao/tnb/admin/model/po/SpringCloudService.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.message.app.soa.model.po;
+package cn.reghao.tnb.admin.model.po;
 
 import lombok.Getter;
 import lombok.Setter;

message/message-service/src/main/java/cn/reghao/tnb/message/app/soa/model/vo/EurekaInstance.java → admin/src/main/java/cn/reghao/tnb/admin/model/vo/EurekaInstance.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.message.app.soa.model.vo;
+package cn.reghao.tnb.admin.model.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

message/message-service/src/main/java/cn/reghao/tnb/message/app/soa/model/vo/EurekaService.java → admin/src/main/java/cn/reghao/tnb/admin/model/vo/EurekaService.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.message.app.soa.model.vo;
+package cn.reghao.tnb.admin.model.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

message/message-service/src/main/java/cn/reghao/tnb/message/app/soa/model/vo/KeyValue.java → admin/src/main/java/cn/reghao/tnb/admin/model/vo/KeyValue.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.message.app.soa.model.vo;
+package cn.reghao.tnb.admin.model.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

message/message-service/src/main/java/cn/reghao/tnb/message/app/soa/model/vo/RouteDefinitionInfo.java → admin/src/main/java/cn/reghao/tnb/admin/model/vo/RouteDefinitionInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.message.app.soa.model.vo;
+package cn.reghao.tnb.admin.model.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

message/message-service/src/main/java/cn/reghao/tnb/message/app/soa/model/vo/ServiceInfo.java → admin/src/main/java/cn/reghao/tnb/admin/model/vo/ServiceInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.message.app.soa.model.vo;
+package cn.reghao.tnb.admin.model.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

admin/src/main/java/cn/reghao/tnb/admin/service/AdminService.java

@@ -1,7 +1,15 @@
 package cn.reghao.tnb.admin.service;
 
+import com.alibaba.nacos.api.NacosFactory;
+import com.alibaba.nacos.api.PropertyKeyConst;
+import com.alibaba.nacos.api.config.ConfigService;
+import com.alibaba.nacos.api.config.listener.Listener;
+import com.alibaba.nacos.api.exception.NacosException;
 import org.springframework.stereotype.Service;
 
+import java.util.Properties;
+import java.util.concurrent.Executor;
+
 /**
  * @author reghao
  * @date 2026-01-21 14:12:16
@@ -10,4 +18,49 @@ import org.springframework.stereotype.Service;
 public class AdminService {
     public void stat() {
     }
+
+    public void nacos() throws InterruptedException, NacosException {
+        String serverAddr = "127.0.0.1";
+        String dataId = "search-dev";
+        String group = "DEFAULT_GROUP";
+        Properties properties = new Properties();
+        properties.put(PropertyKeyConst.SERVER_ADDR, serverAddr);
+        ConfigService configService = NacosFactory.createConfigService(properties);
+        String content = configService.getConfig(dataId, group, 5000);
+        System.out.println("############################################################################");
+        System.out.println(content);
+        System.out.println("############################################################################");
+        configService.addListener(dataId, group, new Listener() {
+            @Override
+            public void receiveConfigInfo(String configInfo) {
+                System.out.println("receive:" + configInfo);
+            }
+
+            @Override
+            public Executor getExecutor() {
+                return null;
+            }
+        });
+
+        /*boolean isPublishOk = configService.publishConfig(dataId, group, "content");
+        System.out.println(isPublishOk);*/
+
+        //Thread.sleep(3000);
+        //content = configService.getConfig(dataId, group, 5000);
+        System.out.println("############################################################################");
+        //System.out.println(content);
+        System.out.println("############################################################################");
+
+        /*boolean isRemoveOk = configService.removeConfig(dataId, group);
+        System.out.println(isRemoveOk);
+        Thread.sleep(3000);*/
+
+        //content = configService.getConfig(dataId, group, 5000);
+        System.out.println("############################################################################");
+        //System.out.println(content);
+        System.out.println("############################################################################");
+
+        System.out.println("goto long sleep");
+        Thread.sleep(300_000);
+    }
 }

message/message-service/src/main/java/cn/reghao/tnb/message/app/soa/service/LoggingService.java → admin/src/main/java/cn/reghao/tnb/admin/service/LoggingService.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.message.app.soa.service;
+package cn.reghao.tnb.admin.service;
 
 import org.springframework.stereotype.Service;
 

message/message-service/src/main/java/cn/reghao/tnb/message/app/soa/service/RouteService.java → admin/src/main/java/cn/reghao/tnb/admin/service/RouteService.java

@@ -1,13 +1,13 @@
-package cn.reghao.tnb.message.app.soa.service;
+package cn.reghao.tnb.admin.service;
 
 import cn.reghao.jutil.jdk.http.WebClient;
-import cn.reghao.tnb.message.app.config.AppProperties;
-import cn.reghao.tnb.message.app.soa.model.dto.RouteAdd;
-import cn.reghao.tnb.message.app.soa.model.dto.RouteDelete;
-import cn.reghao.tnb.message.app.soa.model.vo.RouteDefinitionInfo;
 import cn.reghao.jutil.jdk.http.WebRequest;
 import cn.reghao.jutil.jdk.http.WebResponse;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
+import cn.reghao.tnb.admin.config.AppProperties;
+import cn.reghao.tnb.admin.model.dto.RouteAdd;
+import cn.reghao.tnb.admin.model.dto.RouteDelete;
+import cn.reghao.tnb.admin.model.vo.RouteDefinitionInfo;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -15,9 +15,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @author reghao

message/message-service/src/main/java/cn/reghao/tnb/message/app/soa/service/RuntimeLogService.java → admin/src/main/java/cn/reghao/tnb/admin/service/RuntimeLogService.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.message.app.soa.service;
+package cn.reghao.tnb.admin.service;
 
 import cn.reghao.jutil.jdk.web.log.AppLog;
 import org.springframework.stereotype.Service;

message/message-service/src/main/java/cn/reghao/tnb/message/app/soa/service/TnbEurekaService.java → admin/src/main/java/cn/reghao/tnb/admin/service/TnbEurekaService.java

@@ -1,8 +1,8 @@
-package cn.reghao.tnb.message.app.soa.service;
+package cn.reghao.tnb.admin.service;
 
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
-import cn.reghao.tnb.message.app.soa.model.vo.EurekaInstance;
-import cn.reghao.tnb.message.app.soa.model.vo.EurekaService;
+import cn.reghao.tnb.admin.model.vo.EurekaInstance;
+import cn.reghao.tnb.admin.model.vo.EurekaService;
 import com.netflix.discovery.EurekaClient;
 import com.netflix.discovery.shared.Applications;
 import org.springframework.cloud.client.discovery.DiscoveryClient;

message/message-service/src/main/java/cn/reghao/tnb/message/app/soa/service/TnbService.java → admin/src/main/java/cn/reghao/tnb/admin/service/TnbService.java

@@ -1,10 +1,10 @@
-package cn.reghao.tnb.message.app.soa.service;
+package cn.reghao.tnb.admin.service;
 
-import cn.reghao.tnb.message.app.soa.model.po.BackendSystem;
-import cn.reghao.tnb.message.app.soa.model.po.DubboSrv;
-import cn.reghao.tnb.message.app.soa.model.po.SpringCloudService;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;
+import cn.reghao.tnb.admin.model.po.BackendSystem;
+import cn.reghao.tnb.admin.model.po.DubboSrv;
+import cn.reghao.tnb.admin.model.po.SpringCloudService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

message/message-service/src/main/java/cn/reghao/tnb/message/app/soa/service/TnbZkService.java → admin/src/main/java/cn/reghao/tnb/admin/service/TnbZkService.java

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.message.app.soa.service;
+package cn.reghao.tnb.admin.service;
 
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
-import cn.reghao.tnb.message.app.soa.model.po.DubboSrv;
-import cn.reghao.tnb.message.app.soa.model.po.SpringCloudService;
-import cn.reghao.tnb.message.app.soa.model.vo.ServiceInfo;
+import cn.reghao.tnb.admin.model.po.DubboSrv;
+import cn.reghao.tnb.admin.model.po.SpringCloudService;
+import cn.reghao.tnb.admin.model.vo.ServiceInfo;
 import com.google.gson.JsonNull;
 import com.google.gson.JsonObject;
 import lombok.extern.slf4j.Slf4j;

admin/src/main/resources/application-dev.yml

@@ -43,4 +43,5 @@ app:
   native-lucene-dirname: native_lucene
   hibernate-lucene-dirname: hibernate_lucene
   geoip-filename: qqwry.dat
-  geojson-filename: china1.json
+  geojson-filename: china1.json
+  gatewayAdminUrl: http://localhost:16000

message/message-service/src/main/resources/application-cluster.yml

@@ -25,6 +25,4 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://192.168.0.210:6060/eureka/
-app:
-  gatewayAdminUrl: http://192.168.0.181:16000
+      defaultZone: http://192.168.0.210:6060/eureka/

message/message-service/src/main/resources/application-dev.yml

@@ -25,6 +25,4 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://127.0.0.1:6060/eureka/
-app:
-  gatewayAdminUrl: http://localhost:16000
+      defaultZone: http://127.0.0.1:6060/eureka/

message/message-service/src/main/resources/application-test.yml

@@ -25,6 +25,4 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://192.168.0.210:6060/eureka/
-app:
-  gatewayAdminUrl: http://192.168.0.181:16000
+      defaultZone: http://192.168.0.210:6060/eureka/

search/search-service/src/test/java/NacosConfigTest.java

@@ -1,58 +0,0 @@
-//import com.alibaba.nacos.api.NacosFactory;
-//import com.alibaba.nacos.api.PropertyKeyConst;
-//import com.alibaba.nacos.api.config.ConfigService;
-//import com.alibaba.nacos.api.config.listener.Listener;
-
-import java.util.Properties;
-import java.util.concurrent.Executor;
-
-/**
- * @author reghao
- * @date 2025-08-04 10:49:44
- */
-public class NacosConfigTest {
-    public static void main(String[] args) throws Exception {
-        String serverAddr = "127.0.0.1";
-        String dataId = "search-dev";
-        String group = "DEFAULT_GROUP";
-        Properties properties = new Properties();
-        /*properties.put(PropertyKeyConst.SERVER_ADDR, serverAddr);
-        ConfigService configService = NacosFactory.createConfigService(properties);
-        String content = configService.getConfig(dataId, group, 5000);
-        System.out.println("############################################################################");
-        System.out.println(content);
-        System.out.println("############################################################################");
-        configService.addListener(dataId, group, new Listener() {
-            @Override
-            public void receiveConfigInfo(String configInfo) {
-                System.out.println("receive:" + configInfo);
-            }
-
-            @Override
-            public Executor getExecutor() {
-                return null;
-            }
-        });*/
-
-        /*boolean isPublishOk = configService.publishConfig(dataId, group, "content");
-        System.out.println(isPublishOk);*/
-
-        //Thread.sleep(3000);
-        //content = configService.getConfig(dataId, group, 5000);
-        System.out.println("############################################################################");
-        //System.out.println(content);
-        System.out.println("############################################################################");
-
-        /*boolean isRemoveOk = configService.removeConfig(dataId, group);
-        System.out.println(isRemoveOk);
-        Thread.sleep(3000);*/
-
-        //content = configService.getConfig(dataId, group, 5000);
-        System.out.println("############################################################################");
-        //System.out.println(content);
-        System.out.println("############################################################################");
-
-        System.out.println("goto long sleep");
-        Thread.sleep(300_000);
-    }
-}