将 search-service 中的 soa 包迁移到 message-service

gateway/src/main/resources/application.yml

@@ -156,6 +156,12 @@ spring:
           uri: lb://message-service
           predicates:
             - Path=/api/admin/message/**
+        - id: tnb-admin-router
+          uri: lb://message-service
+          predicates:
+            - Path=/api/admin/tnb/**
+          filters:
+            - StripPrefix=0
         ###############################################################################
         - id: log-websocket
           uri: lb:ws://search-service
@@ -165,12 +171,6 @@ spring:
           uri: lb://search-service
           predicates:
             - Path=/api/search1/**
-        - id: tnb-admin-router
-          uri: lb://search-service
-          predicates:
-            - Path=/api/admin/tnb/**
-          filters:
-            - StripPrefix=0
 #    gateway:
 #      globalcors:
 #        cors-configurations:

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

@@ -1,8 +1,8 @@
-package cn.reghao.tnb.search.app.soa.controller;
+package cn.reghao.tnb.message.app.soa.controller;
 
 import cn.reghao.jutil.web.WebResult;
-import cn.reghao.tnb.search.app.soa.model.vo.RouteDefinitionInfo;
-import cn.reghao.tnb.search.app.soa.service.RouteService;
+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;

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

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.search.app.soa.controller;
+package cn.reghao.tnb.message.app.soa.controller;
 
 import cn.reghao.jutil.web.WebResult;
 import cn.reghao.tnb.common.db.SelectOption;
-import cn.reghao.tnb.search.app.soa.service.LoggingService;
-import cn.reghao.tnb.search.app.soa.service.RuntimeLogService;
+import cn.reghao.tnb.message.app.soa.service.LoggingService;
+import cn.reghao.tnb.message.app.soa.service.RuntimeLogService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.data.domain.Page;

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

@@ -1,13 +1,13 @@
-package cn.reghao.tnb.search.app.soa.controller;
+package cn.reghao.tnb.message.app.soa.controller;
 
 import cn.reghao.jutil.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
-import cn.reghao.tnb.search.app.soa.model.vo.EurekaInstance;
-import cn.reghao.tnb.search.app.soa.model.vo.EurekaService;
-import cn.reghao.tnb.search.app.soa.model.vo.ServiceInfo;
-import cn.reghao.tnb.search.app.soa.service.TnbEurekaService;
-import cn.reghao.tnb.search.app.soa.service.TnbService;
-import cn.reghao.tnb.search.app.soa.service.TnbZkService;
+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 io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.http.MediaType;

message/message-service/src/main/java/cn/reghao/tnb/message/app/soa/db/mapper/BackendSystemMapper.java

@@ -0,0 +1,14 @@
+package cn.reghao.tnb.message.app.soa.db.mapper;
+
+import cn.reghao.jutil.jdk.db.BaseMapper;
+import cn.reghao.tnb.message.app.soa.model.po.BackendSystem;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author reghao
+ * @date 2025-09-24 00:32:06
+ */
+@Mapper
+public interface BackendSystemMapper extends BaseMapper<BackendSystem> {
+    BackendSystem findBySysName(String sysName);
+}

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

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

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

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

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

@@ -0,0 +1,17 @@
+package cn.reghao.tnb.message.app.soa.model.po;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @author reghao
+ * @date 2025-04-17 11:10:58
+ */
+@Setter
+@Getter
+public class BackendSystem  {
+    private String sysName;
+    private List<String> sysServices;
+}

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

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

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

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

search/search-service/src/main/java/cn/reghao/tnb/search/app/soa/model/route/FilterDefinition.java → message/message-service/src/main/java/cn/reghao/tnb/message/app/soa/model/route/FilterDefinition.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.search.app.soa.model.route;
+package cn.reghao.tnb.message.app.soa.model.route;
 
 import javax.validation.constraints.NotNull;
 import java.util.LinkedHashMap;

search/search-service/src/main/java/cn/reghao/tnb/search/app/soa/model/route/NameUtils.java → message/message-service/src/main/java/cn/reghao/tnb/message/app/soa/model/route/NameUtils.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.search.app.soa.model.route;
+package cn.reghao.tnb.message.app.soa.model.route;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

search/search-service/src/main/java/cn/reghao/tnb/search/app/soa/model/route/PredicateDefinition.java → message/message-service/src/main/java/cn/reghao/tnb/message/app/soa/model/route/PredicateDefinition.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.search.app.soa.model.route;
+package cn.reghao.tnb.message.app.soa.model.route;
 
 import javax.validation.ValidationException;
 import javax.validation.constraints.NotNull;

search/search-service/src/main/java/cn/reghao/tnb/search/app/soa/model/route/RouteDefinition.java → message/message-service/src/main/java/cn/reghao/tnb/message/app/soa/model/route/RouteDefinition.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.search.app.soa.model.route;
+package cn.reghao.tnb.message.app.soa.model.route;
 
 import javax.validation.Valid;
 import javax.validation.ValidationException;

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
-package cn.reghao.tnb.search.app.soa.model.vo;
+package cn.reghao.tnb.message.app.soa.model.vo;
 
-import cn.reghao.tnb.search.app.soa.model.route.RouteDefinition;
+import cn.reghao.tnb.message.app.soa.model.route.RouteDefinition;
 import lombok.Getter;
 import lombok.Setter;
 

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

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

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

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

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

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.search.app.soa.service;
+package cn.reghao.tnb.message.app.soa.service;
 
-import cn.reghao.tnb.search.app.soa.model.dto.RouteAdd;
-import cn.reghao.tnb.search.app.soa.model.dto.RouteDelete;
-import cn.reghao.tnb.search.app.soa.model.route.RouteDefinition;
-import cn.reghao.tnb.search.app.soa.model.vo.RouteDefinitionInfo;
+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.route.RouteDefinition;
+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;

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

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

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

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

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

@@ -1,11 +1,11 @@
-package cn.reghao.tnb.search.app.soa.service;
+package cn.reghao.tnb.message.app.soa.service;
 
-import cn.reghao.tnb.search.app.soa.model.po.BackendSystem;
-import cn.reghao.tnb.search.app.soa.model.po.DubboSrv;
-import cn.reghao.tnb.search.app.soa.model.po.SpringCloudService;
+import cn.reghao.tnb.message.app.soa.db.mapper.BackendSystemMapper;
+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.search.app.soa.db.mapper.BackendSystemRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -24,12 +24,12 @@ import java.util.concurrent.TimeUnit;
 @Service
 public class TnbService {
     private final ScheduledExecutorService scheduledExecutorService;
-    private final BackendSystemRepository backendSystemRepository;
+    private final BackendSystemMapper backendSystemMapper;
     private final TnbZkService tnbZkService;
 
-    public TnbService(BackendSystemRepository backendSystemRepository, TnbZkService tnbZkService) {
+    public TnbService(BackendSystemMapper backendSystemMapper, TnbZkService tnbZkService) {
         this.scheduledExecutorService = ThreadPoolWrapper.scheduledThreadPool("zkservice-checker", 1);
-        this.backendSystemRepository = backendSystemRepository;
+        this.backendSystemMapper = backendSystemMapper;
         this.tnbZkService = tnbZkService;
     }
 
@@ -39,21 +39,21 @@ public class TnbService {
 
     public void add(List<String> appNames) {
         String sysName = "vod";
-        BackendSystem backendSystem = backendSystemRepository.findBySysName(sysName);
+        BackendSystem backendSystem = backendSystemMapper.findBySysName(sysName);
         if (backendSystem == null) {
             backendSystem = new BackendSystem();
             backendSystem.setSysName(sysName);
         }
 
         backendSystem.setSysServices(appNames);
-        //backendSystemRepository.save(backendSystem);
+        //backendSystemMapper.save(backendSystem);
     }
 
     public class ServiceChecker implements Runnable {
         @Override
         public void run() {
             String sysName = "vod";
-            BackendSystem backendSystem = backendSystemRepository.findBySysName(sysName);
+            BackendSystem backendSystem = backendSystemMapper.findBySysName(sysName);
             if (backendSystem == null) {
                 return;
             }

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

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

message/message-service/src/main/resources/mapper/BackendSystemMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.reghao.tnb.message.app.db.mapper.WebhookMapper">
+    <insert id="save">
+        insert into msg_webhook
+        (`name`,`url`,`sign`)
+        values
+        (#{name},#{url},#{sign})
+    </insert>
+
+    <select id="findByName" resultType="cn.reghao.tnb.message.app.model.po.Webhook">
+        select *
+        from msg_webhook
+        where name=#{name}
+    </select>
+</mapper>

message/message-service/src/main/resources/mapper/WebhookMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.reghao.tnb.message.app.db.mapper.WebhookMapper">
+<mapper namespace="cn.reghao.tnb.message.app.soa.db.mapper.BackendSystemMapper">
     <insert id="save">
         insert into msg_webhook
         (`name`,`url`,`sign`)
@@ -9,7 +9,7 @@
         (#{name},#{url},#{sign})
     </insert>
 
-    <select id="findByName" resultType="cn.reghao.tnb.message.app.model.po.Webhook">
+    <select id="findBySysName" resultType="cn.reghao.tnb.message.app.soa.model.po.BackendSystem">
         select *
         from msg_webhook
         where name=#{name}

search/search-service/src/main/java/cn/reghao/tnb/search/app/soa/db/mapper/BackendSystemRepository.java

@@ -1,13 +0,0 @@
-package cn.reghao.tnb.search.app.soa.db.mapper;
-
-import cn.reghao.tnb.search.app.soa.model.po.BackendSystem;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-
-/**
- * @author reghao
- * @date 2025-09-24 00:32:06
- */
-public interface BackendSystemRepository extends JpaRepository<BackendSystem, Integer>, JpaSpecificationExecutor<BackendSystem> {
-    BackendSystem findBySysName(String sysName);
-}

search/search-service/src/main/java/cn/reghao/tnb/search/app/soa/model/po/BackendSystem.java

@@ -1,26 +0,0 @@
-package cn.reghao.tnb.search.app.soa.model.po;
-
-import cn.reghao.tnb.search.app.util.BaseEntity;
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.persistence.CollectionTable;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2025-04-17 11:10:58
- */
-@Setter
-@Getter
-@Entity
-@Table(name = "search_wenshu_doc")
-public class BackendSystem extends BaseEntity {
-    private String sysName;
-    @ElementCollection
-    @CollectionTable(name = "tnb_backend_services")
-    private List<String> sysServices;
-}