Просмотр исходного кода

message-service 中的数据库表名以 message_ 为前缀

reghao 5 месяцев назад
Родитель
Сommit
4dd27c6d7e

+ 19 - 0
message/message-service/src/main/java/cn/reghao/tnb/message/app/controller/AdminMessageController.java

@@ -42,4 +42,23 @@ public class AdminMessageController {
         List<EmailDto> list = emailAccountService.getEmailAccounts();
         return WebResult.success(list);
     }
+
+    @Operation(summary = "添加 webhook", description = "N")
+    @PostMapping(value = "/notify/webhook", produces = MediaType.APPLICATION_JSON_VALUE)
+    public String addWebhook() {
+        return WebResult.success();
+    }
+
+    @Operation(summary = "删除 webhook", description = "N")
+    @DeleteMapping(value = "/notify/webhook", produces = MediaType.APPLICATION_JSON_VALUE)
+    public String deleteWebhook() {
+        return WebResult.success();
+    }
+
+    @Operation(summary = "webhook 列表", description = "N")
+    @GetMapping(value = "/notify/webhook", produces = MediaType.APPLICATION_JSON_VALUE)
+    public String webhookList() {
+        List<EmailDto> list = emailAccountService.getEmailAccounts();
+        return WebResult.success(list);
+    }
 }

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

@@ -1,14 +0,0 @@
-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);
-}

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

@@ -3,6 +3,7 @@ package cn.reghao.tnb.message.app.soa.model.po;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -14,4 +15,9 @@ import java.util.List;
 public class BackendSystem  {
     private String sysName;
     private List<String> sysServices;
+
+    public BackendSystem(String sysName) {
+        this.sysName = sysName;
+        this.sysServices = new ArrayList<>();
+    }
 }

+ 2 - 17
message/message-service/src/main/java/cn/reghao/tnb/message/app/soa/service/TnbService.java

@@ -1,6 +1,5 @@
 package cn.reghao.tnb.message.app.soa.service;
 
-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;
@@ -24,12 +23,10 @@ import java.util.concurrent.TimeUnit;
 @Service
 public class TnbService {
     private final ScheduledExecutorService scheduledExecutorService;
-    private final BackendSystemMapper backendSystemMapper;
     private final TnbZkService tnbZkService;
 
-    public TnbService(BackendSystemMapper backendSystemMapper, TnbZkService tnbZkService) {
+    public TnbService(TnbZkService tnbZkService) {
         this.scheduledExecutorService = ThreadPoolWrapper.scheduledThreadPool("zkservice-checker", 1);
-        this.backendSystemMapper = backendSystemMapper;
         this.tnbZkService = tnbZkService;
     }
 
@@ -39,25 +36,13 @@ public class TnbService {
 
     public void add(List<String> appNames) {
         String sysName = "vod";
-        BackendSystem backendSystem = backendSystemMapper.findBySysName(sysName);
-        if (backendSystem == null) {
-            backendSystem = new BackendSystem();
-            backendSystem.setSysName(sysName);
-        }
-
-        backendSystem.setSysServices(appNames);
-        //backendSystemMapper.save(backendSystem);
     }
 
     public class ServiceChecker implements Runnable {
         @Override
         public void run() {
             String sysName = "vod";
-            BackendSystem backendSystem = backendSystemMapper.findBySysName(sysName);
-            if (backendSystem == null) {
-                return;
-            }
-
+            BackendSystem backendSystem = new BackendSystem(sysName);
             List<String> appNames = backendSystem.getSysServices();
             if (appNames.isEmpty()) {
                 return;

+ 0 - 17
message/message-service/src/main/resources/mapper/BackendSystemMapper.xml

@@ -1,17 +0,0 @@
-<?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>

+ 9 - 9
message/message-service/src/main/resources/mapper/EmailAccountMapper.xml

@@ -3,49 +3,49 @@
 
 <mapper namespace="cn.reghao.tnb.message.app.db.mapper.EmailAccountMapper">
     <insert id="save">
-        insert into msg_email_account
+        insert into message_email_account
         (`smtp`,`username`,`password`,`personal`,`default_sender`)
         values
         (#{smtp},#{username},#{password},#{personal},#{defaultSender})
     </insert>
 
     <update id="updatePassword">
-        update msg_email_account
+        update message_email_account
         set update_time=now(),`password`=#{password}
         where id=#{id}
     </update>
     <update id="updateDefaultSender">
-        update msg_email_account
+        update message_email_account
         set update_time=now(),default_sender=#{defaultSender}
         where id=#{id}
     </update>
 
     <delete id="deleteById">
-        delete from msg_email_account
+        delete from message_email_account
         where id=#{id}
     </delete>
 
     <select id="count" resultType="java.lang.Integer">
         select count(*)
-        from msg_email_account
+        from message_email_account
     </select>
     <select id="findAll" resultType="cn.reghao.tnb.message.app.model.po.EmailAccount">
         select *
-        from msg_email_account
+        from message_email_account
     </select>
     <select id="findById" resultType="cn.reghao.tnb.message.app.model.po.EmailAccount">
         select *
-        from msg_email_account
+        from message_email_account
         where id=#{id}
     </select>
     <select id="findByUsername" resultType="cn.reghao.tnb.message.app.model.po.EmailAccount">
         select *
-        from msg_email_account
+        from message_email_account
         where username=#{username}
     </select>
     <select id="findDefaultSender" resultType="cn.reghao.tnb.message.app.model.po.EmailAccount">
         select *
-        from msg_email_account
+        from message_email_account
         where default_sender=1
     </select>
 </mapper>

+ 6 - 6
message/message-service/src/main/resources/mapper/UserMessageMapper.xml

@@ -3,31 +3,31 @@
 
 <mapper namespace="cn.reghao.tnb.message.app.db.mapper.UserMessageMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
-        insert into user_message
+        insert into message_user_message
         (`msg_type`,`message_id`,`title`,`content`,`unread`,`user_id`)
         values 
         (#{msgType},#{messageId},#{title},#{content},#{unread},#{userId})
     </insert>
 
     <update id="updateSetRead">
-        update user_message
+        update message_user_message
         set update_time=now(),unread=0
         where message_id=#{messageId}
     </update>
 
     <select id="countByUnread" resultType="java.lang.Integer">
         select count(*)
-        from user_message
+        from message_user_message
         where unread is true and user_id=#{userId}
     </select>
     <select id="findByUnread" resultType="cn.reghao.tnb.message.app.model.po.UserMessage">
         select *
-        from user_message
+        from message_user_message
         where unread is true and user_id=#{userId}
     </select>
     <select id="findByMessageId" resultType="cn.reghao.tnb.message.app.model.po.UserMessage">
         select *
-        from user_message
+        from message_user_message
         where message_id=#{messageId}
     </select>
-</mapper>
+</mapper>

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

@@ -1,17 +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.soa.db.mapper.BackendSystemMapper">
+<mapper namespace="cn.reghao.tnb.message.app.db.mapper.WebhookMapper">
     <insert id="save">
-        insert into msg_webhook
-        (`name`,`url`,`sign`)
+        insert into message_webhook
+            (`name`,`url`,`sign`)
         values
-        (#{name},#{url},#{sign})
+            (#{name},#{url},#{sign})
     </insert>
 
-    <select id="findBySysName" resultType="cn.reghao.tnb.message.app.soa.model.po.BackendSystem">
+    <select id="findByName" resultType="cn.reghao.tnb.message.app.model.po.Webhook">
         select *
-        from msg_webhook
+        from message_webhook
         where name=#{name}
     </select>
 </mapper>