소스 검색

消息服务接口调整,及增加部署文件

linhuili 3 년 전
부모
커밋
93e7c69b1d
19개의 변경된 파일200개의 추가작업 그리고 50개의 파일을 삭제
  1. 6 6
      dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/message/controller/MessageController.java
  2. 6 6
      dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/message/controller/MessageTypeController.java
  3. 6 6
      dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/message/controller/SenderRegisterController.java
  4. 5 4
      dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/message/service/IMessageService.java
  5. 3 3
      dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/message/service/IMessageTypeService.java
  6. 3 3
      dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/message/service/ISenderRegisterService.java
  7. 24 3
      dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/message/service/impl/MessageServiceImpl.java
  8. 3 3
      dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/message/service/impl/MessageTypeServiceImpl.java
  9. 3 3
      dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/message/service/impl/SenderRegisterServiceImpl.java
  10. 4 2
      dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/sender/controller/MessageSenderController.java
  11. 2 1
      dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/sender/service/impl/AppMessageSender.java
  12. 2 1
      dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/sender/service/impl/MailMessageSender.java
  13. 2 1
      dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/sender/service/impl/SmsMessageSender.java
  14. 8 1
      dmp-cloud/dmp-message/src/main/resources/bootstrap.yml
  15. 7 0
      dmp-cloud/dmp-message/src/main/resources/db/init/data.sql
  16. 7 7
      dmp-cloud/dmp-message/src/main/resources/db/init/schema.sql
  17. 36 0
      docker/dockerfiles/dmp-message/Dockerfile
  18. 3 0
      docker/dockerfiles/dmp-message/entrypoint.sh
  19. 70 0
      docker/k8sfiles/dmp-message.yml

+ 6 - 6
dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/message/controller/MessageController.java

@@ -63,7 +63,7 @@ public class MessageController {
         //添加创建默认值
         addCreateDefaultValue(voList);
         //新增消息
-        service.insertType(voList);
+        service.insertMessage(voList);
         return ResultHelper.single(vo);
     }
 
@@ -79,7 +79,7 @@ public class MessageController {
         //添加创建默认值
         addCreateDefaultValue(voList);
         //新增消息
-        voList = service.insertType(voList);
+        voList = service.insertMessage(voList);
         return ResultHelper.multi(voList);
     }
 
@@ -94,7 +94,7 @@ public class MessageController {
         }
         List<MessageVO> voList = new ArrayList<>();
         voList.add(vo);
-        service.updateType(voList);
+        service.updateMessage(voList);
         return ResultHelper.single(vo);
     }
 
@@ -107,7 +107,7 @@ public class MessageController {
         if(voList == null){
             throw new BusinessException(ResponseCode.A0400.getCode(), "消息不能为空!");
         }
-        service.updateType(voList);
+        service.updateMessage(voList);
         return ResultHelper.multi(voList);
     }
 
@@ -121,7 +121,7 @@ public class MessageController {
         if(StringUtils.isEmpty(id)){
             throw new BusinessException(ResponseCode.A0400.getCode(), "id不能为空");
         }
-        service.deleteType(CollUtil.newArrayList(id));
+        service.deleteMessage(CollUtil.newArrayList(id));
         return ResultHelper.success();
     }
 
@@ -135,7 +135,7 @@ public class MessageController {
         if(ids == null || ids.size()<=0){
             throw new BusinessException(ResponseCode.A0400.getCode(), "id不能为空");
         }
-        service.deleteType(ids);
+        service.deleteMessage(ids);
         return ResultHelper.success();
     }
 

+ 6 - 6
dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/message/controller/MessageTypeController.java

@@ -59,7 +59,7 @@ public class MessageTypeController {
        }
        List<MessageType> voList = new ArrayList<>();
        voList.add(vo);
-       service.insertType(voList);
+       service.insertMessageType(voList);
        return ResultHelper.single(vo);
     }
 
@@ -72,7 +72,7 @@ public class MessageTypeController {
         if(CollUtil.isEmpty(voList)){
             throw new BusinessException(ResponseCode.A0400.getCode(), "消息类型不能为空!");
         }
-        voList = service.insertType(voList);
+        voList = service.insertMessageType(voList);
         return ResultHelper.multi(voList);
     }
 
@@ -87,7 +87,7 @@ public class MessageTypeController {
         }
         List<MessageType> voList = new ArrayList<>();
         voList.add(vo);
-        service.updateType(voList);
+        service.updateMessageType(voList);
         return ResultHelper.single(vo);
     }
 
@@ -100,7 +100,7 @@ public class MessageTypeController {
         if(voList == null){
             throw new BusinessException(ResponseCode.A0400.getCode(), "消息类型不能为空!");
         }
-        service.updateType(voList);
+        service.updateMessageType(voList);
         return ResultHelper.multi(voList);
     }
 
@@ -114,7 +114,7 @@ public class MessageTypeController {
         if(StringUtils.isEmpty(id)){
             throw new BusinessException(ResponseCode.A0400.getCode(), "id不能为空");
         }
-        service.deleteType(CollUtil.newArrayList(id));
+        service.deleteMessageType(CollUtil.newArrayList(id));
         return ResultHelper.success();
     }
 
@@ -128,7 +128,7 @@ public class MessageTypeController {
         if(ids == null || ids.size()<=0){
             throw new BusinessException(ResponseCode.A0400.getCode(), "id不能为空");
         }
-        service.deleteType(ids);
+        service.deleteMessageType(ids);
         return ResultHelper.success();
     }
 

+ 6 - 6
dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/message/controller/SenderRegisterController.java

@@ -59,7 +59,7 @@ public class SenderRegisterController {
        }
        List<SenderRegister> voList = new ArrayList<>();
        voList.add(vo);
-       service.insertType(voList);
+       service.insertMessageRegister(voList);
        return ResultHelper.single(vo);
     }
 
@@ -72,7 +72,7 @@ public class SenderRegisterController {
         if(CollUtil.isEmpty(voList)){
             throw new BusinessException(ResponseCode.A0400.getCode(), "发送渠道注册信息不能为空!");
         }
-        voList = service.insertType(voList);
+        voList = service.insertMessageRegister(voList);
         return ResultHelper.multi(voList);
     }
 
@@ -87,7 +87,7 @@ public class SenderRegisterController {
         }
         List<SenderRegister> voList = new ArrayList<>();
         voList.add(vo);
-        service.updateType(voList);
+        service.updateMessageRegister(voList);
         return ResultHelper.single(vo);
     }
 
@@ -100,7 +100,7 @@ public class SenderRegisterController {
         if(voList == null){
             throw new BusinessException(ResponseCode.A0400.getCode(), "发送渠道注册信息不能为空!");
         }
-        service.updateType(voList);
+        service.updateMessageRegister(voList);
         return ResultHelper.multi(voList);
     }
 
@@ -114,7 +114,7 @@ public class SenderRegisterController {
         if(StringUtils.isEmpty(id)){
             throw new BusinessException(ResponseCode.A0400.getCode(), "id不能为空");
         }
-        service.deleteType(CollUtil.newArrayList(id));
+        service.deleteMessageRegister(CollUtil.newArrayList(id));
         return ResultHelper.success();
     }
 
@@ -128,7 +128,7 @@ public class SenderRegisterController {
         if(ids == null || ids.size()<=0){
             throw new BusinessException(ResponseCode.A0400.getCode(), "id不能为空");
         }
-        service.deleteType(ids);
+        service.deleteMessageRegister(ids);
         return ResultHelper.success();
     }
 }

+ 5 - 4
dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/message/service/IMessageService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.persagy.dmp.message.model.MessageVO;
 import com.persagy.dmp.message.model.SenderRegister;
+import com.persagy.dmp.sender.service.IMessageSender;
 
 import java.util.List;
 
@@ -12,7 +13,7 @@ import java.util.List;
  * @author Charlie Yu
  * @date 2021-05-24
  */
-public interface IMessageService {
+public interface IMessageService extends IMessageSender {
 
     /**
      * 按条件查询
@@ -27,20 +28,20 @@ public interface IMessageService {
      * @param voList
      * @return
      */
-    List<MessageVO> insertType(List<MessageVO> voList);
+    List<MessageVO> insertMessage(List<MessageVO> voList);
 
     /**
      * 修改消息
      * @param voList
      * @return
      */
-    List<MessageVO> updateType(List<MessageVO> voList);
+    List<MessageVO> updateMessage(List<MessageVO> voList);
 
     /**
      * 删除消息
      * @param ids
      */
-    void deleteType(List<String> ids);
+    void deleteMessage(List<String> ids);
 
     /**
      * 通过主键查询

+ 3 - 3
dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/message/service/IMessageTypeService.java

@@ -27,20 +27,20 @@ public interface IMessageTypeService {
      * @param voList
      * @return
      */
-    List<MessageType>  insertType(List<MessageType> voList);
+    List<MessageType>  insertMessageType(List<MessageType> voList);
 
     /**
      * 修改消息类型
      * @param voList
      * @return
      */
-    List<MessageType> updateType(List<MessageType> voList);
+    List<MessageType> updateMessageType(List<MessageType> voList);
 
     /**
      * 删除消息类型
      * @param ids
      */
-    void deleteType(List<String> ids);
+    void deleteMessageType(List<String> ids);
 
     /**
      * 通过主键查询

+ 3 - 3
dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/message/service/ISenderRegisterService.java

@@ -33,20 +33,20 @@ public interface ISenderRegisterService {
      * @param voList
      * @return
      */
-    List<SenderRegister>  insertType(List<SenderRegister> voList);
+    List<SenderRegister>  insertMessageRegister(List<SenderRegister> voList);
 
     /**
      * 修改消息渠道
      * @param voList
      * @return
      */
-    List<SenderRegister> updateType(List<SenderRegister> voList);
+    List<SenderRegister> updateMessageRegister(List<SenderRegister> voList);
 
     /**
      * 删除消息渠道
      * @param ids
      */
-    void deleteType(List<String> ids);
+    void deleteMessageRegister(List<String> ids);
 
     /**
      * 通过主键查询

+ 24 - 3
dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/message/service/impl/MessageServiceImpl.java

@@ -11,8 +11,10 @@ import com.persagy.dmp.common.exception.BusinessException;
 import com.persagy.dmp.message.dao.MessageMapper;
 import com.persagy.dmp.message.model.MessageType;
 import com.persagy.dmp.message.model.MessageVO;
+import com.persagy.dmp.message.model.SenderRegister;
 import com.persagy.dmp.message.service.IMessageService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -28,11 +30,30 @@ import java.util.Set;
  */
 @Service
 @Transactional
+@Primary
 public class MessageServiceImpl extends ServiceImpl<MessageMapper, MessageVO> implements IMessageService {
 
     @Autowired
     private MessageMapper dao;
 
+    @Override
+    public boolean initParam(SenderRegister register) {
+        return true;
+    }
+
+    /**
+     * 发送消息
+     * @param vo
+     */
+    @Override
+    public void send(MessageVO vo){
+        List<MessageVO> voList = new ArrayList<>();
+        if(vo != null){
+            voList.add(vo);
+        }
+        insertMessage(voList);
+    }
+
     /**
      * 分页查询消息类型
      * @param page 分页条件
@@ -50,7 +71,7 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, MessageVO> im
      * @return
      */
     @Override
-    public List<MessageVO> insertType(List<MessageVO> voList) {
+    public List<MessageVO> insertMessage(List<MessageVO> voList) {
         //保存消息
         saveBatch(voList);
         return voList;
@@ -62,7 +83,7 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, MessageVO> im
      * @return
      */
     @Override
-    public List<MessageVO> updateType(List<MessageVO> voList) {
+    public List<MessageVO> updateMessage(List<MessageVO> voList) {
         //批量保存消息
         saveOrUpdateBatch(voList);
         return voList;
@@ -73,7 +94,7 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, MessageVO> im
      * @param ids
      */
     @Override
-    public void deleteType(List<String> ids) {
+    public void deleteMessage(List<String> ids) {
         List<MessageVO> voList = load(ids);
         if(CollUtil.isEmpty(voList)){
             throw new BusinessException("消息类型不存在");

+ 3 - 3
dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/message/service/impl/MessageTypeServiceImpl.java

@@ -54,7 +54,7 @@ public class MessageTypeServiceImpl extends ServiceImpl<MessageTypeMapper, Messa
      * @return
      */
     @Override
-    public List<MessageType> insertType(List<MessageType> voList) {
+    public List<MessageType> insertMessageType(List<MessageType> voList) {
         //消息类型编码校验
         validateOnSave(voList,false);
         //批量保存消息类型
@@ -68,7 +68,7 @@ public class MessageTypeServiceImpl extends ServiceImpl<MessageTypeMapper, Messa
      * @return
      */
     @Override
-    public List<MessageType> updateType(List<MessageType> voList) {
+    public List<MessageType> updateMessageType(List<MessageType> voList) {
         //消息类型编码校验
         validateOnSave(voList,true);
         //批量保存消息类型
@@ -81,7 +81,7 @@ public class MessageTypeServiceImpl extends ServiceImpl<MessageTypeMapper, Messa
      * @param ids
      */
     @Override
-    public void deleteType(List<String> ids) {
+    public void deleteMessageType(List<String> ids) {
         List<MessageType> voList = load(ids);
         if(CollUtil.isEmpty(voList)){
             throw new BusinessException("消息类型不存在");

+ 3 - 3
dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/message/service/impl/SenderRegisterServiceImpl.java

@@ -62,7 +62,7 @@ public class SenderRegisterServiceImpl extends ServiceImpl<SenderRegisterMapper,
      * @return
      */
     @Override
-    public List<SenderRegister> insertType(List<SenderRegister> voList) {
+    public List<SenderRegister> insertMessageRegister(List<SenderRegister> voList) {
         //发送渠道编码校验
         validateOnSave(voList,false);
         //批量保存消息类型
@@ -76,7 +76,7 @@ public class SenderRegisterServiceImpl extends ServiceImpl<SenderRegisterMapper,
      * @return
      */
     @Override
-    public List<SenderRegister> updateType(List<SenderRegister> voList) {
+    public List<SenderRegister> updateMessageRegister(List<SenderRegister> voList) {
         //消息类型编码校验
         validateOnSave(voList,true);
         //批量保存消息类型
@@ -89,7 +89,7 @@ public class SenderRegisterServiceImpl extends ServiceImpl<SenderRegisterMapper,
      * @param ids
      */
     @Override
-    public void deleteType(List<String> ids) {
+    public void deleteMessageRegister(List<String> ids) {
         List<SenderRegister> voList = load(ids);
         if(CollUtil.isEmpty(voList)){
             throw new BusinessException("消息类型不存在");

+ 4 - 2
dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/sender/controller/MessageSenderController.java

@@ -2,10 +2,10 @@ package com.persagy.dmp.sender.controller;
 
 import com.persagy.dmp.common.constant.ResponseCode;
 import com.persagy.dmp.common.exception.BusinessException;
+import com.persagy.dmp.common.model.response.CommonResult;
 import com.persagy.dmp.message.model.MessageVO;
 import com.persagy.dmp.sender.service.IMessageSender;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,10 +28,12 @@ public class MessageSenderController {
      * @param messageVO
      */
     @PostMapping("/send")
-    public void send(@RequestBody MessageVO messageVO){
+    public CommonResult<MessageVO> send(@RequestBody MessageVO messageVO){
        if(messageVO == null){
            throw new BusinessException(ResponseCode.A0400.getCode(), "消息体不能为空!");
        }
        messageSender.send(messageVO);
+       return CommonResult.success(messageVO);
     }
+
 }

+ 2 - 1
dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/sender/service/impl/AppMessageSender.java

@@ -14,6 +14,7 @@ import com.persagy.dmp.message.model.SenderRegister;
 import com.persagy.dmp.sender.service.IMessageSender;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 import java.util.Date;
 
@@ -22,7 +23,7 @@ import java.util.Date;
  * @author Charlie Yu
  * @date 2021-05-24
  */
-@Component
+@Service
 @Slf4j
 public class AppMessageSender implements IMessageSender {
 

+ 2 - 1
dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/sender/service/impl/MailMessageSender.java

@@ -6,6 +6,7 @@ import com.persagy.dmp.sender.service.IMessageSender;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
 import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 import java.util.Properties;
 
@@ -14,7 +15,7 @@ import java.util.Properties;
  * @author Charlie Yu
  * @date 2021-05-24
  */
-@Component
+@Service
 public class MailMessageSender implements IMessageSender {
 
     @Autowired

+ 2 - 1
dmp-cloud/dmp-message/src/main/java/com/persagy/dmp/sender/service/impl/SmsMessageSender.java

@@ -4,13 +4,14 @@ import com.persagy.dmp.message.model.MessageVO;
 import com.persagy.dmp.message.model.SenderRegister;
 import com.persagy.dmp.sender.service.IMessageSender;
 import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 /**
  * 短信消息
  * @author Charlie Yu
  * @date 2021-05-24
  */
-@Component
+@Service
 public class SmsMessageSender implements IMessageSender {
 
     @Override

+ 8 - 1
dmp-cloud/dmp-message/src/main/resources/bootstrap.yml

@@ -1,3 +1,10 @@
+server:
+  port: 8835
 spring:
   application:
-    name: dmp-message
+    name: dmp-message
+  mail:
+    password: 123456
+    username: username
+    default-encoding: utf-8
+    host: smtp.qq.com

+ 7 - 0
dmp-cloud/dmp-message/src/main/resources/db/init/data.sql

@@ -0,0 +1,7 @@
+-- ----------------------------
+--  Data for `dt_message_send_register`
+-- ----------------------------
+replace into `dc_dic`.`dt_message_send_register` ( `id`, `extra`, `clazz`, `valid`, `access_secret`, `access_key`, `modified_time`, `code`, `modifier`, `creator`, `ts`, `creation_time`, `name`) values ( '1442323973911048193', '扩展参数', 'AppMessageSender.clazz', '1', '32fad323', 'jdiadaflljnd02901nda', null, 'SD001', null, null, '2021-09-27 11:03:27', null, '发送渠道-001');
+replace into `dc_dic`.`dt_message_send_register` ( `id`, `extra`, `clazz`, `valid`, `access_secret`, `access_key`, `modified_time`, `code`, `modifier`, `creator`, `ts`, `creation_time`, `name`) values ( '1442776995401244674', '扩展参数1', 'MailMessageSender.clazz', '1', '31323', 'jdiadaf1ljnd02901nda', null, 'SD002', null, null, '2021-09-28 17:03:35', null, '发送渠道-002');
+replace into `dc_dic`.`dt_message_send_register` ( `id`, `extra`, `clazz`, `valid`, `access_secret`, `access_key`, `modified_time`, `code`, `modifier`, `creator`, `ts`, `creation_time`, `name`) values ( '1442776995418021889', '扩展参数1', 'SmsMessageSender.clazz', '1', '3132323', 'jdiadaf132jnd02901nda', null, 'SD003', null, null, '2021-09-28 17:03:35', null, '发送渠道-003');
+replace into `dc_dic`.`dt_message_send_register` ( `id`, `extra`, `clazz`, `valid`, `access_secret`, `access_key`, `modified_time`, `code`, `modifier`, `creator`, `ts`, `creation_time`, `name`) values ( '1442776995422216194', '扩展参数1', 'MessageServiceImpl.clazz', '1', '3132323', 'jdiadaf132jnd02901nda', null, 'SD004', null, null, '2021-09-28 17:03:35', null, '发送渠道-004');

+ 7 - 7
dmp-cloud/dmp-message/src/main/resources/db/init/schema.sql

@@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS "dt_message_send_register" (
 "valid" tinyint(1) DEFAULT NULL COMMENT '合法标识',
 "ts" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '乐观锁',
 PRIMARY KEY ("id") USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 
 
 -- ----------------------------
@@ -24,10 +24,10 @@ PRIMARY KEY ("id") USING BTREE
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS "dt_message_type" (
 "id" varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键id',
-"type_code" varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '消息类型编码',
-"type_name" varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '消息类型名称',
-"send_channel" varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '消息发送渠道',
-"remark" text CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '备注',
+"type_code" varchar(40) NOT NULL COMMENT '消息类型编码',
+"type_name" varchar(40) NOT NULL COMMENT '消息类型名称',
+"send_channel" varchar(255) NOT NULL,
+"remark" text COMMENT '备注',
 "creator" varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建人',
 "creation_time" char(14) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建时间',
 "modifier" varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '最后修改人',
@@ -35,7 +35,7 @@ CREATE TABLE IF NOT EXISTS "dt_message_type" (
 "valid" tinyint(1) DEFAULT NULL COMMENT '合法标识',
 "ts" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '乐观锁',
 PRIMARY KEY ("id") USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 
 
 -- ----------------------------
@@ -59,4 +59,4 @@ CREATE TABLE IF NOT EXISTS "dt_message" (
 "valid" tinyint(1) DEFAULT NULL COMMENT '合法标识',
 "ts" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '乐观锁',
 PRIMARY KEY ("id") USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;

+ 36 - 0
docker/dockerfiles/dmp-message/Dockerfile

@@ -0,0 +1,36 @@
+#构建此镜像的基础镜像
+FROM java:8-jre
+#指定作者名称
+MAINTAINER lijie<lijie@persagy.com>
+
+#定义标签属性
+LABEL tier=backend
+LABEL product=dmp
+LABEL project=dmp-message
+LABEL name=bdtp-messsage
+
+#设置环境变量
+ENV JAVA_OPTS -Dfile.encoding=UTF-8 -Xms2048m -Xmx2048m
+ENV TZ Asia/Shanghai
+#ARG 可以接收docker build命令中以--build-arg 指定的参数
+ARG WORKER_HOME
+
+#执行的命令
+RUN apt-get install -y --no-install-recommends tzdata && rm -rf /var/lib/apt/lists/*
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime	&& echo 'Asia/Shanghai' > /etc/timezone
+
+RUN mkdir -p $WORKER_HOME/config
+
+#复制文件到容器内
+COPY *.jar $WORKER_HOME/app.jar
+COPY entrypoint.sh $WORKER_HOME/
+COPY version.txt $WORKER_HOME/
+COPY config $WORKER_HOME/config
+#设置工作目录
+WORKDIR $WORKER_HOME
+
+#查看上述复制的文件,是否复制成功
+RUN ls
+
+#启动执行
+ENTRYPOINT ["sh","./entrypoint.sh"]

+ 3 - 0
docker/dockerfiles/dmp-message/entrypoint.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+echo "entrypoint run..."
+java -jar $JAVA_OPTS -Deureka.client.service-url.defaultZone=$EUREKA_CLIENT_DEFAULT_ZONE -Dspring.cloud.config.profile=$SPRING_CLOUD_CONFIG_PROFILE -Dspring.cloud.config.uri=$SPRING_CLOUD_CONFIG_URI app.jar

+ 70 - 0
docker/k8sfiles/dmp-message.yml

@@ -0,0 +1,70 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: dmp-message
+  labels:
+    app: dmp-message
+spec:
+  selector:
+    app: dmp-message
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: dmp-message
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: dmp-message
+  template:
+    metadata:
+      labels:
+        app: dmp-message
+    spec:
+      containers:
+      - name: dmp-message
+        image: labisenlin.persagy.com/library/dmp-message:v2.0.0
+        imagePullPolicy: Always
+        env:
+        - name: TZ
+          value: Asia/Shanghai
+        - name: SERVER_PORT
+          value: "8115"
+        - name: SPRING_CLOUD_CONFIG_URI
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-message
+              key: spring.cloud.config.uri
+        - name: SPRING_PROFILES_ACTIVE
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-message
+              key: spring.profiles.active
+        - name: SPRING_CLOUD_CONFIG_PROFILE
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-message
+              key: spring.cloud.config.profile
+        - name: EUREKA_CLIENT_FETCH_REGISTRY
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-message
+              key: eureka.client.fetch-registry
+        - name: EUREKA_CLIENT_REGISTER_WITH_EUREKA
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-message
+              key: eureka.client.register-with-eureka
+        - name: EUREKA_CLIENT_DEFAULT_ZONE
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-message
+              key: eureka.client.default.zone
+        - name: EUREKA_INSTANCE_IP_ADDRESS
+          valueFrom:
+            configMapKeyRef:
+              name: dmp-message
+              key: eureka.instance.ip.address