From 81f2cb25d1f235749f41d8433670cd8c35f986c1 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Mon, 19 Aug 2019 15:44:38 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/entity/BaseEpdcEntity.java        |  73 ++++++++
 .../mybatis/enums/ELinkDelFlagEnum.java       |  36 ++++
 .../commons/tools/constant/NumConstant.java   |  32 ++++
 .../tools/constant/ServiceConstant.java       |  40 ++++-
 .../epdc/commons/tools/enums/YesOrNoEnum.java |  36 ++++
 .../epdc/commons/tools/redis/RedisKeys.java   |  39 +++--
 esua-epdc/epdc-gateway/pom.xml                |  88 ++++------
 .../src/main/resources/application.yml        |  58 +++++--
 .../epdc-heart/epdc-heart-client/pom.xml      |  16 ++
 .../java/com/elink/esua/epdc/epdc.gitkeep     |   0
 .../epdc-heart/epdc-heart-server/pom.xml      | 142 ++++++++++++++++
 .../com/elink/esua/epdc/HeartApplication.java |  31 ++++
 .../esua/epdc/config/ModuleConfigImpl.java    |  26 +++
 .../src/main/resources/application.yml        |  65 +++++++
 .../main/resources/i18n/messages.properties   |   0
 .../resources/i18n/messages_en_US.properties  |   0
 .../resources/i18n/messages_zh_CN.properties  |   0
 .../resources/i18n/messages_zh_TW.properties  |   0
 .../main/resources/i18n/validation.properties |   0
 .../i18n/validation_en_US.properties          |   0
 .../i18n/validation_zh_CN.properties          |   0
 .../i18n/validation_zh_TW.properties          |   0
 .../src/main/resources/logback-spring.xml     | 159 ++++++++++++++++++
 .../main/resources/mapper/ScheduleJobDao.xml  |  14 ++
 .../resources/mapper/ScheduleJobLogDao.xml    |   7 +
 esua-epdc/epdc-module/epdc-heart/pom.xml      |  20 +++
 .../epdc-job/epdc-job-server/pom.xml          |  75 ++++++++-
 .../src/main/resources/application.yml        |  52 ++----
 .../epdc-message/epdc-message-server/pom.xml  |  75 ++++++++-
 .../src/main/resources/application.yml        |  51 ++----
 .../epdc-neighbor-client/pom.xml              |  16 ++
 .../java/com/elink/esua/epdc/epdc.gitkeep     |   0
 .../epdc-neighbor-server/pom.xml              | 143 ++++++++++++++++
 .../elink/esua/epdc/NeighborApplication.java  |  31 ++++
 .../esua/epdc/config/ModuleConfigImpl.java    |  26 +++
 .../src/main/resources/application.yml        |  65 +++++++
 .../main/resources/i18n/messages.properties   |   0
 .../resources/i18n/messages_en_US.properties  |   0
 .../resources/i18n/messages_zh_CN.properties  |   0
 .../resources/i18n/messages_zh_TW.properties  |   0
 .../main/resources/i18n/validation.properties |   0
 .../i18n/validation_en_US.properties          |   0
 .../i18n/validation_zh_CN.properties          |   0
 .../i18n/validation_zh_TW.properties          |   0
 .../src/main/resources/logback-spring.xml     | 159 ++++++++++++++++++
 .../main/resources/mapper/ScheduleJobDao.xml  |  14 ++
 .../resources/mapper/ScheduleJobLogDao.xml    |   7 +
 esua-epdc/epdc-module/epdc-neighbor/pom.xml   |  20 +++
 .../epdc-news/epdc-news-client/pom.xml        |  16 ++
 .../java/com/elink/esua/epdc/epdc.gitkeep     |   0
 .../epdc-news/epdc-news-server/pom.xml        | 143 ++++++++++++++++
 .../com/elink/esua/epdc/NewsApplication.java  |  31 ++++
 .../esua/epdc/config/ModuleConfigImpl.java    |  26 +++
 .../src/main/resources/application.yml        |  65 +++++++
 .../main/resources/i18n/messages.properties   |   0
 .../resources/i18n/messages_en_US.properties  |   0
 .../resources/i18n/messages_zh_CN.properties  |   0
 .../resources/i18n/messages_zh_TW.properties  |   0
 .../main/resources/i18n/validation.properties |   0
 .../i18n/validation_en_US.properties          |   0
 .../i18n/validation_zh_CN.properties          |   0
 .../i18n/validation_zh_TW.properties          |   0
 .../src/main/resources/logback-spring.xml     | 159 ++++++++++++++++++
 .../main/resources/mapper/ScheduleJobDao.xml  |  14 ++
 .../resources/mapper/ScheduleJobLogDao.xml    |   7 +
 esua-epdc/epdc-module/epdc-news/pom.xml       |  20 +++
 .../epdc-oss/epdc-oss-server/pom.xml          |  74 +++++++-
 .../src/main/resources/application.yml        |  48 ++----
 .../epdc-party/epdc-party-client/pom.xml      |  16 ++
 .../java/com/elink/esua/epdc/epdc.gitkeep     |   0
 .../epdc-party/epdc-party-server/pom.xml      | 143 ++++++++++++++++
 .../com/elink/esua/epdc/PartyApplication.java |  31 ++++
 .../esua/epdc/config/ModuleConfigImpl.java    |  26 +++
 .../src/main/resources/application.yml        |  65 +++++++
 .../main/resources/i18n/messages.properties   |   0
 .../resources/i18n/messages_en_US.properties  |   0
 .../resources/i18n/messages_zh_CN.properties  |   0
 .../resources/i18n/messages_zh_TW.properties  |   0
 .../main/resources/i18n/validation.properties |   0
 .../i18n/validation_en_US.properties          |   0
 .../i18n/validation_zh_CN.properties          |   0
 .../i18n/validation_zh_TW.properties          |   0
 .../src/main/resources/logback-spring.xml     | 159 ++++++++++++++++++
 .../main/resources/mapper/ScheduleJobDao.xml  |  14 ++
 .../resources/mapper/ScheduleJobLogDao.xml    |   7 +
 esua-epdc/epdc-module/epdc-party/pom.xml      |  20 +++
 .../epdc-services-client/pom.xml              |  16 ++
 .../java/com/elink/esua/epdc/epdc.gitkeep     |   0
 .../epdc-services-server/pom.xml              | 143 ++++++++++++++++
 .../elink/esua/epdc/ServicesApplication.java  |  31 ++++
 .../esua/epdc/config/ModuleConfigImpl.java    |  26 +++
 .../src/main/resources/application.yml        |  65 +++++++
 .../main/resources/i18n/messages.properties   |   0
 .../resources/i18n/messages_en_US.properties  |   0
 .../resources/i18n/messages_zh_CN.properties  |   0
 .../resources/i18n/messages_zh_TW.properties  |   0
 .../main/resources/i18n/validation.properties |   0
 .../i18n/validation_en_US.properties          |   0
 .../i18n/validation_zh_CN.properties          |   0
 .../i18n/validation_zh_TW.properties          |   0
 .../src/main/resources/logback-spring.xml     | 159 ++++++++++++++++++
 .../main/resources/mapper/ScheduleJobDao.xml  |  14 ++
 .../resources/mapper/ScheduleJobLogDao.xml    |   7 +
 esua-epdc/epdc-module/epdc-services/pom.xml   |  20 +++
 esua-epdc/epdc-module/pom.xml                 |   5 +
 105 files changed, 2982 insertions(+), 204 deletions(-)
 create mode 100644 esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/entity/BaseEpdcEntity.java
 create mode 100644 esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/enums/ELinkDelFlagEnum.java
 create mode 100644 esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java
 create mode 100644 esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/YesOrNoEnum.java
 create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/pom.xml
 create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep
 create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
 create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/HeartApplication.java
 create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
 create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml
 create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/i18n/messages.properties
 create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/i18n/messages_en_US.properties
 create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/i18n/messages_zh_CN.properties
 create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/i18n/messages_zh_TW.properties
 create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/i18n/validation.properties
 create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/i18n/validation_en_US.properties
 create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/i18n/validation_zh_CN.properties
 create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/i18n/validation_zh_TW.properties
 create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/logback-spring.xml
 create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/ScheduleJobDao.xml
 create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/ScheduleJobLogDao.xml
 create mode 100644 esua-epdc/epdc-module/epdc-heart/pom.xml
 create mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-client/pom.xml
 create mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep
 create mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/pom.xml
 create mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/java/com/elink/esua/epdc/NeighborApplication.java
 create mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
 create mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/application.yml
 create mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/messages.properties
 create mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/messages_en_US.properties
 create mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/messages_zh_CN.properties
 create mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/messages_zh_TW.properties
 create mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/validation.properties
 create mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/validation_en_US.properties
 create mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/validation_zh_CN.properties
 create mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/validation_zh_TW.properties
 create mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/logback-spring.xml
 create mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/mapper/ScheduleJobDao.xml
 create mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/mapper/ScheduleJobLogDao.xml
 create mode 100644 esua-epdc/epdc-module/epdc-neighbor/pom.xml
 create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-client/pom.xml
 create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep
 create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
 create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/NewsApplication.java
 create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
 create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml
 create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/i18n/messages.properties
 create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/i18n/messages_en_US.properties
 create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/i18n/messages_zh_CN.properties
 create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/i18n/messages_zh_TW.properties
 create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/i18n/validation.properties
 create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/i18n/validation_en_US.properties
 create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/i18n/validation_zh_CN.properties
 create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/i18n/validation_zh_TW.properties
 create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/logback-spring.xml
 create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ScheduleJobDao.xml
 create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ScheduleJobLogDao.xml
 create mode 100644 esua-epdc/epdc-module/epdc-news/pom.xml
 create mode 100644 esua-epdc/epdc-module/epdc-party/epdc-party-client/pom.xml
 create mode 100644 esua-epdc/epdc-module/epdc-party/epdc-party-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep
 create mode 100644 esua-epdc/epdc-module/epdc-party/epdc-party-server/pom.xml
 create mode 100644 esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/java/com/elink/esua/epdc/PartyApplication.java
 create mode 100644 esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
 create mode 100644 esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/application.yml
 create mode 100644 esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/messages.properties
 create mode 100644 esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/messages_en_US.properties
 create mode 100644 esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/messages_zh_CN.properties
 create mode 100644 esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/messages_zh_TW.properties
 create mode 100644 esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/validation.properties
 create mode 100644 esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/validation_en_US.properties
 create mode 100644 esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/validation_zh_CN.properties
 create mode 100644 esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/validation_zh_TW.properties
 create mode 100644 esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/logback-spring.xml
 create mode 100644 esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/mapper/ScheduleJobDao.xml
 create mode 100644 esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/mapper/ScheduleJobLogDao.xml
 create mode 100644 esua-epdc/epdc-module/epdc-party/pom.xml
 create mode 100644 esua-epdc/epdc-module/epdc-services/epdc-services-client/pom.xml
 create mode 100644 esua-epdc/epdc-module/epdc-services/epdc-services-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep
 create mode 100644 esua-epdc/epdc-module/epdc-services/epdc-services-server/pom.xml
 create mode 100644 esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/java/com/elink/esua/epdc/ServicesApplication.java
 create mode 100644 esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
 create mode 100644 esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/application.yml
 create mode 100644 esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/i18n/messages.properties
 create mode 100644 esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/i18n/messages_en_US.properties
 create mode 100644 esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/i18n/messages_zh_CN.properties
 create mode 100644 esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/i18n/messages_zh_TW.properties
 create mode 100644 esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/i18n/validation.properties
 create mode 100644 esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/i18n/validation_en_US.properties
 create mode 100644 esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/i18n/validation_zh_CN.properties
 create mode 100644 esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/i18n/validation_zh_TW.properties
 create mode 100644 esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/logback-spring.xml
 create mode 100644 esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/mapper/ScheduleJobDao.xml
 create mode 100644 esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/mapper/ScheduleJobLogDao.xml
 create mode 100644 esua-epdc/epdc-module/epdc-services/pom.xml

diff --git a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/entity/BaseEpdcEntity.java b/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/entity/BaseEpdcEntity.java
new file mode 100644
index 000000000..3d0fac658
--- /dev/null
+++ b/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/entity/BaseEpdcEntity.java
@@ -0,0 +1,73 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.commons.mybatis.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 基础实体类，所有实体都需要继承
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Data
+public abstract class BaseEpdcEntity implements Serializable {
+    /**
+     * id
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+
+    /**
+     * 乐观锁
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Integer revision;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createdTime;
+
+    /**
+     * 修改者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updatedBy;
+
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updatedTime;
+
+    /**
+     * 是否已删除(0-未删除，1-已删除)
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String delFlag;
+
+}
diff --git a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/enums/ELinkDelFlagEnum.java b/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/enums/ELinkDelFlagEnum.java
new file mode 100644
index 000000000..7d45663c4
--- /dev/null
+++ b/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/enums/ELinkDelFlagEnum.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.commons.mybatis.enums;
+
+/**
+ * 删除标识枚举
+ *
+ * @author yujintao
+ * @date 2019/8/19 10:37
+ */
+public enum ELinkDelFlagEnum {
+    /**
+     * 未删
+     */
+    NORMAL("0"),
+    /**
+     * 已删
+     */
+    DEL("1");
+
+    private String value;
+
+    ELinkDelFlagEnum(String value) {
+        this.value = value;
+    }
+
+    public String value() {
+        return this.value;
+    }
+}
diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java
new file mode 100644
index 000000000..fabe6ef55
--- /dev/null
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java
@@ -0,0 +1,32 @@
+package com.elink.esua.epdc.commons.tools.constant;
+
+/**
+ * 常用数字常量
+ *
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/8/19 10:28
+ */
+public interface NumConstant {
+
+    int ZERO = 0;
+    int ONE = 1;
+    int TWO = 2;
+    int THREE = 3;
+    int FOUR = 4;
+
+    int TEN = 10;
+    int FIFTEEN = 15;
+    int TWENTY = 20;
+    int THIRTY = 30;
+    int FORTY = 40;
+    int FIFTY = 50;
+    int ONE_HUNDRED = 100;
+
+    String ZERO_STR = "0";
+    String ONE_STR = "1";
+    String TWO_STR = "2";
+    String THREE_STR = "3";
+    String FOUR_STR = "4";
+
+}
diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java
index 20915ae66..f96e57fd5 100644
--- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java
@@ -1,8 +1,8 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- *
+ * <p>
  * https://www.renren.io
- *
+ * <p>
  * 版权所有，侵权必究！
  */
 
@@ -23,4 +23,40 @@ public interface ServiceConstant {
      * 授权服务
      */
     String EPDC_AUTH_SERVER = "epdc-auth-server";
+    /**
+     *
+     */
+    String EPDC_GATEWAY_SERVER = "epdc-gateway-server";
+    /**
+     * 任务模块
+     */
+    String EPDC_JOB_SERVER = "epdc-job-server";
+    /**
+     * 消息通知模块
+     */
+    String EPDC_MESSAGE_SERVER = "epdc-message-server";
+    /**
+     * 文件对象模块
+     */
+    String EPDC_OSS_SERVER = "epdc-oss-server";
+    /**
+     * 爱心互助模块
+     */
+    String EPDC_HEART_SERVER = "epdc-heart-server";
+    /**
+     * 友邻社群模块
+     */
+    String EPDC_NEIGHBOR_SERVER = "epdc-neighbor-server";
+    /**
+     * 新闻公告模块
+     */
+    String EPDC_NEWS_SERVER = "epdc-news-server";
+    /**
+     * 党群议事模块
+     */
+    String EPDC_PARTY_SERVER = "epdc-party-server";
+    /**
+     * 生活服务模块
+     */
+    String EPDC_SERVICES_SERVER = "epdc-services-server";
 }
diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/YesOrNoEnum.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/YesOrNoEnum.java
new file mode 100644
index 000000000..4135959dc
--- /dev/null
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/YesOrNoEnum.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.commons.tools.enums;
+
+/**
+ * 常用开关枚举：0否；1是
+ *
+ * @author yujintao
+ * @date 2019/8/19 10:34
+ */
+public enum YesOrNoEnum {
+    /**
+     * 是
+     */
+    YES(1),
+    /**
+     * 否
+     */
+    NO(0);
+
+    private int value;
+
+    YesOrNoEnum(int value) {
+        this.value = value;
+    }
+
+    public int value() {
+        return this.value;
+    }
+}
diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java
index 99bc54751..0568fe833 100644
--- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java
@@ -1,8 +1,8 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- *
+ * <p>
  * https://www.renren.io
- *
+ * <p>
  * 版权所有，侵权必究！
  */
 
@@ -13,59 +13,62 @@ package com.elink.esua.epdc.commons.tools.redis;
  * @since 1.0.0
  */
 public class RedisKeys {
+
+    private final static String MODULE_FLAG = "epdc:";
+
     /**
      * 系统参数Key
      */
-    public static String getSysParamsKey(){
-        return "sys:params";
+    public static String getSysParamsKey() {
+        return MODULE_FLAG + "sys:params";
     }
 
     /**
      * 登录验证码Key
      */
-    public static String getLoginCaptchaKey(String uuid){
-        return "sys:captcha:" + uuid;
+    public static String getLoginCaptchaKey(String uuid) {
+        return MODULE_FLAG + "sys:captcha:" + uuid;
     }
 
     /**
      * 登录用户Key
      */
-    public static String getSecurityUserKey(Long id){
-        return "sys:security:user:" + id;
+    public static String getSecurityUserKey(Long id) {
+        return MODULE_FLAG + "sys:security:user:" + id;
     }
 
     /**
      * 系统日志Key
      */
-    public static String getSysLogKey(){
-        return "sys:log";
+    public static String getSysLogKey() {
+        return MODULE_FLAG + "sys:log";
     }
 
     /**
      * 系统资源Key
      */
-    public static String getSysResourceKey(){
-        return  "sys:resource";
+    public static String getSysResourceKey() {
+        return MODULE_FLAG + "sys:resource";
     }
 
     /**
      * 用户菜单导航Key
      */
-    public static String getUserMenuNavKey(Long userId, String language){
-        return "sys:user:nav:" + userId + "_" + language;
+    public static String getUserMenuNavKey(Long userId, String language) {
+        return MODULE_FLAG + "sys:user:nav:" + userId + "_" + language;
     }
 
     /**
      * 用户菜单导航Key
      */
-    public static String getUserMenuNavKey(Long userId){
-        return "sys:user:nav:" + userId + "_*";
+    public static String getUserMenuNavKey(Long userId) {
+        return MODULE_FLAG + "sys:user:nav:" + userId + "_*";
     }
 
     /**
      * 用户权限标识Key
      */
-    public static String getUserPermissionsKey(Long userId){
-        return "sys:user:permissions:" + userId;
+    public static String getUserPermissionsKey(Long userId) {
+        return MODULE_FLAG + "sys:user:permissions:" + userId;
     }
 }
diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml
index 32394d2f5..c093f5302 100644
--- a/esua-epdc/epdc-gateway/pom.xml
+++ b/esua-epdc/epdc-gateway/pom.xml
@@ -75,26 +75,26 @@
                 <!-- gateway routes -->
                 <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
                 <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
-                <gateway.routes.epdc-monitor-server.uri>lb://epdc-monitor-server
-                </gateway.routes.epdc-monitor-server.uri>
-                <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
-                <gateway.routes.epdc-message-server.uri>lb://epdc-message-server
-                </gateway.routes.epdc-message-server.uri>
-                <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
-                </gateway.routes.epdc-activiti-server.uri>
-                <gateway.routes.epdc-job-server.uri>lb://epdc-job-server</gateway.routes.epdc-job-server.uri>
+<!--                <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>-->
+                <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server</gateway.routes.epdc-activiti-server.uri>
                 <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
-                <gateway.routes.epdc-map-server.uri>http://127.0.0.1:8019</gateway.routes.epdc-map-server.uri>
-                <gateway.routes.epdc-building-server.uri>http://127.0.0.1:8090</gateway.routes.epdc-building-server.uri>
-                <gateway.routes.epdc-notice-server.uri>lb://epdc-notice-server</gateway.routes.epdc-notice-server.uri>
-                <gateway.routes.epdc-property-server.uri>http://127.0.0.1:9001</gateway.routes.epdc-property-server.uri>
-                <gateway.routes.epdc-safety-server.uri>lb://epdc-safety-server</gateway.routes.epdc-safety-server.uri>
-                <gateway.routes.epdc-config-server.uri>lb://epdc-config-server</gateway.routes.epdc-config-server.uri>
-                <gateway.routes.epdc-app-user-server.uri>http://127.0.0.1:8088</gateway.routes.epdc-app-user-server.uri>
-                <gateway.routes.epdc-iot-server.uri>http://127.0.0.1:8069</gateway.routes.epdc-iot-server.uri>
+                <gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>
+<!--                <gateway.routes.epdc-heart-server.uri>http://127.0.0.1:9060</gateway.routes.epdc-heart-server.uri>-->
+                <gateway.routes.epdc-job-server.uri>lb://epdc-job-server</gateway.routes.epdc-job-server.uri>
+<!--                <gateway.routes.epdc-job-server.uri>http://127.0.0.1:9061</gateway.routes.epdc-job-server.uri>-->
+                <gateway.routes.epdc-message-server.uri>lb://epdc-message-server</gateway.routes.epdc-message-server.uri>
+                <gateway.routes.epdc-neighbor-server.uri>lb://epdc-neighbor-server</gateway.routes.epdc-neighbor-server.uri>
+<!--                <gateway.routes.epdc-neighbor-server.uri>http://127.0.0.1:9063</gateway.routes.epdc-neighbor-server.uri>-->
+                <gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>
+<!--                <gateway.routes.epdc-news-server.uri>http://127.0.0.1:9064</gateway.routes.epdc-news-server.uri>-->
+                <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
+                <gateway.routes.epdc-party-server.uri>lb://epdc-party-server</gateway.routes.epdc-party-server.uri>
+<!--                <gateway.routes.epdc-party-server.uri>http://127.0.0.1:9066</gateway.routes.epdc-party-server.uri>-->
+                <gateway.routes.epdc-services-server.uri>lb://epdc-services-server</gateway.routes.epdc-services-server.uri>
+<!--                <gateway.routes.epdc-services-server.uri>http://127.0.0.1:9067</gateway.routes.epdc-services-server.uri>-->
 
                 <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
+                <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
             </properties>
         </profile>
@@ -111,25 +111,16 @@
                 <!-- gateway routes -->
                 <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
                 <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
-                <gateway.routes.epdc-monitor-server.uri>lb://epdc-monitor-server
-                </gateway.routes.epdc-monitor-server.uri>
-                <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
-                <gateway.routes.epdc-message-server.uri>lb://epdc-message-server
-                </gateway.routes.epdc-message-server.uri>
-                <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
-                </gateway.routes.epdc-activiti-server.uri>
-                <gateway.routes.epdc-job-server.uri>lb://epdc-job-server</gateway.routes.epdc-job-server.uri>
+                <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server</gateway.routes.epdc-activiti-server.uri>
                 <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
-                <gateway.routes.epdc-building-server.uri>lb://epdc-building-server
-                </gateway.routes.epdc-building-server.uri>
-                <gateway.routes.epdc-notice-server.uri>lb://epdc-notice-server</gateway.routes.epdc-notice-server.uri>
-                <gateway.routes.epdc-property-server.uri>lb://epdc-property-server
-                </gateway.routes.epdc-property-server.uri>
-                <gateway.routes.epdc-safety-server.uri>lb://epdc-safety-server</gateway.routes.epdc-safety-server.uri>
-                <gateway.routes.epdc-config-server.uri>lb://epdc-config-server</gateway.routes.epdc-config-server.uri>
-                <gateway.routes.epdc-app-user-server.uri>lb://epdc-app-user-server
-                </gateway.routes.epdc-app-user-server.uri>
-                <gateway.routes.epdc-iot-server.uri>lb://epdc-iot-server</gateway.routes.epdc-iot-server.uri>
+                <gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>
+                <gateway.routes.epdc-job-server.uri>lb://epdc-job-server</gateway.routes.epdc-job-server.uri>
+                <gateway.routes.epdc-message-server.uri>lb://epdc-message-server</gateway.routes.epdc-message-server.uri>
+                <gateway.routes.epdc-neighbor-server.uri>lb://epdc-neighbor-server</gateway.routes.epdc-neighbor-server.uri>
+                <gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>
+                <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
+                <gateway.routes.epdc-party-server.uri>lb://epdc-party-server</gateway.routes.epdc-party-server.uri>
+                <gateway.routes.epdc-services-server.uri>lb://epdc-services-server</gateway.routes.epdc-services-server.uri>
 
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
@@ -149,25 +140,16 @@
                 <!-- gateway routes -->
                 <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
                 <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
-                <gateway.routes.epdc-monitor-server.uri>lb://epdc-monitor-server
-                </gateway.routes.epdc-monitor-server.uri>
-                <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
-                <gateway.routes.epdc-message-server.uri>lb://epdc-message-server
-                </gateway.routes.epdc-message-server.uri>
-                <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
-                </gateway.routes.epdc-activiti-server.uri>
-                <gateway.routes.epdc-job-server.uri>lb://epdc-job-server</gateway.routes.epdc-job-server.uri>
+                <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server</gateway.routes.epdc-activiti-server.uri>
                 <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
-                <gateway.routes.epdc-building-server.uri>lb://epdc-building-server
-                </gateway.routes.epdc-building-server.uri>
-                <gateway.routes.epdc-notice-server.uri>lb://epdc-notice-server</gateway.routes.epdc-notice-server.uri>
-                <gateway.routes.epdc-property-server.uri>lb://epdc-property-server
-                </gateway.routes.epdc-property-server.uri>
-                <gateway.routes.epdc-safety-server.uri>lb://epdc-safety-server</gateway.routes.epdc-safety-server.uri>
-                <gateway.routes.epdc-config-server.uri>lb://epdc-config-server</gateway.routes.epdc-config-server.uri>
-                <gateway.routes.epdc-app-user-server.uri>lb://epdc-app-user-server
-                </gateway.routes.epdc-app-user-server.uri>
-                <gateway.routes.epdc-iot-server.uri>lb://epdc-iot-server</gateway.routes.epdc-iot-server.uri>
+                <gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>
+                <gateway.routes.epdc-job-server.uri>lb://epdc-job-server</gateway.routes.epdc-job-server.uri>
+                <gateway.routes.epdc-message-server.uri>lb://epdc-message-server</gateway.routes.epdc-message-server.uri>
+                <gateway.routes.epdc-neighbor-server.uri>lb://epdc-neighbor-server</gateway.routes.epdc-neighbor-server.uri>
+                <gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>
+                <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
+                <gateway.routes.epdc-party-server.uri>lb://epdc-party-server</gateway.routes.epdc-party-server.uri>
+                <gateway.routes.epdc-services-server.uri>lb://epdc-services-server</gateway.routes.epdc-services-server.uri>
 
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml
index 8864c62f1..496945468 100644
--- a/esua-epdc/epdc-gateway/src/main/resources/application.yml
+++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml
@@ -34,7 +34,7 @@ spring:
         #OSS服务
         - id: epdc-oss-server
           uri: @gateway.routes.epdc-oss-server.uri@
-          order: 4
+          order: 3
           predicates:
             - Path=/oss/**
           filters:
@@ -42,7 +42,7 @@ spring:
         #消息服务
         - id: epdc-message-server
           uri: @gateway.routes.epdc-message-server.uri@
-          order: 5
+          order: 4
           predicates:
             - Path=/message/**
           filters:
@@ -71,6 +71,46 @@ spring:
             - Path=/api/**
           filters:
             - StripPrefix=0
+        #爱心互助模块
+        - id: epdc-heart-server
+          uri: @gateway.routes.epdc-heart-server.uri@
+          order: 8
+          predicates:
+            - Path=/api/**
+          filters:
+            - StripPrefix=0
+        #友邻社群模块
+        - id: epdc-neighbor-server
+          uri: @gateway.routes.epdc-neighbor-server.uri@
+          order: 9
+          predicates:
+            - Path=/api/**
+          filters:
+            - StripPrefix=0
+        #新闻公告模块
+        - id: epdc-news-server
+          uri: @gateway.routes.epdc-news-server.uri@
+          order: 10
+          predicates:
+            - Path=/api/**
+          filters:
+            - StripPrefix=0
+        #党群议事模块
+        - id: epdc-party-server
+          uri: @gateway.routes.epdc-party-server.uri@
+          order: 11
+          predicates:
+            - Path=/api/**
+          filters:
+            - StripPrefix=0
+        #生活服务模块
+        - id: epdc-services-server
+          uri: @gateway.routes.epdc-services-server.uri@
+          order: 12
+          predicates:
+            - Path=/api/**
+          filters:
+            - StripPrefix=0
     nacos:
       discovery:
         server-addr: @nacos.server-addr@
@@ -84,20 +124,6 @@ management:
     health:
       show-details: ALWAYS
 
-#eureka:
-#  instance:
-#    prefer-ip-address: true
-#    instance-id: ${spring.cloud.client.ip-address}:${server.port}
-#    metadata-map:
-#      management:
-#        context-path: /actuator
-#    health-check-url-path: /actuator/health
-#    status-page-url-path: /actuator/info
-#  client:
-#    service-url:
-#      defaultZone: http://eureka:8761/eureka/
-
-
 
 feign:
   hystrix:
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/pom.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/pom.xml
new file mode 100644
index 000000000..5f10d222c
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epdc-heart</artifactId>
+        <groupId>com.esua.epdc</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>epdc-heart-client</artifactId>
+    <packaging>jar</packaging>
+
+
+</project>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
new file mode 100644
index 000000000..c06e167d0
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epdc-heart</artifactId>
+        <groupId>com.esua.epdc</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>epdc-heart-server</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-heart-client</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-commons-tools</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-commons-mybatis</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-client</artifactId>
+            <version>${spring.boot.admin.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <spring.profiles.active>dev</spring.profiles.active>
+
+                <server.port>9060</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>test</id>
+            <properties>
+                <spring.profiles.active>test</spring.profiles.active>
+
+                <server.port>9060</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>prod</id>
+            <properties>
+                <spring.profiles.active>prod</spring.profiles.active>
+
+                <server.port>9060</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+    </profiles>
+</project>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/HeartApplication.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/HeartApplication.java
new file mode 100644
index 000000000..875fb9800
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/HeartApplication.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+/**
+ * 爱心互助模块
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.1.0
+ */
+@SpringBootApplication
+@EnableDiscoveryClient
+@EnableFeignClients
+public class HeartApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(HeartApplication.class, args);
+    }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
new file mode 100644
index 000000000..a91d50d2b
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.config;
+
+import com.elink.esua.epdc.commons.tools.config.ModuleConfig;
+import org.springframework.stereotype.Service;
+
+/**
+ * 模块配置信息-爱心互助模块
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Service
+public class ModuleConfigImpl implements ModuleConfig {
+    @Override
+    public String getName() {
+        return "heart";
+    }
+}
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml
new file mode 100644
index 000000000..f7061b3e9
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml
@@ -0,0 +1,65 @@
+server:
+  port: @server.port@
+  servlet:
+    context-path: /heart
+
+spring:
+  application:
+    name: epdc-heart-server
+  # 环境 dev|test|prod
+  profiles:
+    active: @spring.profiles.active@
+  messages:
+    encoding: UTF-8
+    basename: i18n/messages,i18n/messages_common
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+  redis:
+    database: 0
+    host: @spring.redis.host@
+    timeout: 30s
+    port: @spring.redis.port@
+    password: @spring.redis.password@
+  cloud:
+    nacos:
+      discovery:
+        server-addr: @nacos.server-addr@
+        register-enabled: @nacos.register-enabled@
+  datasource:
+    druid:
+      driver-class-name: com.mysql.jdbc.Driver
+      url: @spring.datasource.druid.url@
+      username: @spring.datasource.druid.username@
+      password: @spring.datasource.druid.password@
+
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+  endpoint:
+    health:
+      show-details: ALWAYS
+
+mybatis-plus:
+  mapper-locations: classpath:/mapper/**/*.xml
+  #实体扫描，多个package用逗号或者分号分隔
+  typeAliasesPackage: io.renren.entity;com.elink.esua.epdc.entity
+  global-config:
+    #数据库相关配置
+    db-config:
+      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
+      id-type: ID_WORKER
+      #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
+      field-strategy: NOT_NULL
+      #驼峰下划线转换
+      column-underline: true
+    banner: false
+  #原生配置
+  configuration:
+    map-underscore-to-camel-case: true
+    cache-enabled: false
+    call-setters-on-nulls: true
+    jdbc-type-for-null: 'null'
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/i18n/messages.properties b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/i18n/messages.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/i18n/messages_en_US.properties b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/i18n/messages_en_US.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/i18n/messages_zh_CN.properties b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/i18n/messages_zh_CN.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/i18n/messages_zh_TW.properties b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/i18n/messages_zh_TW.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/i18n/validation.properties b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/i18n/validation.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/i18n/validation_en_US.properties b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/i18n/validation_en_US.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/i18n/validation_zh_CN.properties b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/i18n/validation_zh_CN.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/i18n/validation_zh_TW.properties b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/i18n/validation_zh_TW.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/logback-spring.xml
new file mode 100644
index 000000000..e357d9282
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/logback-spring.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+
+    <property name="log.path" value="logs/heart"/>
+
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+
+    <!--1. 输出到控制台-->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>debug</level>
+        </filter>
+        <encoder>
+            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+            <!-- 设置字符集 -->
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!--2. 输出到文档-->
+    <!-- 2.1 level为 DEBUG 日志，时间滚动输出  -->
+    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/debug.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志归档 -->
+            <fileNamePattern>${log.path}/debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录debug级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>debug</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.2 level为 INFO 日志，时间滚动输出  -->
+    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/info.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 每天日志归档路径以及格式 -->
+            <fileNamePattern>${log.path}/info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.3 level为 WARN 日志，时间滚动输出  -->
+    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/warn.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录warn级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>warn</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.4 level为 ERROR 日志，时间滚动输出  -->
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/error.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录ERROR级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 开发、测试环境 -->
+    <springProfile name="dev,test">
+        <logger name="org.springframework.web" level="INFO"/>
+        <logger name="org.springboot.sample" level="INFO"/>
+        <logger name="com.elink.esua.epdc" level="INFO"/>
+        <logger name="com.elink.esua.epdc.dao" level="DEBUG"/>
+        <root level="INFO">
+            <appender-ref ref="DEBUG_FILE"/>
+            <appender-ref ref="INFO_FILE"/>
+            <appender-ref ref="WARN_FILE"/>
+            <appender-ref ref="ERROR_FILE"/>
+        </root>
+    </springProfile>
+
+    <!-- 生产环境 -->
+    <springProfile name="prod">
+        <logger name="org.springframework.web" level="ERROR"/>
+        <logger name="org.springboot.sample" level="ERROR"/>
+        <logger name="com.elink.esua.epdc" level="ERROR"/>
+        <root level="ERROR">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="DEBUG_FILE"/>
+            <appender-ref ref="INFO_FILE"/>
+            <appender-ref ref="WARN_FILE"/>
+            <appender-ref ref="ERROR_FILE"/>
+        </root>
+    </springProfile>
+
+</configuration>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/ScheduleJobDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/ScheduleJobDao.xml
new file mode 100644
index 000000000..57cb6edb5
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/ScheduleJobDao.xml
@@ -0,0 +1,14 @@
+<?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="com.elink.esua.epdc.dao.ScheduleJobDao">
+
+	<!-- 批量更新状态 -->
+	<update id="updateBatch">
+		update schedule_job set status = #{status} where id in
+		<foreach item="id" collection="ids"  open="(" separator="," close=")">
+			#{id}
+		</foreach>
+	</update>
+
+</mapper>
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/ScheduleJobLogDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/ScheduleJobLogDao.xml
new file mode 100644
index 000000000..3683f2ca4
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/ScheduleJobLogDao.xml
@@ -0,0 +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="com.elink.esua.epdc.dao.ScheduleJobLogDao">
+
+
+</mapper>
diff --git a/esua-epdc/epdc-module/epdc-heart/pom.xml b/esua-epdc/epdc-module/epdc-heart/pom.xml
new file mode 100644
index 000000000..85e454344
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-heart/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epdc-module</artifactId>
+        <groupId>com.esua.epdc</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>epdc-heart</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>epdc-heart-client</module>
+        <module>epdc-heart-server</module>
+    </modules>
+
+
+</project>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
index 79e03447a..f128d3464 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
@@ -41,8 +41,8 @@
             <artifactId>spring-context-support</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
         <dependency>
             <groupId>org.quartz-scheduler</groupId>
@@ -98,4 +98,75 @@
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <spring.profiles.active>dev</spring.profiles.active>
+
+                <server.port>9061</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>test</id>
+            <properties>
+                <spring.profiles.active>test</spring.profiles.active>
+
+                <server.port>9061</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>prod</id>
+            <properties>
+                <spring.profiles.active>prod</spring.profiles.active>
+
+                <server.port>9061</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+    </profiles>
+
 </project>
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml
index a3f011e96..c009ed353 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8084
+  port: @server.port@
   servlet:
     context-path: /job
 
@@ -8,7 +8,7 @@ spring:
     name: epdc-job-server
   # 环境 dev|test|prod
   profiles:
-    active: dev
+    active: @spring.profiles.active@
   messages:
     encoding: UTF-8
     basename: i18n/messages,i18n/messages_common
@@ -17,31 +17,22 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
     database: 0
-    host: redis
+    host: @spring.redis.host@
     timeout: 30s
-    port: 6379
-    password: 123456
+    port: @spring.redis.port@
+    password: @spring.redis.password@
+  cloud:
+    nacos:
+      discovery:
+        server-addr: @nacos.server-addr@
+        register-enabled: @nacos.register-enabled@
   datasource:
     druid:
       driver-class-name: com.mysql.jdbc.Driver
-      url: jdbc:mysql://localhost:3306/renren_cloud?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
-      username: renren
-      password: 123456
-      #Oracle
-#      driver-class-name: oracle.jdbc.OracleDriver
-#      url: jdbc:oracle:thin:@localhost:1521:xe
-#      username: renren_cloud
-#      password: 123456
-      #SQLServer
-#      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#      url: jdbc:sqlserver://localhost:1433;DatabaseName=security_enterprise
-#      username: sa
-#      password: 123456
-      #postgresql
-#      driver-class-name: org.postgresql.Driver
-#      url: jdbc:postgresql://localhost:5432/security_enterprise
-#      username: postgres
-#      password: 123456
+      url: @spring.datasource.druid.url@
+      username: @spring.datasource.druid.username@
+      password: @spring.datasource.druid.password@
+
 
 management:
   endpoints:
@@ -52,23 +43,10 @@ management:
     health:
       show-details: ALWAYS
 
-eureka:
-  instance:
-    prefer-ip-address: true
-    instance-id: ${spring.cloud.client.ip-address}:${server.port}
-    metadata-map:
-      management:
-        context-path: ${server.servlet.context-path}/actuator
-    health-check-url-path: ${server.servlet.context-path}/actuator/health
-    status-page-url-path: ${server.servlet.context-path}/actuator/info
-  client:
-    service-url:
-      defaultZone: http://eureka:8761/eureka/
-
 mybatis-plus:
   mapper-locations: classpath:/mapper/**/*.xml
   #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: io.renren.entity
+  typeAliasesPackage: io.renren.entity;com.elink.esua.epdc.entity
   global-config:
     #数据库相关配置
     db-config:
diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
index 8dcb9d409..67539c47b 100644
--- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
@@ -49,8 +49,8 @@
             <artifactId>spring-context-support</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
         <dependency>
             <groupId>de.codecentric</groupId>
@@ -104,4 +104,75 @@
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <spring.profiles.active>dev</spring.profiles.active>
+
+                <server.port>9062</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>test</id>
+            <properties>
+                <spring.profiles.active>test</spring.profiles.active>
+
+                <server.port>9062</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>prod</id>
+            <properties>
+                <spring.profiles.active>prod</spring.profiles.active>
+
+                <server.port>9062</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>true</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+    </profiles>
+
 </project>
diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/application.yml
index 71953ba4e..b1b1931bd 100644
--- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8085
+  port: @server.port@
   servlet:
     context-path: /message
 
@@ -8,7 +8,7 @@ spring:
     name: epdc-message-server
   # 环境 dev|test|prod
   profiles:
-    active: dev
+    active: @spring.profiles.active@
   messages:
     encoding: UTF-8
     basename: i18n/messages,i18n/messages_common
@@ -17,31 +17,21 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
     database: 0
-    host: redis
+    host: @spring.redis.host@
     timeout: 30s
-    port: 6379
-    password: 123456
+    port: @spring.redis.port@
+    password: @spring.redis.password@
+  cloud:
+    nacos:
+      discovery:
+        server-addr: @nacos.server-addr@
+        register-enabled: @nacos.register-enabled@
   datasource:
     druid:
       driver-class-name: com.mysql.jdbc.Driver
-      url: jdbc:mysql://localhost:3306/renren_cloud?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
-      username: renren
-      password: 123456
-      #Oracle
-#      driver-class-name: oracle.jdbc.OracleDriver
-#      url: jdbc:oracle:thin:@localhost:1521:xe
-#      username: renren_cloud
-#      password: 123456
-      #SQLServer
-#      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#      url: jdbc:sqlserver://localhost:1433;DatabaseName=renren_cloud
-#      username: sa
-#      password: 123456
-      #postgresql
-#      driver-class-name: org.postgresql.Driver
-#      url: jdbc:postgresql://localhost:5432/renren_cloud
-#      username: postgres
-#      password: 123456
+      url: @spring.datasource.druid.url@
+      username: @spring.datasource.druid.username@
+      password: @spring.datasource.druid.password@
 
 management:
   endpoints:
@@ -52,23 +42,10 @@ management:
     health:
       show-details: ALWAYS
 
-eureka:
-  instance:
-    prefer-ip-address: true
-    instance-id: ${spring.cloud.client.ip-address}:${server.port}
-    metadata-map:
-      management:
-        context-path: ${server.servlet.context-path}/actuator
-    health-check-url-path: ${server.servlet.context-path}/actuator/health
-    status-page-url-path: ${server.servlet.context-path}/actuator/info
-  client:
-    service-url:
-      defaultZone: http://eureka:8761/eureka/
-
 mybatis-plus:
   mapper-locations: classpath:/mapper/**/*.xml
   #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: io.renren.entity
+  typeAliasesPackage: io.renren.entity;com.elink.esua.epdc.entity
   global-config:
     #数据库相关配置
     db-config:
diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-client/pom.xml b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-client/pom.xml
new file mode 100644
index 000000000..cb0fce014
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-client/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epdc-neighbor</artifactId>
+        <groupId>com.esua.epdc</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>epdc-neighbor-client</artifactId>
+    <packaging>jar</packaging>
+
+
+</project>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/pom.xml b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/pom.xml
new file mode 100644
index 000000000..96a2fc29d
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/pom.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epdc-neighbor</artifactId>
+        <groupId>com.esua.epdc</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>epdc-neighbor-server</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-neighbor-client</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-commons-tools</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-commons-mybatis</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-client</artifactId>
+            <version>${spring.boot.admin.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <spring.profiles.active>dev</spring.profiles.active>
+
+                <server.port>9063</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>test</id>
+            <properties>
+                <spring.profiles.active>test</spring.profiles.active>
+
+                <server.port>9063</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>prod</id>
+            <properties>
+                <spring.profiles.active>prod</spring.profiles.active>
+
+                <server.port>9063</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+    </profiles>
+
+</project>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/java/com/elink/esua/epdc/NeighborApplication.java b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/java/com/elink/esua/epdc/NeighborApplication.java
new file mode 100644
index 000000000..9e021c6ee
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/java/com/elink/esua/epdc/NeighborApplication.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+/**
+ * 友邻社群模块
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.1.0
+ */
+@SpringBootApplication
+@EnableDiscoveryClient
+@EnableFeignClients
+public class NeighborApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(NeighborApplication.class, args);
+    }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
new file mode 100644
index 000000000..2d13dec56
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.config;
+
+import com.elink.esua.epdc.commons.tools.config.ModuleConfig;
+import org.springframework.stereotype.Service;
+
+/**
+ * 模块配置信息-爱心互助模块
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Service
+public class ModuleConfigImpl implements ModuleConfig {
+    @Override
+    public String getName() {
+        return "neighbor";
+    }
+}
diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/application.yml
new file mode 100644
index 000000000..bbf98fa49
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/application.yml
@@ -0,0 +1,65 @@
+server:
+  port: @server.port@
+  servlet:
+    context-path: /neighbor
+
+spring:
+  application:
+    name: epdc-neighbor-server
+  # 环境 dev|test|prod
+  profiles:
+    active: @spring.profiles.active@
+  messages:
+    encoding: UTF-8
+    basename: i18n/messages,i18n/messages_common
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+  redis:
+    database: 0
+    host: @spring.redis.host@
+    timeout: 30s
+    port: @spring.redis.port@
+    password: @spring.redis.password@
+  cloud:
+    nacos:
+      discovery:
+        server-addr: @nacos.server-addr@
+        register-enabled: @nacos.register-enabled@
+  datasource:
+    druid:
+      driver-class-name: com.mysql.jdbc.Driver
+      url: @spring.datasource.druid.url@
+      username: @spring.datasource.druid.username@
+      password: @spring.datasource.druid.password@
+
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+  endpoint:
+    health:
+      show-details: ALWAYS
+
+mybatis-plus:
+  mapper-locations: classpath:/mapper/**/*.xml
+  #实体扫描，多个package用逗号或者分号分隔
+  typeAliasesPackage: io.renren.entity;com.elink.esua.epdc.entity
+  global-config:
+    #数据库相关配置
+    db-config:
+      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
+      id-type: ID_WORKER
+      #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
+      field-strategy: NOT_NULL
+      #驼峰下划线转换
+      column-underline: true
+    banner: false
+  #原生配置
+  configuration:
+    map-underscore-to-camel-case: true
+    cache-enabled: false
+    call-setters-on-nulls: true
+    jdbc-type-for-null: 'null'
diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/messages.properties b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/messages.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/messages_en_US.properties b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/messages_en_US.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/messages_zh_CN.properties b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/messages_zh_CN.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/messages_zh_TW.properties b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/messages_zh_TW.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/validation.properties b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/validation.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/validation_en_US.properties b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/validation_en_US.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/validation_zh_CN.properties b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/validation_zh_CN.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/validation_zh_TW.properties b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/validation_zh_TW.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/logback-spring.xml
new file mode 100644
index 000000000..b6a877871
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/logback-spring.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+
+    <property name="log.path" value="logs/neighbor"/>
+
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+
+    <!--1. 输出到控制台-->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>debug</level>
+        </filter>
+        <encoder>
+            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+            <!-- 设置字符集 -->
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!--2. 输出到文档-->
+    <!-- 2.1 level为 DEBUG 日志，时间滚动输出  -->
+    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/debug.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志归档 -->
+            <fileNamePattern>${log.path}/debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录debug级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>debug</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.2 level为 INFO 日志，时间滚动输出  -->
+    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/info.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 每天日志归档路径以及格式 -->
+            <fileNamePattern>${log.path}/info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.3 level为 WARN 日志，时间滚动输出  -->
+    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/warn.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录warn级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>warn</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.4 level为 ERROR 日志，时间滚动输出  -->
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/error.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录ERROR级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 开发、测试环境 -->
+    <springProfile name="dev,test">
+        <logger name="org.springframework.web" level="INFO"/>
+        <logger name="org.springboot.sample" level="INFO"/>
+        <logger name="com.elink.esua.epdc" level="INFO"/>
+        <logger name="com.elink.esua.epdc.dao" level="DEBUG"/>
+        <root level="INFO">
+            <appender-ref ref="DEBUG_FILE"/>
+            <appender-ref ref="INFO_FILE"/>
+            <appender-ref ref="WARN_FILE"/>
+            <appender-ref ref="ERROR_FILE"/>
+        </root>
+    </springProfile>
+
+    <!-- 生产环境 -->
+    <springProfile name="prod">
+        <logger name="org.springframework.web" level="ERROR"/>
+        <logger name="org.springboot.sample" level="ERROR"/>
+        <logger name="com.elink.esua.epdc" level="ERROR"/>
+        <root level="ERROR">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="DEBUG_FILE"/>
+            <appender-ref ref="INFO_FILE"/>
+            <appender-ref ref="WARN_FILE"/>
+            <appender-ref ref="ERROR_FILE"/>
+        </root>
+    </springProfile>
+
+</configuration>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/mapper/ScheduleJobDao.xml b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/mapper/ScheduleJobDao.xml
new file mode 100644
index 000000000..57cb6edb5
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/mapper/ScheduleJobDao.xml
@@ -0,0 +1,14 @@
+<?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="com.elink.esua.epdc.dao.ScheduleJobDao">
+
+	<!-- 批量更新状态 -->
+	<update id="updateBatch">
+		update schedule_job set status = #{status} where id in
+		<foreach item="id" collection="ids"  open="(" separator="," close=")">
+			#{id}
+		</foreach>
+	</update>
+
+</mapper>
diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/mapper/ScheduleJobLogDao.xml b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/mapper/ScheduleJobLogDao.xml
new file mode 100644
index 000000000..3683f2ca4
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/mapper/ScheduleJobLogDao.xml
@@ -0,0 +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="com.elink.esua.epdc.dao.ScheduleJobLogDao">
+
+
+</mapper>
diff --git a/esua-epdc/epdc-module/epdc-neighbor/pom.xml b/esua-epdc/epdc-module/epdc-neighbor/pom.xml
new file mode 100644
index 000000000..744cca83b
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-neighbor/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epdc-module</artifactId>
+        <groupId>com.esua.epdc</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>epdc-neighbor</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>epdc-neighbor-client</module>
+        <module>epdc-neighbor-server</module>
+    </modules>
+
+
+</project>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/pom.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-client/pom.xml
new file mode 100644
index 000000000..5d569d869
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epdc-news</artifactId>
+        <groupId>com.esua.epdc</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>epdc-news-client</artifactId>
+    <packaging>jar</packaging>
+
+
+</project>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
new file mode 100644
index 000000000..528cd69af
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epdc-news</artifactId>
+        <groupId>com.esua.epdc</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>epdc-news-server</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-news-client</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-commons-tools</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-commons-mybatis</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-client</artifactId>
+            <version>${spring.boot.admin.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <spring.profiles.active>dev</spring.profiles.active>
+
+                <server.port>9064</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>test</id>
+            <properties>
+                <spring.profiles.active>test</spring.profiles.active>
+
+                <server.port>9064</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>prod</id>
+            <properties>
+                <spring.profiles.active>prod</spring.profiles.active>
+
+                <server.port>9064</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+    </profiles>
+
+</project>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/NewsApplication.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/NewsApplication.java
new file mode 100644
index 000000000..e6905c9e4
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/NewsApplication.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+/**
+ * 新闻公告模块
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.1.0
+ */
+@SpringBootApplication
+@EnableDiscoveryClient
+@EnableFeignClients
+public class NewsApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(NewsApplication.class, args);
+    }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
new file mode 100644
index 000000000..bd40e4658
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.config;
+
+import com.elink.esua.epdc.commons.tools.config.ModuleConfig;
+import org.springframework.stereotype.Service;
+
+/**
+ * 模块配置信息-新闻公告模块
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Service
+public class ModuleConfigImpl implements ModuleConfig {
+    @Override
+    public String getName() {
+        return "news";
+    }
+}
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml
new file mode 100644
index 000000000..03d86c1cc
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml
@@ -0,0 +1,65 @@
+server:
+  port: @server.port@
+  servlet:
+    context-path: /news
+
+spring:
+  application:
+    name: epdc-news-server
+  # 环境 dev|test|prod
+  profiles:
+    active: @spring.profiles.active@
+  messages:
+    encoding: UTF-8
+    basename: i18n/messages,i18n/messages_common
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+  redis:
+    database: 0
+    host: @spring.redis.host@
+    timeout: 30s
+    port: @spring.redis.port@
+    password: @spring.redis.password@
+  cloud:
+    nacos:
+      discovery:
+        server-addr: @nacos.server-addr@
+        register-enabled: @nacos.register-enabled@
+  datasource:
+    druid:
+      driver-class-name: com.mysql.jdbc.Driver
+      url: @spring.datasource.druid.url@
+      username: @spring.datasource.druid.username@
+      password: @spring.datasource.druid.password@
+
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+  endpoint:
+    health:
+      show-details: ALWAYS
+
+mybatis-plus:
+  mapper-locations: classpath:/mapper/**/*.xml
+  #实体扫描，多个package用逗号或者分号分隔
+  typeAliasesPackage: io.renren.entity;com.elink.esua.epdc.entity
+  global-config:
+    #数据库相关配置
+    db-config:
+      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
+      id-type: ID_WORKER
+      #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
+      field-strategy: NOT_NULL
+      #驼峰下划线转换
+      column-underline: true
+    banner: false
+  #原生配置
+  configuration:
+    map-underscore-to-camel-case: true
+    cache-enabled: false
+    call-setters-on-nulls: true
+    jdbc-type-for-null: 'null'
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/i18n/messages.properties b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/i18n/messages.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/i18n/messages_en_US.properties b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/i18n/messages_en_US.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/i18n/messages_zh_CN.properties b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/i18n/messages_zh_CN.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/i18n/messages_zh_TW.properties b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/i18n/messages_zh_TW.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/i18n/validation.properties b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/i18n/validation.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/i18n/validation_en_US.properties b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/i18n/validation_en_US.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/i18n/validation_zh_CN.properties b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/i18n/validation_zh_CN.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/i18n/validation_zh_TW.properties b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/i18n/validation_zh_TW.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/logback-spring.xml
new file mode 100644
index 000000000..999a92997
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/logback-spring.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+
+    <property name="log.path" value="logs/news"/>
+
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+
+    <!--1. 输出到控制台-->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>debug</level>
+        </filter>
+        <encoder>
+            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+            <!-- 设置字符集 -->
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!--2. 输出到文档-->
+    <!-- 2.1 level为 DEBUG 日志，时间滚动输出  -->
+    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/debug.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志归档 -->
+            <fileNamePattern>${log.path}/debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录debug级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>debug</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.2 level为 INFO 日志，时间滚动输出  -->
+    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/info.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 每天日志归档路径以及格式 -->
+            <fileNamePattern>${log.path}/info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.3 level为 WARN 日志，时间滚动输出  -->
+    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/warn.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录warn级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>warn</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.4 level为 ERROR 日志，时间滚动输出  -->
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/error.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录ERROR级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 开发、测试环境 -->
+    <springProfile name="dev,test">
+        <logger name="org.springframework.web" level="INFO"/>
+        <logger name="org.springboot.sample" level="INFO"/>
+        <logger name="com.elink.esua.epdc" level="INFO"/>
+        <logger name="com.elink.esua.epdc.dao" level="DEBUG"/>
+        <root level="INFO">
+            <appender-ref ref="DEBUG_FILE"/>
+            <appender-ref ref="INFO_FILE"/>
+            <appender-ref ref="WARN_FILE"/>
+            <appender-ref ref="ERROR_FILE"/>
+        </root>
+    </springProfile>
+
+    <!-- 生产环境 -->
+    <springProfile name="prod">
+        <logger name="org.springframework.web" level="ERROR"/>
+        <logger name="org.springboot.sample" level="ERROR"/>
+        <logger name="com.elink.esua.epdc" level="ERROR"/>
+        <root level="ERROR">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="DEBUG_FILE"/>
+            <appender-ref ref="INFO_FILE"/>
+            <appender-ref ref="WARN_FILE"/>
+            <appender-ref ref="ERROR_FILE"/>
+        </root>
+    </springProfile>
+
+</configuration>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ScheduleJobDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ScheduleJobDao.xml
new file mode 100644
index 000000000..57cb6edb5
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ScheduleJobDao.xml
@@ -0,0 +1,14 @@
+<?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="com.elink.esua.epdc.dao.ScheduleJobDao">
+
+	<!-- 批量更新状态 -->
+	<update id="updateBatch">
+		update schedule_job set status = #{status} where id in
+		<foreach item="id" collection="ids"  open="(" separator="," close=")">
+			#{id}
+		</foreach>
+	</update>
+
+</mapper>
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ScheduleJobLogDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ScheduleJobLogDao.xml
new file mode 100644
index 000000000..3683f2ca4
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ScheduleJobLogDao.xml
@@ -0,0 +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="com.elink.esua.epdc.dao.ScheduleJobLogDao">
+
+
+</mapper>
diff --git a/esua-epdc/epdc-module/epdc-news/pom.xml b/esua-epdc/epdc-module/epdc-news/pom.xml
new file mode 100644
index 000000000..3bcdefc2c
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-news/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epdc-module</artifactId>
+        <groupId>com.esua.epdc</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>epdc-news</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>epdc-news-client</module>
+        <module>epdc-news-server</module>
+    </modules>
+
+
+</project>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
index d42a9ea86..64cf3c844 100644
--- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
@@ -50,8 +50,8 @@
             <artifactId>spring-context-support</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
         <dependency>
             <groupId>de.codecentric</groupId>
@@ -112,4 +112,74 @@
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <spring.profiles.active>dev</spring.profiles.active>
+
+                <server.port>9065</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>test</id>
+            <properties>
+                <spring.profiles.active>test</spring.profiles.active>
+
+                <server.port>9065</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>prod</id>
+            <properties>
+                <spring.profiles.active>prod</spring.profiles.active>
+
+                <server.port>9065</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+    </profiles>
 </project>
diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml
index f14a31435..6a844d52a 100644
--- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8083
+  port: @server.port@
   servlet:
     context-path: /oss
 
@@ -8,7 +8,7 @@ spring:
     name: epdc-oss-server
   # 环境 dev|test|prod
   profiles:
-    active: dev
+    active: @spring.profiles.active@
   messages:
     encoding: UTF-8
     basename: i18n/messages,i18n/messages_common
@@ -22,31 +22,21 @@ spring:
       enabled: true
   redis:
     database: 0
-    host: redis
+    host: @spring.redis.host@
     timeout: 30s
-    port: 6379
-    password: 123456
+    port: @spring.redis.port@
+    password: @spring.redis.password@
+  cloud:
+    nacos:
+      discovery:
+        server-addr: @nacos.server-addr@
+        register-enabled: @nacos.register-enabled@
   datasource:
     druid:
       driver-class-name: com.mysql.jdbc.Driver
-      url: jdbc:mysql://localhost:3306/renren_cloud?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
-      username: renren
-      password: 123456
-      #Oracle
-#      driver-class-name: oracle.jdbc.OracleDriver
-#      url: jdbc:oracle:thin:@localhost:1521:xe
-#      username: renren_cloud
-#      password: 123456
-      #SQLServer
-#      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#      url: jdbc:sqlserver://localhost:1433;DatabaseName=renren_cloud
-#      username: sa
-#      password: 123456
-      #postgresql
-#      driver-class-name: org.postgresql.Driver
-#      url: jdbc:postgresql://localhost:5432/renren_cloud
-#      username: postgres
-#      password: 123456
+      url: @spring.datasource.druid.url@
+      username: @spring.datasource.druid.username@
+      password: @spring.datasource.druid.password@
 
 fdfs:
   so-timeout: 600000
@@ -63,18 +53,6 @@ management:
     health:
       show-details: ALWAYS
 
-eureka:
-  instance:
-    prefer-ip-address: true
-    instance-id: ${spring.cloud.client.ip-address}:${server.port}
-    metadata-map:
-      management:
-        context-path: ${server.servlet.context-path}/actuator
-    health-check-url-path: ${server.servlet.context-path}/actuator/health
-    status-page-url-path: ${server.servlet.context-path}/actuator/info
-  client:
-    service-url:
-      defaultZone: http://eureka:8761/eureka/
 
 mybatis-plus:
   mapper-locations: classpath:/mapper/**/*.xml
diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-client/pom.xml b/esua-epdc/epdc-module/epdc-party/epdc-party-client/pom.xml
new file mode 100644
index 000000000..75c2202d2
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-party/epdc-party-client/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epdc-party</artifactId>
+        <groupId>com.esua.epdc</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>epdc-party-client</artifactId>
+    <packaging>jar</packaging>
+
+
+</project>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep b/esua-epdc/epdc-module/epdc-party/epdc-party-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/pom.xml b/esua-epdc/epdc-module/epdc-party/epdc-party-server/pom.xml
new file mode 100644
index 000000000..675bcee63
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-party/epdc-party-server/pom.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epdc-party</artifactId>
+        <groupId>com.esua.epdc</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>epdc-party-server</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-party-client</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-commons-tools</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-commons-mybatis</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-client</artifactId>
+            <version>${spring.boot.admin.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <spring.profiles.active>dev</spring.profiles.active>
+
+                <server.port>9066</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>test</id>
+            <properties>
+                <spring.profiles.active>test</spring.profiles.active>
+
+                <server.port>9066</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>prod</id>
+            <properties>
+                <spring.profiles.active>prod</spring.profiles.active>
+
+                <server.port>9066</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+    </profiles>
+
+</project>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/java/com/elink/esua/epdc/PartyApplication.java b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/java/com/elink/esua/epdc/PartyApplication.java
new file mode 100644
index 000000000..a44f0107d
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/java/com/elink/esua/epdc/PartyApplication.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+/**
+ * 党群议事模块
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.1.0
+ */
+@SpringBootApplication
+@EnableDiscoveryClient
+@EnableFeignClients
+public class PartyApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(PartyApplication.class, args);
+    }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
new file mode 100644
index 000000000..5cac77f6e
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.config;
+
+import com.elink.esua.epdc.commons.tools.config.ModuleConfig;
+import org.springframework.stereotype.Service;
+
+/**
+ * 模块配置信息-党群议事模块
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Service
+public class ModuleConfigImpl implements ModuleConfig {
+    @Override
+    public String getName() {
+        return "party";
+    }
+}
diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/application.yml
new file mode 100644
index 000000000..2d2b41f22
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/application.yml
@@ -0,0 +1,65 @@
+server:
+  port: @server.port@
+  servlet:
+    context-path: /party
+
+spring:
+  application:
+    name: epdc-party-server
+  # 环境 dev|test|prod
+  profiles:
+    active: @spring.profiles.active@
+  messages:
+    encoding: UTF-8
+    basename: i18n/messages,i18n/messages_common
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+  redis:
+    database: 0
+    host: @spring.redis.host@
+    timeout: 30s
+    port: @spring.redis.port@
+    password: @spring.redis.password@
+  cloud:
+    nacos:
+      discovery:
+        server-addr: @nacos.server-addr@
+        register-enabled: @nacos.register-enabled@
+  datasource:
+    druid:
+      driver-class-name: com.mysql.jdbc.Driver
+      url: @spring.datasource.druid.url@
+      username: @spring.datasource.druid.username@
+      password: @spring.datasource.druid.password@
+
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+  endpoint:
+    health:
+      show-details: ALWAYS
+
+mybatis-plus:
+  mapper-locations: classpath:/mapper/**/*.xml
+  #实体扫描，多个package用逗号或者分号分隔
+  typeAliasesPackage: io.renren.entity;com.elink.esua.epdc.entity
+  global-config:
+    #数据库相关配置
+    db-config:
+      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
+      id-type: ID_WORKER
+      #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
+      field-strategy: NOT_NULL
+      #驼峰下划线转换
+      column-underline: true
+    banner: false
+  #原生配置
+  configuration:
+    map-underscore-to-camel-case: true
+    cache-enabled: false
+    call-setters-on-nulls: true
+    jdbc-type-for-null: 'null'
diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/messages.properties b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/messages.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/messages_en_US.properties b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/messages_en_US.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/messages_zh_CN.properties b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/messages_zh_CN.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/messages_zh_TW.properties b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/messages_zh_TW.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/validation.properties b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/validation.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/validation_en_US.properties b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/validation_en_US.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/validation_zh_CN.properties b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/validation_zh_CN.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/validation_zh_TW.properties b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/validation_zh_TW.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/logback-spring.xml
new file mode 100644
index 000000000..712dc98d5
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/logback-spring.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+
+    <property name="log.path" value="logs/party"/>
+
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+
+    <!--1. 输出到控制台-->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>debug</level>
+        </filter>
+        <encoder>
+            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+            <!-- 设置字符集 -->
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!--2. 输出到文档-->
+    <!-- 2.1 level为 DEBUG 日志，时间滚动输出  -->
+    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/debug.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志归档 -->
+            <fileNamePattern>${log.path}/debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录debug级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>debug</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.2 level为 INFO 日志，时间滚动输出  -->
+    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/info.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 每天日志归档路径以及格式 -->
+            <fileNamePattern>${log.path}/info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.3 level为 WARN 日志，时间滚动输出  -->
+    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/warn.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录warn级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>warn</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.4 level为 ERROR 日志，时间滚动输出  -->
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/error.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录ERROR级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 开发、测试环境 -->
+    <springProfile name="dev,test">
+        <logger name="org.springframework.web" level="INFO"/>
+        <logger name="org.springboot.sample" level="INFO"/>
+        <logger name="com.elink.esua.epdc" level="INFO"/>
+        <logger name="com.elink.esua.epdc.dao" level="DEBUG"/>
+        <root level="INFO">
+            <appender-ref ref="DEBUG_FILE"/>
+            <appender-ref ref="INFO_FILE"/>
+            <appender-ref ref="WARN_FILE"/>
+            <appender-ref ref="ERROR_FILE"/>
+        </root>
+    </springProfile>
+
+    <!-- 生产环境 -->
+    <springProfile name="prod">
+        <logger name="org.springframework.web" level="ERROR"/>
+        <logger name="org.springboot.sample" level="ERROR"/>
+        <logger name="com.elink.esua.epdc" level="ERROR"/>
+        <root level="ERROR">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="DEBUG_FILE"/>
+            <appender-ref ref="INFO_FILE"/>
+            <appender-ref ref="WARN_FILE"/>
+            <appender-ref ref="ERROR_FILE"/>
+        </root>
+    </springProfile>
+
+</configuration>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/mapper/ScheduleJobDao.xml b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/mapper/ScheduleJobDao.xml
new file mode 100644
index 000000000..57cb6edb5
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/mapper/ScheduleJobDao.xml
@@ -0,0 +1,14 @@
+<?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="com.elink.esua.epdc.dao.ScheduleJobDao">
+
+	<!-- 批量更新状态 -->
+	<update id="updateBatch">
+		update schedule_job set status = #{status} where id in
+		<foreach item="id" collection="ids"  open="(" separator="," close=")">
+			#{id}
+		</foreach>
+	</update>
+
+</mapper>
diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/mapper/ScheduleJobLogDao.xml b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/mapper/ScheduleJobLogDao.xml
new file mode 100644
index 000000000..3683f2ca4
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/mapper/ScheduleJobLogDao.xml
@@ -0,0 +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="com.elink.esua.epdc.dao.ScheduleJobLogDao">
+
+
+</mapper>
diff --git a/esua-epdc/epdc-module/epdc-party/pom.xml b/esua-epdc/epdc-module/epdc-party/pom.xml
new file mode 100644
index 000000000..f3afc5e75
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-party/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epdc-module</artifactId>
+        <groupId>com.esua.epdc</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>epdc-party</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>epdc-party-client</module>
+        <module>epdc-party-server</module>
+    </modules>
+
+
+</project>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-client/pom.xml b/esua-epdc/epdc-module/epdc-services/epdc-services-client/pom.xml
new file mode 100644
index 000000000..c0c4838b5
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-services/epdc-services-client/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epdc-services</artifactId>
+        <groupId>com.esua.epdc</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>epdc-services-client</artifactId>
+    <packaging>jar</packaging>
+
+
+</project>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep b/esua-epdc/epdc-module/epdc-services/epdc-services-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/pom.xml b/esua-epdc/epdc-module/epdc-services/epdc-services-server/pom.xml
new file mode 100644
index 000000000..74dbcd9ce
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-services/epdc-services-server/pom.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epdc-services</artifactId>
+        <groupId>com.esua.epdc</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>epdc-services-server</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-news-client</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-commons-tools</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-commons-mybatis</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-client</artifactId>
+            <version>${spring.boot.admin.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <spring.profiles.active>dev</spring.profiles.active>
+
+                <server.port>9067</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>test</id>
+            <properties>
+                <spring.profiles.active>test</spring.profiles.active>
+
+                <server.port>9067</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>prod</id>
+            <properties>
+                <spring.profiles.active>prod</spring.profiles.active>
+
+                <server.port>9067</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+    </profiles>
+
+</project>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/java/com/elink/esua/epdc/ServicesApplication.java b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/java/com/elink/esua/epdc/ServicesApplication.java
new file mode 100644
index 000000000..e537e7186
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/java/com/elink/esua/epdc/ServicesApplication.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+/**
+ * 生活服务模块
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.1.0
+ */
+@SpringBootApplication
+@EnableDiscoveryClient
+@EnableFeignClients
+public class ServicesApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(ServicesApplication.class, args);
+    }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
new file mode 100644
index 000000000..49fb6002f
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.config;
+
+import com.elink.esua.epdc.commons.tools.config.ModuleConfig;
+import org.springframework.stereotype.Service;
+
+/**
+ * 模块配置信息-生活服务模块
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Service
+public class ModuleConfigImpl implements ModuleConfig {
+    @Override
+    public String getName() {
+        return "services";
+    }
+}
diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/application.yml
new file mode 100644
index 000000000..82e71dcf4
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/application.yml
@@ -0,0 +1,65 @@
+server:
+  port: @server.port@
+  servlet:
+    context-path: /services
+
+spring:
+  application:
+    name: epdc-services-server
+  # 环境 dev|test|prod
+  profiles:
+    active: @spring.profiles.active@
+  messages:
+    encoding: UTF-8
+    basename: i18n/messages,i18n/messages_common
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+  redis:
+    database: 0
+    host: @spring.redis.host@
+    timeout: 30s
+    port: @spring.redis.port@
+    password: @spring.redis.password@
+  cloud:
+    nacos:
+      discovery:
+        server-addr: @nacos.server-addr@
+        register-enabled: @nacos.register-enabled@
+  datasource:
+    druid:
+      driver-class-name: com.mysql.jdbc.Driver
+      url: @spring.datasource.druid.url@
+      username: @spring.datasource.druid.username@
+      password: @spring.datasource.druid.password@
+
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+  endpoint:
+    health:
+      show-details: ALWAYS
+
+mybatis-plus:
+  mapper-locations: classpath:/mapper/**/*.xml
+  #实体扫描，多个package用逗号或者分号分隔
+  typeAliasesPackage: io.renren.entity;com.elink.esua.epdc.entity
+  global-config:
+    #数据库相关配置
+    db-config:
+      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
+      id-type: ID_WORKER
+      #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
+      field-strategy: NOT_NULL
+      #驼峰下划线转换
+      column-underline: true
+    banner: false
+  #原生配置
+  configuration:
+    map-underscore-to-camel-case: true
+    cache-enabled: false
+    call-setters-on-nulls: true
+    jdbc-type-for-null: 'null'
diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/i18n/messages.properties b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/i18n/messages.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/i18n/messages_en_US.properties b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/i18n/messages_en_US.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/i18n/messages_zh_CN.properties b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/i18n/messages_zh_CN.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/i18n/messages_zh_TW.properties b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/i18n/messages_zh_TW.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/i18n/validation.properties b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/i18n/validation.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/i18n/validation_en_US.properties b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/i18n/validation_en_US.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/i18n/validation_zh_CN.properties b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/i18n/validation_zh_CN.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/i18n/validation_zh_TW.properties b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/i18n/validation_zh_TW.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/logback-spring.xml
new file mode 100644
index 000000000..df3fe2ae5
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/logback-spring.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+
+    <property name="log.path" value="logs/services"/>
+
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+
+    <!--1. 输出到控制台-->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>debug</level>
+        </filter>
+        <encoder>
+            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+            <!-- 设置字符集 -->
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!--2. 输出到文档-->
+    <!-- 2.1 level为 DEBUG 日志，时间滚动输出  -->
+    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/debug.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志归档 -->
+            <fileNamePattern>${log.path}/debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录debug级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>debug</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.2 level为 INFO 日志，时间滚动输出  -->
+    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/info.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 每天日志归档路径以及格式 -->
+            <fileNamePattern>${log.path}/info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.3 level为 WARN 日志，时间滚动输出  -->
+    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/warn.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录warn级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>warn</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.4 level为 ERROR 日志，时间滚动输出  -->
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/error.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录ERROR级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 开发、测试环境 -->
+    <springProfile name="dev,test">
+        <logger name="org.springframework.web" level="INFO"/>
+        <logger name="org.springboot.sample" level="INFO"/>
+        <logger name="com.elink.esua.epdc" level="INFO"/>
+        <logger name="com.elink.esua.epdc.dao" level="DEBUG"/>
+        <root level="INFO">
+            <appender-ref ref="DEBUG_FILE"/>
+            <appender-ref ref="INFO_FILE"/>
+            <appender-ref ref="WARN_FILE"/>
+            <appender-ref ref="ERROR_FILE"/>
+        </root>
+    </springProfile>
+
+    <!-- 生产环境 -->
+    <springProfile name="prod">
+        <logger name="org.springframework.web" level="ERROR"/>
+        <logger name="org.springboot.sample" level="ERROR"/>
+        <logger name="com.elink.esua.epdc" level="ERROR"/>
+        <root level="ERROR">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="DEBUG_FILE"/>
+            <appender-ref ref="INFO_FILE"/>
+            <appender-ref ref="WARN_FILE"/>
+            <appender-ref ref="ERROR_FILE"/>
+        </root>
+    </springProfile>
+
+</configuration>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/mapper/ScheduleJobDao.xml b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/mapper/ScheduleJobDao.xml
new file mode 100644
index 000000000..57cb6edb5
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/mapper/ScheduleJobDao.xml
@@ -0,0 +1,14 @@
+<?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="com.elink.esua.epdc.dao.ScheduleJobDao">
+
+	<!-- 批量更新状态 -->
+	<update id="updateBatch">
+		update schedule_job set status = #{status} where id in
+		<foreach item="id" collection="ids"  open="(" separator="," close=")">
+			#{id}
+		</foreach>
+	</update>
+
+</mapper>
diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/mapper/ScheduleJobLogDao.xml b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/mapper/ScheduleJobLogDao.xml
new file mode 100644
index 000000000..3683f2ca4
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/mapper/ScheduleJobLogDao.xml
@@ -0,0 +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="com.elink.esua.epdc.dao.ScheduleJobLogDao">
+
+
+</mapper>
diff --git a/esua-epdc/epdc-module/epdc-services/pom.xml b/esua-epdc/epdc-module/epdc-services/pom.xml
new file mode 100644
index 000000000..78d3d8307
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-services/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epdc-module</artifactId>
+        <groupId>com.esua.epdc</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>epdc-services</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>epdc-services-client</module>
+        <module>epdc-services-server</module>
+    </modules>
+
+
+</project>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/pom.xml b/esua-epdc/epdc-module/pom.xml
index 1ab7df974..a3d1775b4 100644
--- a/esua-epdc/epdc-module/pom.xml
+++ b/esua-epdc/epdc-module/pom.xml
@@ -19,6 +19,11 @@
         <module>epdc-message</module>
         <module>epdc-activiti</module>
         <module>epdc-api</module>
+        <module>epdc-heart</module>
+        <module>epdc-news</module>
+        <module>epdc-party</module>
+        <module>epdc-neighbor</module>
+        <module>epdc-services</module>
     </modules>
 
 </project>

From 65f41f7c4a57e19423a47945585ea606fe65adee Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Tue, 20 Aug 2019 10:31:59 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/controller/AuthController.java  |  11 ++
 .../fallback/ResourceFeignClientFallback.java |   3 -
 .../fallback/UserFeignClientFallback.java     |   2 -
 .../elink/esua/epdc/service/AuthService.java  |   3 +
 .../epdc/service/impl/AuthServiceImpl.java    |  27 ++-
 .../service/impl/ResourceServiceImpl.java     |   1 -
 ...kDelFlagEnum.java => EpdcDelFlagEnum.java} |   4 +-
 .../handler/FieldMetaObjectHandler.java       |  98 ++++++++---
 .../commons/tools/annotation/LoginUser.java   |  25 +++
 .../epdc/commons/tools/constant/Constant.java |  16 +-
 .../commons/tools/constant/FieldConstant.java |  33 ++++
 .../tools/constant/ServiceConstant.java       |   4 +
 .../tools/redis/CpUserDetailRedis.java        |  63 +++++++
 .../epdc/commons/tools/redis/RedisKeys.java   |   4 +
 ...oginUserHandlerMethodArgumentResolver.java |  52 ++++++
 .../tools/security/user/CpUserDetail.java     |  42 +++++
 esua-epdc/epdc-gateway/pom.xml                |   4 +
 .../esua/epdc/feign/ResourceFeignClient.java  |  23 ++-
 .../fallback/ResourceFeignClientFallback.java |   8 +-
 .../elink/esua/epdc/filter/AuthFilter.java    |   2 +
 .../filter/CpAuthGatewayFilterFactory.java    | 122 ++++++++++++++
 .../elink/esua/epdc/filter/CpProperty.java    |  22 +++
 .../src/main/resources/application.yml        |  27 ++-
 .../epdc-app/epdc-app-client/pom.xml          |  48 ++++++
 .../java/com/elink/esua/epdc/epdc.gitkeep     |   0
 .../epdc-app/epdc-app-server/pom.xml          | 143 ++++++++++++++++
 .../com/elink/esua/epdc/AppApplication.java   |  31 ++++
 .../esua/epdc/config/ModuleConfigImpl.java    |  26 +++
 .../com/elink/esua/epdc/config/WebConfig.java |  34 ++++
 .../src/main/resources/application.yml        |  65 +++++++
 .../main/resources/i18n/messages.properties   |   0
 .../resources/i18n/messages_en_US.properties  |   0
 .../resources/i18n/messages_zh_CN.properties  |   0
 .../resources/i18n/messages_zh_TW.properties  |   0
 .../main/resources/i18n/validation.properties |   0
 .../i18n/validation_en_US.properties          |   0
 .../i18n/validation_zh_CN.properties          |   0
 .../i18n/validation_zh_TW.properties          |   0
 .../src/main/resources/logback-spring.xml     | 159 ++++++++++++++++++
 .../main/resources/mapper/ScheduleJobDao.xml  |  14 ++
 .../resources/mapper/ScheduleJobLogDao.xml    |   7 +
 esua-epdc/epdc-module/epdc-app/pom.xml        |  20 +++
 .../epdc-services-server/pom.xml              |   2 +-
 esua-epdc/epdc-module/pom.xml                 |   1 +
 44 files changed, 1097 insertions(+), 49 deletions(-)
 rename esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/enums/{ELinkDelFlagEnum.java => EpdcDelFlagEnum.java} (87%)
 create mode 100644 esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/annotation/LoginUser.java
 create mode 100644 esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/FieldConstant.java
 create mode 100644 esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/CpUserDetailRedis.java
 create mode 100644 esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/resolver/LoginUserHandlerMethodArgumentResolver.java
 create mode 100644 esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/user/CpUserDetail.java
 create mode 100644 esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java
 create mode 100644 esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/CpProperty.java
 create mode 100644 esua-epdc/epdc-module/epdc-app/epdc-app-client/pom.xml
 create mode 100644 esua-epdc/epdc-module/epdc-app/epdc-app-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep
 create mode 100644 esua-epdc/epdc-module/epdc-app/epdc-app-server/pom.xml
 create mode 100644 esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/java/com/elink/esua/epdc/AppApplication.java
 create mode 100644 esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
 create mode 100644 esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/java/com/elink/esua/epdc/config/WebConfig.java
 create mode 100644 esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/application.yml
 create mode 100644 esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/i18n/messages.properties
 create mode 100644 esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/i18n/messages_en_US.properties
 create mode 100644 esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/i18n/messages_zh_CN.properties
 create mode 100644 esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/i18n/messages_zh_TW.properties
 create mode 100644 esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/i18n/validation.properties
 create mode 100644 esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/i18n/validation_en_US.properties
 create mode 100644 esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/i18n/validation_zh_CN.properties
 create mode 100644 esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/i18n/validation_zh_TW.properties
 create mode 100644 esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/logback-spring.xml
 create mode 100644 esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/mapper/ScheduleJobDao.xml
 create mode 100644 esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/mapper/ScheduleJobLogDao.xml
 create mode 100644 esua-epdc/epdc-module/epdc-app/pom.xml

diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java
index 88258126d..806c6d7cd 100644
--- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java
+++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java
@@ -10,6 +10,7 @@ package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
+import com.elink.esua.epdc.commons.tools.security.user.CpUserDetail;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
@@ -108,4 +109,14 @@ public class AuthController {
 
         return new Result<UserDetail>().ok(data);
     }
+
+    @GetMapping(value = "getLoginUserInfo")
+    public Result<CpUserDetail> getLoginUserInfo(String token) {
+
+        CpUserDetail cpUserDetail = authService.getLoginUserInfo(token);
+        if (cpUserDetail != null) {
+            return new Result<CpUserDetail>().ok(cpUserDetail);
+        }
+        return new Result<CpUserDetail>().error();
+    }
 }
diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java
index e40236835..88e16e9b8 100644
--- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java
+++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java
@@ -10,8 +10,6 @@ package com.elink.esua.epdc.feign.fallback;
 
 import com.elink.esua.epdc.feign.ResourceFeignClient;
 import com.elink.esua.epdc.commons.tools.security.bo.ResourceBO;
-import com.elink.esua.epdc.feign.ResourceFeignClient;
-import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,7 +20,6 @@ import java.util.List;
  * @author Mark sunlightcs@gmail.com
  * @since 1.0.0
  */
-@Component
 public class ResourceFeignClientFallback implements ResourceFeignClient {
 
     @Override
diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
index 76a676fcd..fa1b1bd5b 100644
--- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
+++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
@@ -11,7 +11,6 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.feign.UserFeignClient;
-import org.springframework.stereotype.Component;
 
 /**
  * 用户接口 Fallback
@@ -19,7 +18,6 @@ import org.springframework.stereotype.Component;
  * @author Mark sunlightcs@gmail.com
  * @since 1.0.0
  */
-@Component
 public class UserFeignClientFallback implements UserFeignClient {
 
     @Override
diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/AuthService.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/AuthService.java
index d4de33d0a..1f500829c 100644
--- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/AuthService.java
+++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/AuthService.java
@@ -8,6 +8,7 @@
 
 package com.elink.esua.epdc.service;
 
+import com.elink.esua.epdc.commons.tools.security.user.CpUserDetail;
 import com.elink.esua.epdc.dto.AuthorizationDTO;
 import com.elink.esua.epdc.dto.LoginDTO;
 
@@ -28,4 +29,6 @@ public interface AuthService {
      * 退出
      */
     void logout(Long userId);
+
+    CpUserDetail getLoginUserInfo(String token);
 }
diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java
index 8dcf3e4d1..cd792001d 100644
--- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java
+++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java
@@ -8,6 +8,8 @@
 
 package com.elink.esua.epdc.service.impl;
 
+import com.elink.esua.epdc.commons.tools.redis.CpUserDetailRedis;
+import com.elink.esua.epdc.commons.tools.security.user.CpUserDetail;
 import com.elink.esua.epdc.enums.UserStatusEnum;
 import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
@@ -25,11 +27,11 @@ import com.elink.esua.epdc.commons.tools.utils.IpUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.AuthorizationDTO;
 import com.elink.esua.epdc.dto.LoginDTO;
-import com.elink.esua.epdc.enums.UserStatusEnum;
 import com.elink.esua.epdc.feign.UserFeignClient;
 import com.elink.esua.epdc.jwt.JwtProperties;
 import com.elink.esua.epdc.jwt.JwtUtils;
 import com.elink.esua.epdc.service.AuthService;
+import io.jsonwebtoken.Claims;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Service;
@@ -50,6 +52,8 @@ public class AuthServiceImpl implements AuthService {
     @Autowired
     private UserDetailRedis userDetailRedis;
     @Autowired
+    private CpUserDetailRedis cpUserDetailRedis;
+    @Autowired
     private LogProducer logProducer;
     @Autowired
     private JwtUtils jwtUtils;
@@ -144,4 +148,25 @@ public class AuthServiceImpl implements AuthService {
         userDetailRedis.logout(userId);
     }
 
+    @Override
+    public CpUserDetail getLoginUserInfo(String token) {
+        //是否过期
+        Claims claims = jwtUtils.getClaimByToken(token);
+        if (claims == null || jwtUtils.isTokenExpired(claims.getExpiration())) {
+            throw new RenException(ErrorCode.UNAUTHORIZED);
+        }
+
+        //获取用户ID
+        String userId = claims.getSubject();
+
+        //查询Redis，如果没数据，则保持用户信息到Redis
+        CpUserDetail cpUserDetail = cpUserDetailRedis.get(userId);
+        if (cpUserDetail != null) {
+            //过期时间
+            long expire = (claims.getExpiration().getTime() - System.currentTimeMillis()) / 1000;
+            cpUserDetailRedis.set(cpUserDetail, expire);
+            return cpUserDetail;
+        }
+        return null;
+    }
 }
diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/ResourceServiceImpl.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/ResourceServiceImpl.java
index 1245b18ce..ff60d36b2 100644
--- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/ResourceServiceImpl.java
+++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/ResourceServiceImpl.java
@@ -20,7 +20,6 @@ import com.elink.esua.epdc.commons.tools.security.enums.ResourceAuthEnum;
 import com.elink.esua.epdc.commons.tools.security.enums.UserKillEnum;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.feign.ResourceFeignClient;
 import com.elink.esua.epdc.feign.UserFeignClient;
 import com.elink.esua.epdc.jwt.JwtUtils;
 import com.elink.esua.epdc.service.ResourceService;
diff --git a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/enums/ELinkDelFlagEnum.java b/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/enums/EpdcDelFlagEnum.java
similarity index 87%
rename from esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/enums/ELinkDelFlagEnum.java
rename to esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/enums/EpdcDelFlagEnum.java
index 7d45663c4..e88c27245 100644
--- a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/enums/ELinkDelFlagEnum.java
+++ b/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/enums/EpdcDelFlagEnum.java
@@ -14,7 +14,7 @@ package com.elink.esua.epdc.commons.mybatis.enums;
  * @author yujintao
  * @date 2019/8/19 10:37
  */
-public enum ELinkDelFlagEnum {
+public enum EpdcDelFlagEnum {
     /**
      * 未删
      */
@@ -26,7 +26,7 @@ public enum ELinkDelFlagEnum {
 
     private String value;
 
-    ELinkDelFlagEnum(String value) {
+    EpdcDelFlagEnum(String value) {
         this.value = value;
     }
 
diff --git a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/handler/FieldMetaObjectHandler.java b/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/handler/FieldMetaObjectHandler.java
index cdeebf750..2e83a40b5 100644
--- a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/handler/FieldMetaObjectHandler.java
+++ b/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/handler/FieldMetaObjectHandler.java
@@ -1,15 +1,22 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- *
+ * <p>
  * https://www.renren.io
- *
+ * <p>
  * 版权所有，侵权必究！
  */
 
 package com.elink.esua.epdc.commons.mybatis.handler;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEntity;
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
 import com.elink.esua.epdc.commons.mybatis.enums.DelFlagEnum;
+import com.elink.esua.epdc.commons.mybatis.enums.EpdcDelFlagEnum;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import org.apache.ibatis.reflection.MetaObject;
@@ -29,39 +36,80 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
     private final static String CREATOR = "creator";
     private final static String UPDATE_DATE = "updateDate";
     private final static String UPDATER = "updater";
-    private final static String DEL_FLAG = "delFlag";
     private final static String DEPT_ID = "deptId";
 
     @Override
     public void insertFill(MetaObject metaObject) {
         UserDetail user = SecurityUser.getUser();
-        if(user == null){
-            return;
-        }
         Date date = new Date();
+        if (metaObject.getOriginalObject() instanceof BaseEpdcEntity) {
+            String userId = user == null ? Constant.APP_USER_FLAG : String.valueOf(user.getId());
+            Long deptId = user == null ? null : user.getDeptId();
+            setFieldValByName(FieldConstant.CREATED_TIME_HUMP, date, metaObject);
+            setFieldValByName(FieldConstant.CREATED_BY_HUMP, userId, metaObject);
+            setFieldValByName(FieldConstant.UPDATED_TIME_HUMP, date, metaObject);
+            setFieldValByName(FieldConstant.UPDATED_BY_HUMP, userId, metaObject);
+            setFieldValByName(FieldConstant.REVISION_HUMP, NumConstant.ZERO, metaObject);
+            //删除标识
+            setFieldValByName(FieldConstant.DEL_FLAG_HUMP, EpdcDelFlagEnum.NORMAL.value(), metaObject);
+            // 数据权限标志
+            setFieldValByName(DEPT_ID, deptId, metaObject);
 
-        //创建者
-        setFieldValByName(CREATOR, user.getId(), metaObject);
-        //创建时间
-        setFieldValByName(CREATE_DATE, date, metaObject);
-
-        //创建者所属部门
-        setFieldValByName(DEPT_ID, user.getDeptId(), metaObject);
-
-        //更新者
-        setFieldValByName(UPDATER, user.getId(), metaObject);
-        //更新时间
-        setFieldValByName(UPDATE_DATE, date, metaObject);
-
-        //删除标识
-        setFieldValByName(DEL_FLAG, DelFlagEnum.NORMAL.value(), metaObject);
+        } else {
+            if (user == null) {
+                return;
+            }
+            //创建者
+            setFieldValByName(CREATOR, user.getId(), metaObject);
+            //创建时间
+            setFieldValByName(CREATE_DATE, date, metaObject);
+            //创建者所属部门
+            if (metaObject.hasGetter(DEPT_ID)) {
+                if (null == metaObject.getValue(DEPT_ID)) {
+                    setFieldValByName(DEPT_ID, user.getDeptId(), metaObject);
+                }
+            }
+            //更新者
+            setFieldValByName(UPDATER, user.getId(), metaObject);
+            //更新时间
+            setFieldValByName(UPDATE_DATE, date, metaObject);
+            //删除标识
+            setFieldValByName(FieldConstant.DEL_FLAG_HUMP, DelFlagEnum.NORMAL.value(), metaObject);
+        }
     }
 
     @Override
     public void updateFill(MetaObject metaObject) {
-        //更新者
-        setFieldValByName(UPDATER, SecurityUser.getUserId(), metaObject);
-        //更新时间
-        setFieldValByName(UPDATE_DATE, new Date(), metaObject);
+
+        Object originalObject = metaObject.getOriginalObject();
+        Long id = SecurityUser.getUserId();
+
+        boolean fillEntity = false;
+        boolean fillEsuaEntity = false;
+        if (originalObject instanceof BaseEntity) {
+            fillEntity = true;
+        } else if (originalObject instanceof BaseEpdcEntity) {
+            fillEsuaEntity = true;
+        } else {
+            if (metaObject.hasGetter(Constants.ENTITY)) {
+                Object et = metaObject.getValue(Constants.ENTITY);
+                if (et instanceof BaseEpdcEntity) {
+                    fillEsuaEntity = true;
+                } else if (et instanceof BaseEntity) {
+                    fillEntity = true;
+                }
+            }
+        }
+        if (fillEntity) {
+            id = null == id ? 0L : id;
+            //更新者
+            setFieldValByName(UPDATER, id, metaObject);
+            //更新时间
+            setFieldValByName(UPDATE_DATE, new Date(), metaObject);
+        } else if (fillEsuaEntity) {
+            String userId = null == id ? Constant.APP_USER_FLAG : String.valueOf(id);
+            setFieldValByName(FieldConstant.UPDATED_BY_HUMP, userId, metaObject);
+            setFieldValByName(FieldConstant.UPDATED_TIME_HUMP, new Date(), metaObject);
+        }
     }
 }
diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/annotation/LoginUser.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/annotation/LoginUser.java
new file mode 100644
index 000000000..ef06ef68d
--- /dev/null
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/annotation/LoginUser.java
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.commons.tools.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 登录用户信息
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+@Target(ElementType.PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface LoginUser {
+
+}
diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/Constant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/Constant.java
index 547016804..c45b047a8 100644
--- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/Constant.java
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/Constant.java
@@ -1,8 +1,8 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- *
+ * <p>
  * https://www.renren.io
- *
+ * <p>
  * 版权所有，侵权必究！
  */
 
@@ -84,4 +84,16 @@ public interface Constant {
      * token header
      */
     String TOKEN_HEADER = "token";
+    /**
+     * authorization header
+     */
+    String AUTHORIZATION_HEADER = "authorization";
+    /**
+     * APP用户标识
+     */
+    String APP_USER_KEY = "appUserId";
+    /**
+     * 移动端用户标识
+     */
+    String APP_USER_FLAG = "APP_USER";
 }
diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/FieldConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/FieldConstant.java
new file mode 100644
index 000000000..fa72296c2
--- /dev/null
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/FieldConstant.java
@@ -0,0 +1,33 @@
+package com.elink.esua.epdc.commons.tools.constant;
+
+
+/**
+ * 常用字段常量
+ *
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/8/20 10:11
+ */
+public interface FieldConstant {
+
+    String ID = "ID";
+    String ID_HUMP = "id";
+
+    String REVISION = "REVISION";
+    String REVISION_HUMP = "revision";
+
+    String CREATED_BY = "CREATED_BY";
+    String CREATED_BY_HUMP = "createdBy";
+
+    String CREATED_TIME = "CREATED_TIME";
+    String CREATED_TIME_HUMP = "createdTime";
+
+    String UPDATED_BY = "UPDATED_BY";
+    String UPDATED_BY_HUMP = "updatedBy";
+
+    String UPDATED_TIME = "UPDATED_TIME";
+    String UPDATED_TIME_HUMP = "updatedTime";
+
+    String DEL_FLAG = "DEL_FLAG";
+    String DEL_FLAG_HUMP = "delFlag";
+}
diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java
index f96e57fd5..dce6e8978 100644
--- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java
@@ -59,4 +59,8 @@ public interface ServiceConstant {
      * 生活服务模块
      */
     String EPDC_SERVICES_SERVER = "epdc-services-server";
+    /**
+     * 移动端接口模块
+     */
+    String EPDC_APP_SERVER = "epdc-app-server";
 }
diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/CpUserDetailRedis.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/CpUserDetailRedis.java
new file mode 100644
index 000000000..6ba73d60b
--- /dev/null
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/CpUserDetailRedis.java
@@ -0,0 +1,63 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.commons.tools.redis;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.map.MapUtil;
+import com.elink.esua.epdc.commons.tools.security.user.CpUserDetail;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * CP用户Redis
+ *
+ * @author rongchao
+ * @since 1.0.0
+ */
+@Component
+public class CpUserDetailRedis {
+
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void set(CpUserDetail user, long expire) {
+        if (user == null) {
+            return;
+        }
+        String key = RedisKeys.getCpUserKey(user.getId());
+        //bean to map
+        Map<String, Object> map = BeanUtil.beanToMap(user, false, true);
+        redisUtils.hMSet(key, map, expire);
+    }
+
+    public CpUserDetail get(String id) {
+        String key = RedisKeys.getCpUserKey(id);
+
+        Map<String, Object> map = redisUtils.hGetAll(key);
+        if (MapUtil.isEmpty(map)) {
+            return null;
+        }
+
+        //map to bean
+        CpUserDetail user = BeanUtil.mapToBean(map, CpUserDetail.class, true);
+
+        return user;
+    }
+
+    /**
+     * 用户退出
+     *
+     * @param id
+     */
+    public void logout(String id) {
+        redisUtils.delete(RedisKeys.getCpUserKey(id));
+    }
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java
index 0568fe833..64682ac20 100644
--- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java
@@ -71,4 +71,8 @@ public class RedisKeys {
     public static String getUserPermissionsKey(Long userId) {
         return MODULE_FLAG + "sys:user:permissions:" + userId;
     }
+
+    public static String getCpUserKey(String id) {
+        return MODULE_FLAG + "sys:security:cpuser:" + id;
+    }
 }
diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/resolver/LoginUserHandlerMethodArgumentResolver.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/resolver/LoginUserHandlerMethodArgumentResolver.java
new file mode 100644
index 000000000..4d12e9e46
--- /dev/null
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/resolver/LoginUserHandlerMethodArgumentResolver.java
@@ -0,0 +1,52 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.commons.tools.resolver;
+
+import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.redis.CpUserDetailRedis;
+import com.elink.esua.epdc.commons.tools.security.user.CpUserDetail;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.MethodParameter;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.support.WebDataBinderFactory;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.method.support.ModelAndViewContainer;
+
+/**
+ * 有@LoginUser注解的方法参数，注入当前登录用户
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+@Component
+public class LoginUserHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver {
+
+    @Autowired
+    private CpUserDetailRedis cpUserDetailRedis;
+
+
+    @Override
+    public boolean supportsParameter(MethodParameter parameter) {
+        return parameter.getParameterType().isAssignableFrom(CpUserDetail.class) && parameter.hasParameterAnnotation(LoginUser.class);
+    }
+
+    @Override
+    public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer container,
+                                  NativeWebRequest request, WebDataBinderFactory factory) throws Exception {
+        //获取用户ID
+        String userId = request.getHeader(Constant.APP_USER_KEY);
+        if (StringUtils.isEmpty(userId)) {
+            return null;
+        }
+        CpUserDetail user = cpUserDetailRedis.get(userId);
+        return user;
+    }
+}
diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/user/CpUserDetail.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/user/CpUserDetail.java
new file mode 100644
index 000000000..0ef01eb33
--- /dev/null
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/security/user/CpUserDetail.java
@@ -0,0 +1,42 @@
+package com.elink.esua.epdc.commons.tools.security.user;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * APP用户详情
+ *
+ * @author rongchao
+ * @Date 19-5-13
+ */
+@Data
+public class CpUserDetail implements Serializable {
+
+    private static final long serialVersionUID = 6172109654041516399L;
+
+    /**
+     * 用户ID
+     */
+    private String id;
+
+    /**
+     * 昵称
+     */
+    private String nickname;
+
+    /**
+     * 真实姓名
+     */
+    private String realName;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 令牌
+     */
+    private String token;
+}
diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml
index c093f5302..c10e0c8bf 100644
--- a/esua-epdc/epdc-gateway/pom.xml
+++ b/esua-epdc/epdc-gateway/pom.xml
@@ -78,6 +78,8 @@
 <!--                <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>-->
                 <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server</gateway.routes.epdc-activiti-server.uri>
                 <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
+                <gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
+<!--                <gateway.routes.epdc-app-server.uri>http://127.0.0.1:9058</gateway.routes.epdc-app-server.uri>-->
                 <gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>
 <!--                <gateway.routes.epdc-heart-server.uri>http://127.0.0.1:9060</gateway.routes.epdc-heart-server.uri>-->
                 <gateway.routes.epdc-job-server.uri>lb://epdc-job-server</gateway.routes.epdc-job-server.uri>
@@ -113,6 +115,7 @@
                 <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
                 <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server</gateway.routes.epdc-activiti-server.uri>
                 <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
+                <gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
                 <gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>
                 <gateway.routes.epdc-job-server.uri>lb://epdc-job-server</gateway.routes.epdc-job-server.uri>
                 <gateway.routes.epdc-message-server.uri>lb://epdc-message-server</gateway.routes.epdc-message-server.uri>
@@ -142,6 +145,7 @@
                 <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
                 <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server</gateway.routes.epdc-activiti-server.uri>
                 <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
+                <gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
                 <gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>
                 <gateway.routes.epdc-job-server.uri>lb://epdc-job-server</gateway.routes.epdc-job-server.uri>
                 <gateway.routes.epdc-message-server.uri>lb://epdc-message-server</gateway.routes.epdc-message-server.uri>
diff --git a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java
index 6b71aa939..68f229806 100644
--- a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java
+++ b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java
@@ -1,19 +1,21 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- *
+ * <p>
  * https://www.renren.io
- *
+ * <p>
  * 版权所有，侵权必究！
  */
 
 package com.elink.esua.epdc.feign;
 
+import com.elink.esua.epdc.commons.tools.security.user.CpUserDetail;
 import com.elink.esua.epdc.feign.fallback.ResourceFeignClientFallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -29,13 +31,24 @@ public interface ResourceFeignClient {
 
     /**
      * 是否有资源访问权限
-     * @param token    token
-     * @param url     资源URL
-     * @param method  请求方式
      *
+     * @param token  token
+     * @param url    资源URL
+     * @param method 请求方式
      * @return 有访问权限，则返回用户信息
      */
     @PostMapping("auth/resource")
     Result<UserDetail> resource(@RequestHeader(HttpHeaders.ACCEPT_LANGUAGE) String language, @RequestParam("token") String token,
                                 @RequestParam("url") String url, @RequestParam("method") String method);
+
+    /**
+     * 获取登录用户信息
+     *
+     * @param token
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.security.user.CpUserDetail>
+     * @author
+     * @date 2019/8/19 17:19
+     */
+    @GetMapping("auth/getLoginUserInfo")
+    Result<CpUserDetail> getLoginUserInfo(@RequestParam("token") String token);
 }
diff --git a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java
index bbd19e192..2f21a1005 100644
--- a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java
+++ b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java
@@ -8,10 +8,10 @@
 
 package com.elink.esua.epdc.feign.fallback;
 
+import com.elink.esua.epdc.commons.tools.security.user.CpUserDetail;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.feign.ResourceFeignClient;
-import org.springframework.stereotype.Component;
 
 /**
  * 资源接口 Fallback
@@ -19,11 +19,15 @@ import org.springframework.stereotype.Component;
  * @author Mark sunlightcs@gmail.com
  * @since 1.0.0
  */
-@Component
 public class ResourceFeignClientFallback implements ResourceFeignClient {
 
     @Override
     public Result<UserDetail> resource(String language, String token, String url, String method) {
         return new Result<UserDetail>().error();
     }
+
+    @Override
+    public Result<CpUserDetail> getLoginUserInfo(String token) {
+        return new Result<CpUserDetail>().error();
+    }
 }
diff --git a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/AuthFilter.java b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/AuthFilter.java
index 25b44ac78..ddc5a2aa4 100644
--- a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/AuthFilter.java
+++ b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/AuthFilter.java
@@ -41,7 +41,9 @@ import java.util.List;
 @Configuration
 @ConfigurationProperties(prefix = "renren")
 public class AuthFilter implements GlobalFilter {
+
     private final AntPathMatcher antPathMatcher = new AntPathMatcher();
+
     @Autowired
     private ResourceFeignClient resourceFeignClient;
     /**
diff --git a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java
new file mode 100644
index 000000000..babf5a4ce
--- /dev/null
+++ b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java
@@ -0,0 +1,122 @@
+
+package com.elink.esua.epdc.filter;
+
+import com.alibaba.fastjson.JSON;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.security.user.CpUserDetail;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.feign.ResourceFeignClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.gateway.filter.GatewayFilter;
+import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory;
+import org.springframework.core.io.buffer.DataBuffer;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.stereotype.Component;
+import org.springframework.util.AntPathMatcher;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * app接口权限过滤器
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Component("CpAuth")
+public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpAuthGatewayFilterFactory.CpAuthConfig> {
+
+    @Autowired
+    private ResourceFeignClient resourceFeignClient;
+
+    @Autowired
+    private CpProperty cpProperty;
+
+    private final AntPathMatcher antPathMatcher = new AntPathMatcher();
+
+    @Override
+    public List<String> shortcutFieldOrder() {
+        return Arrays.asList("enabled");
+    }
+
+    public CpAuthGatewayFilterFactory() {
+        super(CpAuthGatewayFilterFactory.CpAuthConfig.class);
+    }
+
+    @Override
+    public GatewayFilter apply(CpAuthConfig config) {
+        return (exchange, chain) -> {
+            if (!config.isEnabled()) {
+                return chain.filter(exchange);
+            }
+
+            ServerHttpRequest request = exchange.getRequest();
+            String requestUri = request.getPath().pathWithinApplication().value();
+
+            //请求放行，无需验证权限
+            if (!pathMatcher(requestUri)) {
+                return chain.filter(exchange);
+            }
+
+            HttpHeaders headers = request.getHeaders();
+            String token = headers.getFirst(Constant.AUTHORIZATION_HEADER);
+            if (token == null) {
+                token = request.getQueryParams().getFirst(Constant.AUTHORIZATION_HEADER);
+            }
+            Result<CpUserDetail> result = resourceFeignClient.getLoginUserInfo(token);
+            if (!result.success()) {
+                return response(exchange, result);
+            }
+            CpUserDetail user = result.getData();
+            //当前登录用户userId，添加到header中
+            if (user != null) {
+                ServerHttpRequest build = exchange.getRequest().mutate().header(Constant.APP_USER_KEY, user.getId()).build();
+                return chain.filter(exchange.mutate().request(build).build());
+            }
+            return chain.filter(exchange);
+        };
+    }
+
+    private Mono<Void> response(ServerWebExchange exchange, Object object) {
+        String json = JSON.toJSONString(object);
+        DataBuffer buffer = exchange.getResponse().bufferFactory().wrap(json.getBytes(StandardCharsets.UTF_8));
+        exchange.getResponse().getHeaders().setContentType(MediaType.APPLICATION_JSON_UTF8);
+        exchange.getResponse().setStatusCode(HttpStatus.OK);
+        return exchange.getResponse().writeWith(Flux.just(buffer));
+    }
+
+    private boolean pathMatcher(String requestUri) {
+        for (String url : cpProperty.getUrls()) {
+            if (antPathMatcher.match(url, requestUri)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static class CpAuthConfig {
+
+        /**
+         * 控制是否开启认证
+         */
+        private boolean enabled;
+
+        public CpAuthConfig() {
+        }
+
+        public boolean isEnabled() {
+            return enabled;
+        }
+
+        public void setEnabled(boolean enabled) {
+            this.enabled = enabled;
+        }
+    }
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/CpProperty.java b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/CpProperty.java
new file mode 100644
index 000000000..33f7af4ca
--- /dev/null
+++ b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/CpProperty.java
@@ -0,0 +1,22 @@
+package com.elink.esua.epdc.filter;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author rongchao
+ * @Date 19-5-17
+ */
+@Data
+@Component
+@EnableConfigurationProperties
+@ConfigurationProperties(prefix = "epdc")
+public class CpProperty {
+
+    private List<String> urls;
+
+}
diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml
index 496945468..14d6a0e32 100644
--- a/esua-epdc/epdc-gateway/src/main/resources/application.yml
+++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml
@@ -76,7 +76,7 @@ spring:
           uri: @gateway.routes.epdc-heart-server.uri@
           order: 8
           predicates:
-            - Path=/api/**
+            - Path=/heart/**
           filters:
             - StripPrefix=0
         #友邻社群模块
@@ -84,7 +84,7 @@ spring:
           uri: @gateway.routes.epdc-neighbor-server.uri@
           order: 9
           predicates:
-            - Path=/api/**
+            - Path=/neighbor/**
           filters:
             - StripPrefix=0
         #新闻公告模块
@@ -92,7 +92,7 @@ spring:
           uri: @gateway.routes.epdc-news-server.uri@
           order: 10
           predicates:
-            - Path=/api/**
+            - Path=/news/**
           filters:
             - StripPrefix=0
         #党群议事模块
@@ -100,7 +100,7 @@ spring:
           uri: @gateway.routes.epdc-party-server.uri@
           order: 11
           predicates:
-            - Path=/api/**
+            - Path=/party/**
           filters:
             - StripPrefix=0
         #生活服务模块
@@ -108,9 +108,18 @@ spring:
           uri: @gateway.routes.epdc-services-server.uri@
           order: 12
           predicates:
-            - Path=/api/**
+            - Path=/services/**
+          filters:
+            - StripPrefix=0
+        #生活服务模块
+        - id: epdc-app-server
+          uri: @gateway.routes.epdc-app-server.uri@
+          order: 13
+          predicates:
+            - Path=/epdc-app/**
           filters:
             - StripPrefix=0
+            - CpAuth=true
     nacos:
       discovery:
         server-addr: @nacos.server-addr@
@@ -155,3 +164,11 @@ renren:
     - /activiti/modeler.html
     - /activiti/service/**
     - /activiti/editor-app/**
+
+
+
+
+epdc:
+  # 便捷通行接口
+  urls:
+    - /*/epdc-app/**
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-client/pom.xml b/esua-epdc/epdc-module/epdc-app/epdc-app-client/pom.xml
new file mode 100644
index 000000000..5b6fa3045
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-app/epdc-app-client/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epdc-app</artifactId>
+        <groupId>com.esua.epdc</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>epdc-app-client</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-commons-tools</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-heart-client</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-neighbor-client</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-news-client</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-party-client</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-services-client</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep b/esua-epdc/epdc-module/epdc-app/epdc-app-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-server/pom.xml b/esua-epdc/epdc-module/epdc-app/epdc-app-server/pom.xml
new file mode 100644
index 000000000..864ee1c86
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-app/epdc-app-server/pom.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epdc-app</artifactId>
+        <groupId>com.esua.epdc</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>epdc-app-server</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-app-client</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-commons-tools</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-commons-mybatis</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-client</artifactId>
+            <version>${spring.boot.admin.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <spring.profiles.active>dev</spring.profiles.active>
+
+                <server.port>9058</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>test</id>
+            <properties>
+                <spring.profiles.active>test</spring.profiles.active>
+
+                <server.port>9058</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>prod</id>
+            <properties>
+                <spring.profiles.active>prod</spring.profiles.active>
+
+                <server.port>9058</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+    </profiles>
+
+</project>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/java/com/elink/esua/epdc/AppApplication.java b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/java/com/elink/esua/epdc/AppApplication.java
new file mode 100644
index 000000000..5fa453d6b
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/java/com/elink/esua/epdc/AppApplication.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+/**
+ * 移动端接口模块
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.1.0
+ */
+@SpringBootApplication
+@EnableDiscoveryClient
+@EnableFeignClients
+public class AppApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(AppApplication.class, args);
+    }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
new file mode 100644
index 000000000..0a6891524
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.config;
+
+import com.elink.esua.epdc.commons.tools.config.ModuleConfig;
+import org.springframework.stereotype.Service;
+
+/**
+ * 模块配置信息-移动端接口模块
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Service
+public class ModuleConfigImpl implements ModuleConfig {
+    @Override
+    public String getName() {
+        return "app";
+    }
+}
diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/java/com/elink/esua/epdc/config/WebConfig.java b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/java/com/elink/esua/epdc/config/WebConfig.java
new file mode 100644
index 000000000..1ca742ce7
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/java/com/elink/esua/epdc/config/WebConfig.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.config;
+
+import com.elink.esua.epdc.commons.tools.resolver.LoginUserHandlerMethodArgumentResolver;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.util.List;
+
+/**
+ * MVC配置
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+
+    @Autowired
+    private LoginUserHandlerMethodArgumentResolver loginUserHandlerMethodArgumentResolver;
+
+    @Override
+    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
+        argumentResolvers.add(loginUserHandlerMethodArgumentResolver);
+    }
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/application.yml
new file mode 100644
index 000000000..bdb3aa82a
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/application.yml
@@ -0,0 +1,65 @@
+server:
+  port: @server.port@
+  servlet:
+    context-path: /epdc-app
+
+spring:
+  application:
+    name: epdc-app-server
+  # 环境 dev|test|prod
+  profiles:
+    active: @spring.profiles.active@
+  messages:
+    encoding: UTF-8
+    basename: i18n/messages,i18n/messages_common
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+  redis:
+    database: 0
+    host: @spring.redis.host@
+    timeout: 30s
+    port: @spring.redis.port@
+    password: @spring.redis.password@
+  cloud:
+    nacos:
+      discovery:
+        server-addr: @nacos.server-addr@
+        register-enabled: @nacos.register-enabled@
+  datasource:
+    druid:
+      driver-class-name: com.mysql.jdbc.Driver
+      url: @spring.datasource.druid.url@
+      username: @spring.datasource.druid.username@
+      password: @spring.datasource.druid.password@
+
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+  endpoint:
+    health:
+      show-details: ALWAYS
+
+mybatis-plus:
+  mapper-locations: classpath:/mapper/**/*.xml
+  #实体扫描，多个package用逗号或者分号分隔
+  typeAliasesPackage: io.renren.entity;com.elink.esua.epdc.entity
+  global-config:
+    #数据库相关配置
+    db-config:
+      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
+      id-type: ID_WORKER
+      #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
+      field-strategy: NOT_NULL
+      #驼峰下划线转换
+      column-underline: true
+    banner: false
+  #原生配置
+  configuration:
+    map-underscore-to-camel-case: true
+    cache-enabled: false
+    call-setters-on-nulls: true
+    jdbc-type-for-null: 'null'
diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/i18n/messages.properties b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/i18n/messages.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/i18n/messages_en_US.properties b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/i18n/messages_en_US.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/i18n/messages_zh_CN.properties b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/i18n/messages_zh_CN.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/i18n/messages_zh_TW.properties b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/i18n/messages_zh_TW.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/i18n/validation.properties b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/i18n/validation.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/i18n/validation_en_US.properties b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/i18n/validation_en_US.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/i18n/validation_zh_CN.properties b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/i18n/validation_zh_CN.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/i18n/validation_zh_TW.properties b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/i18n/validation_zh_TW.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/logback-spring.xml
new file mode 100644
index 000000000..dd5aa1d15
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/logback-spring.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+
+    <property name="log.path" value="logs/epdc-app"/>
+
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+
+    <!--1. 输出到控制台-->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>debug</level>
+        </filter>
+        <encoder>
+            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+            <!-- 设置字符集 -->
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!--2. 输出到文档-->
+    <!-- 2.1 level为 DEBUG 日志，时间滚动输出  -->
+    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/debug.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志归档 -->
+            <fileNamePattern>${log.path}/debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录debug级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>debug</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.2 level为 INFO 日志，时间滚动输出  -->
+    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/info.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 每天日志归档路径以及格式 -->
+            <fileNamePattern>${log.path}/info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.3 level为 WARN 日志，时间滚动输出  -->
+    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/warn.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录warn级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>warn</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.4 level为 ERROR 日志，时间滚动输出  -->
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/error.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录ERROR级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 开发、测试环境 -->
+    <springProfile name="dev,test">
+        <logger name="org.springframework.web" level="INFO"/>
+        <logger name="org.springboot.sample" level="INFO"/>
+        <logger name="com.elink.esua.epdc" level="INFO"/>
+        <logger name="com.elink.esua.epdc.dao" level="DEBUG"/>
+        <root level="INFO">
+            <appender-ref ref="DEBUG_FILE"/>
+            <appender-ref ref="INFO_FILE"/>
+            <appender-ref ref="WARN_FILE"/>
+            <appender-ref ref="ERROR_FILE"/>
+        </root>
+    </springProfile>
+
+    <!-- 生产环境 -->
+    <springProfile name="prod">
+        <logger name="org.springframework.web" level="ERROR"/>
+        <logger name="org.springboot.sample" level="ERROR"/>
+        <logger name="com.elink.esua.epdc" level="ERROR"/>
+        <root level="ERROR">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="DEBUG_FILE"/>
+            <appender-ref ref="INFO_FILE"/>
+            <appender-ref ref="WARN_FILE"/>
+            <appender-ref ref="ERROR_FILE"/>
+        </root>
+    </springProfile>
+
+</configuration>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/mapper/ScheduleJobDao.xml b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/mapper/ScheduleJobDao.xml
new file mode 100644
index 000000000..57cb6edb5
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/mapper/ScheduleJobDao.xml
@@ -0,0 +1,14 @@
+<?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="com.elink.esua.epdc.dao.ScheduleJobDao">
+
+	<!-- 批量更新状态 -->
+	<update id="updateBatch">
+		update schedule_job set status = #{status} where id in
+		<foreach item="id" collection="ids"  open="(" separator="," close=")">
+			#{id}
+		</foreach>
+	</update>
+
+</mapper>
diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/mapper/ScheduleJobLogDao.xml b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/mapper/ScheduleJobLogDao.xml
new file mode 100644
index 000000000..3683f2ca4
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/mapper/ScheduleJobLogDao.xml
@@ -0,0 +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="com.elink.esua.epdc.dao.ScheduleJobLogDao">
+
+
+</mapper>
diff --git a/esua-epdc/epdc-module/epdc-app/pom.xml b/esua-epdc/epdc-module/epdc-app/pom.xml
new file mode 100644
index 000000000..cc01eb83b
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-app/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epdc-module</artifactId>
+        <groupId>com.esua.epdc</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>epdc-app</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>epdc-app-client</module>
+        <module>epdc-app-server</module>
+    </modules>
+
+
+</project>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/pom.xml b/esua-epdc/epdc-module/epdc-services/epdc-services-server/pom.xml
index 74dbcd9ce..18d36ca66 100644
--- a/esua-epdc/epdc-module/epdc-services/epdc-services-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-services/epdc-services-server/pom.xml
@@ -15,7 +15,7 @@
     <dependencies>
         <dependency>
             <groupId>com.esua.epdc</groupId>
-            <artifactId>epdc-news-client</artifactId>
+            <artifactId>epdc-services-client</artifactId>
             <version>1.0.0</version>
         </dependency>
         <dependency>
diff --git a/esua-epdc/epdc-module/pom.xml b/esua-epdc/epdc-module/pom.xml
index a3d1775b4..d68ea69ef 100644
--- a/esua-epdc/epdc-module/pom.xml
+++ b/esua-epdc/epdc-module/pom.xml
@@ -24,6 +24,7 @@
         <module>epdc-party</module>
         <module>epdc-neighbor</module>
         <module>epdc-services</module>
+        <module>epdc-app</module>
     </modules>
 
 </project>

From 61922ff9bc56a7dae20bda8cff40772adefd180b Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Tue, 20 Aug 2019 10:39:36 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=B8=8A=E6=AC=A1?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/mybatis/handler/FieldMetaObjectHandler.java     | 2 +-
 .../elink/esua/epdc/commons/tools/constant/NumConstant.java | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/handler/FieldMetaObjectHandler.java b/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/handler/FieldMetaObjectHandler.java
index 2e83a40b5..c3b8c6778 100644
--- a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/handler/FieldMetaObjectHandler.java
+++ b/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/handler/FieldMetaObjectHandler.java
@@ -101,7 +101,7 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
             }
         }
         if (fillEntity) {
-            id = null == id ? 0L : id;
+            id = null == id ? NumConstant.ZERO_L : id;
             //更新者
             setFieldValByName(UPDATER, id, metaObject);
             //更新时间
diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java
index fabe6ef55..4880860e0 100644
--- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java
@@ -23,6 +23,12 @@ public interface NumConstant {
     int FIFTY = 50;
     int ONE_HUNDRED = 100;
 
+    long ZERO_L = 0L;
+    long ONE_L = 1L;
+    long TWO_L = 2L;
+    long THREE_L = 3L;
+    long FOUR_L = 4L;
+
     String ZERO_STR = "0";
     String ONE_STR = "1";
     String TWO_STR = "2";

From caad79044a7fe17e474bba21e1c5035e596e191e Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Tue, 20 Aug 2019 14:16:25 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=9B=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF=EF=BC=9B=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fallback/ResourceFeignClientFallback.java |   2 +
 .../fallback/UserFeignClientFallback.java     |   2 +
 .../handler/FieldMetaObjectHandler.java       |   7 +-
 .../tools/constant/ServiceConstant.java       |   4 +
 esua-epdc/epdc-gateway/pom.xml                |   5 +
 .../fallback/ResourceFeignClientFallback.java |   2 +
 .../src/main/resources/application.yml        |  10 +-
 .../epdc-app/epdc-app-client/pom.xml          |   5 +
 .../main/resources/mapper/ScheduleJobDao.xml  |  14 --
 .../resources/mapper/ScheduleJobLogDao.xml    |   7 -
 .../main/resources/mapper/ScheduleJobDao.xml  |  14 --
 .../resources/mapper/ScheduleJobLogDao.xml    |   7 -
 .../main/resources/mapper/ScheduleJobDao.xml  |  14 --
 .../resources/mapper/ScheduleJobLogDao.xml    |   7 -
 .../main/resources/mapper/ScheduleJobDao.xml  |  14 --
 .../resources/mapper/ScheduleJobLogDao.xml    |   7 -
 .../main/resources/mapper/ScheduleJobDao.xml  |  14 --
 .../resources/mapper/ScheduleJobLogDao.xml    |   7 -
 .../main/resources/mapper/ScheduleJobDao.xml  |  14 --
 .../resources/mapper/ScheduleJobLogDao.xml    |   7 -
 .../epdc-user/epdc-user-client/pom.xml        |  15 ++
 .../java/com/elink/esua/epdc/epdc.gitkeep     |   0
 .../epdc-user/epdc-user-server/pom.xml        | 143 ++++++++++++++++
 .../com/elink/esua/epdc/UserApplication.java  |  31 ++++
 .../esua/epdc/config/ModuleConfigImpl.java    |  26 +++
 .../src/main/resources/application.yml        |  65 +++++++
 .../main/resources/i18n/messages.properties   |   0
 .../resources/i18n/messages_en_US.properties  |   0
 .../resources/i18n/messages_zh_CN.properties  |   0
 .../resources/i18n/messages_zh_TW.properties  |   0
 .../main/resources/i18n/validation.properties |   0
 .../i18n/validation_en_US.properties          |   0
 .../i18n/validation_zh_CN.properties          |   0
 .../i18n/validation_zh_TW.properties          |   0
 .../src/main/resources/logback-spring.xml     | 159 ++++++++++++++++++
 esua-epdc/epdc-module/epdc-user/pom.xml       |  20 +++
 esua-epdc/epdc-module/pom.xml                 |   1 +
 37 files changed, 490 insertions(+), 133 deletions(-)
 delete mode 100644 esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/mapper/ScheduleJobDao.xml
 delete mode 100644 esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/mapper/ScheduleJobLogDao.xml
 delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/ScheduleJobDao.xml
 delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/ScheduleJobLogDao.xml
 delete mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/mapper/ScheduleJobDao.xml
 delete mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/mapper/ScheduleJobLogDao.xml
 delete mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ScheduleJobDao.xml
 delete mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ScheduleJobLogDao.xml
 delete mode 100644 esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/mapper/ScheduleJobDao.xml
 delete mode 100644 esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/mapper/ScheduleJobLogDao.xml
 delete mode 100644 esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/mapper/ScheduleJobDao.xml
 delete mode 100644 esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/mapper/ScheduleJobLogDao.xml
 create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/pom.xml
 create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep
 create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
 create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/UserApplication.java
 create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
 create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml
 create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages.properties
 create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages_en_US.properties
 create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages_zh_CN.properties
 create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages_zh_TW.properties
 create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/validation.properties
 create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/validation_en_US.properties
 create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/validation_zh_CN.properties
 create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/validation_zh_TW.properties
 create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/logback-spring.xml
 create mode 100644 esua-epdc/epdc-module/epdc-user/pom.xml

diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java
index 88e16e9b8..8dd54177d 100644
--- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java
+++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java
@@ -10,6 +10,7 @@ package com.elink.esua.epdc.feign.fallback;
 
 import com.elink.esua.epdc.feign.ResourceFeignClient;
 import com.elink.esua.epdc.commons.tools.security.bo.ResourceBO;
+import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,6 +21,7 @@ import java.util.List;
  * @author Mark sunlightcs@gmail.com
  * @since 1.0.0
  */
+@Component
 public class ResourceFeignClientFallback implements ResourceFeignClient {
 
     @Override
diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
index fa1b1bd5b..76a676fcd 100644
--- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
+++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
@@ -11,6 +11,7 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.feign.UserFeignClient;
+import org.springframework.stereotype.Component;
 
 /**
  * 用户接口 Fallback
@@ -18,6 +19,7 @@ import com.elink.esua.epdc.feign.UserFeignClient;
  * @author Mark sunlightcs@gmail.com
  * @since 1.0.0
  */
+@Component
 public class UserFeignClientFallback implements UserFeignClient {
 
     @Override
diff --git a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/handler/FieldMetaObjectHandler.java b/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/handler/FieldMetaObjectHandler.java
index c3b8c6778..fd54e898c 100644
--- a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/handler/FieldMetaObjectHandler.java
+++ b/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/handler/FieldMetaObjectHandler.java
@@ -54,7 +54,6 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
             setFieldValByName(FieldConstant.DEL_FLAG_HUMP, EpdcDelFlagEnum.NORMAL.value(), metaObject);
             // 数据权限标志
             setFieldValByName(DEPT_ID, deptId, metaObject);
-
         } else {
             if (user == null) {
                 return;
@@ -64,11 +63,7 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
             //创建时间
             setFieldValByName(CREATE_DATE, date, metaObject);
             //创建者所属部门
-            if (metaObject.hasGetter(DEPT_ID)) {
-                if (null == metaObject.getValue(DEPT_ID)) {
-                    setFieldValByName(DEPT_ID, user.getDeptId(), metaObject);
-                }
-            }
+            setInsertFieldValByName(DEPT_ID, user.getDeptId(), metaObject);
             //更新者
             setFieldValByName(UPDATER, user.getId(), metaObject);
             //更新时间
diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java
index dce6e8978..8665147ae 100644
--- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java
@@ -63,4 +63,8 @@ public interface ServiceConstant {
      * 移动端接口模块
      */
     String EPDC_APP_SERVER = "epdc-app-server";
+    /**
+     * APP用户模块
+     */
+    String EPDC_USER_SERVER = "epdc-user-server";
 }
diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml
index c10e0c8bf..0c9e9c81c 100644
--- a/esua-epdc/epdc-gateway/pom.xml
+++ b/esua-epdc/epdc-gateway/pom.xml
@@ -74,6 +74,7 @@
 
                 <!-- gateway routes -->
                 <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
+<!--                <gateway.routes.epdc-auth-server.uri>http://127.0.0.1:9091</gateway.routes.epdc-auth-server.uri>-->
                 <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
 <!--                <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>-->
                 <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server</gateway.routes.epdc-activiti-server.uri>
@@ -94,6 +95,8 @@
 <!--                <gateway.routes.epdc-party-server.uri>http://127.0.0.1:9066</gateway.routes.epdc-party-server.uri>-->
                 <gateway.routes.epdc-services-server.uri>lb://epdc-services-server</gateway.routes.epdc-services-server.uri>
 <!--                <gateway.routes.epdc-services-server.uri>http://127.0.0.1:9067</gateway.routes.epdc-services-server.uri>-->
+                <gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>
+<!--                <gateway.routes.epdc-user-server.uri>http://127.0.0.1:9068</gateway.routes.epdc-user-server.uri>-->
 
                 <!-- nacos -->
                 <nacos.register-enabled>false</nacos.register-enabled>
@@ -124,6 +127,7 @@
                 <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
                 <gateway.routes.epdc-party-server.uri>lb://epdc-party-server</gateway.routes.epdc-party-server.uri>
                 <gateway.routes.epdc-services-server.uri>lb://epdc-services-server</gateway.routes.epdc-services-server.uri>
+                <gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>
 
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
@@ -154,6 +158,7 @@
                 <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
                 <gateway.routes.epdc-party-server.uri>lb://epdc-party-server</gateway.routes.epdc-party-server.uri>
                 <gateway.routes.epdc-services-server.uri>lb://epdc-services-server</gateway.routes.epdc-services-server.uri>
+                <gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>
 
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
diff --git a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java
index 2f21a1005..da14350a3 100644
--- a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java
+++ b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java
@@ -12,6 +12,7 @@ import com.elink.esua.epdc.commons.tools.security.user.CpUserDetail;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.feign.ResourceFeignClient;
+import org.springframework.stereotype.Component;
 
 /**
  * 资源接口 Fallback
@@ -19,6 +20,7 @@ import com.elink.esua.epdc.feign.ResourceFeignClient;
  * @author Mark sunlightcs@gmail.com
  * @since 1.0.0
  */
+@Component
 public class ResourceFeignClientFallback implements ResourceFeignClient {
 
     @Override
diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml
index 14d6a0e32..ac8e81c47 100644
--- a/esua-epdc/epdc-gateway/src/main/resources/application.yml
+++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml
@@ -111,7 +111,7 @@ spring:
             - Path=/services/**
           filters:
             - StripPrefix=0
-        #生活服务模块
+        #移动端接口模块
         - id: epdc-app-server
           uri: @gateway.routes.epdc-app-server.uri@
           order: 13
@@ -120,6 +120,14 @@ spring:
           filters:
             - StripPrefix=0
             - CpAuth=true
+        #APP用户模块
+        - id: epdc-user-server
+          uri: @gateway.routes.epdc-user-server.uri@
+          order: 13
+          predicates:
+            - Path=/app-user/**
+          filters:
+            - StripPrefix=0
     nacos:
       discovery:
         server-addr: @nacos.server-addr@
diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-client/pom.xml b/esua-epdc/epdc-module/epdc-app/epdc-app-client/pom.xml
index 5b6fa3045..22167de71 100644
--- a/esua-epdc/epdc-module/epdc-app/epdc-app-client/pom.xml
+++ b/esua-epdc/epdc-module/epdc-app/epdc-app-client/pom.xml
@@ -43,6 +43,11 @@
             <artifactId>epdc-services-client</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-user-client</artifactId>
+            <version>1.0.0</version>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/mapper/ScheduleJobDao.xml b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/mapper/ScheduleJobDao.xml
deleted file mode 100644
index 57cb6edb5..000000000
--- a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/mapper/ScheduleJobDao.xml
+++ /dev/null
@@ -1,14 +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="com.elink.esua.epdc.dao.ScheduleJobDao">
-
-	<!-- 批量更新状态 -->
-	<update id="updateBatch">
-		update schedule_job set status = #{status} where id in
-		<foreach item="id" collection="ids"  open="(" separator="," close=")">
-			#{id}
-		</foreach>
-	</update>
-
-</mapper>
diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/mapper/ScheduleJobLogDao.xml b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/mapper/ScheduleJobLogDao.xml
deleted file mode 100644
index 3683f2ca4..000000000
--- a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/mapper/ScheduleJobLogDao.xml
+++ /dev/null
@@ -1,7 +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="com.elink.esua.epdc.dao.ScheduleJobLogDao">
-
-
-</mapper>
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/ScheduleJobDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/ScheduleJobDao.xml
deleted file mode 100644
index 57cb6edb5..000000000
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/ScheduleJobDao.xml
+++ /dev/null
@@ -1,14 +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="com.elink.esua.epdc.dao.ScheduleJobDao">
-
-	<!-- 批量更新状态 -->
-	<update id="updateBatch">
-		update schedule_job set status = #{status} where id in
-		<foreach item="id" collection="ids"  open="(" separator="," close=")">
-			#{id}
-		</foreach>
-	</update>
-
-</mapper>
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/ScheduleJobLogDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/ScheduleJobLogDao.xml
deleted file mode 100644
index 3683f2ca4..000000000
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/ScheduleJobLogDao.xml
+++ /dev/null
@@ -1,7 +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="com.elink.esua.epdc.dao.ScheduleJobLogDao">
-
-
-</mapper>
diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/mapper/ScheduleJobDao.xml b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/mapper/ScheduleJobDao.xml
deleted file mode 100644
index 57cb6edb5..000000000
--- a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/mapper/ScheduleJobDao.xml
+++ /dev/null
@@ -1,14 +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="com.elink.esua.epdc.dao.ScheduleJobDao">
-
-	<!-- 批量更新状态 -->
-	<update id="updateBatch">
-		update schedule_job set status = #{status} where id in
-		<foreach item="id" collection="ids"  open="(" separator="," close=")">
-			#{id}
-		</foreach>
-	</update>
-
-</mapper>
diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/mapper/ScheduleJobLogDao.xml b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/mapper/ScheduleJobLogDao.xml
deleted file mode 100644
index 3683f2ca4..000000000
--- a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/mapper/ScheduleJobLogDao.xml
+++ /dev/null
@@ -1,7 +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="com.elink.esua.epdc.dao.ScheduleJobLogDao">
-
-
-</mapper>
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ScheduleJobDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ScheduleJobDao.xml
deleted file mode 100644
index 57cb6edb5..000000000
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ScheduleJobDao.xml
+++ /dev/null
@@ -1,14 +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="com.elink.esua.epdc.dao.ScheduleJobDao">
-
-	<!-- 批量更新状态 -->
-	<update id="updateBatch">
-		update schedule_job set status = #{status} where id in
-		<foreach item="id" collection="ids"  open="(" separator="," close=")">
-			#{id}
-		</foreach>
-	</update>
-
-</mapper>
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ScheduleJobLogDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ScheduleJobLogDao.xml
deleted file mode 100644
index 3683f2ca4..000000000
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ScheduleJobLogDao.xml
+++ /dev/null
@@ -1,7 +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="com.elink.esua.epdc.dao.ScheduleJobLogDao">
-
-
-</mapper>
diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/mapper/ScheduleJobDao.xml b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/mapper/ScheduleJobDao.xml
deleted file mode 100644
index 57cb6edb5..000000000
--- a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/mapper/ScheduleJobDao.xml
+++ /dev/null
@@ -1,14 +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="com.elink.esua.epdc.dao.ScheduleJobDao">
-
-	<!-- 批量更新状态 -->
-	<update id="updateBatch">
-		update schedule_job set status = #{status} where id in
-		<foreach item="id" collection="ids"  open="(" separator="," close=")">
-			#{id}
-		</foreach>
-	</update>
-
-</mapper>
diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/mapper/ScheduleJobLogDao.xml b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/mapper/ScheduleJobLogDao.xml
deleted file mode 100644
index 3683f2ca4..000000000
--- a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/mapper/ScheduleJobLogDao.xml
+++ /dev/null
@@ -1,7 +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="com.elink.esua.epdc.dao.ScheduleJobLogDao">
-
-
-</mapper>
diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/mapper/ScheduleJobDao.xml b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/mapper/ScheduleJobDao.xml
deleted file mode 100644
index 57cb6edb5..000000000
--- a/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/mapper/ScheduleJobDao.xml
+++ /dev/null
@@ -1,14 +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="com.elink.esua.epdc.dao.ScheduleJobDao">
-
-	<!-- 批量更新状态 -->
-	<update id="updateBatch">
-		update schedule_job set status = #{status} where id in
-		<foreach item="id" collection="ids"  open="(" separator="," close=")">
-			#{id}
-		</foreach>
-	</update>
-
-</mapper>
diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/mapper/ScheduleJobLogDao.xml b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/mapper/ScheduleJobLogDao.xml
deleted file mode 100644
index 3683f2ca4..000000000
--- a/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/mapper/ScheduleJobLogDao.xml
+++ /dev/null
@@ -1,7 +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="com.elink.esua.epdc.dao.ScheduleJobLogDao">
-
-
-</mapper>
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/pom.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-client/pom.xml
new file mode 100644
index 000000000..ead3d8880
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epdc-user</artifactId>
+        <groupId>com.esua.epdc</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>epdc-user-client</artifactId>
+    <packaging>jar</packaging>
+
+</project>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
new file mode 100644
index 000000000..27da1f565
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epdc-user</artifactId>
+        <groupId>com.esua.epdc</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>epdc-user-server</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-user-client</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-commons-tools</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-commons-mybatis</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-client</artifactId>
+            <version>${spring.boot.admin.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <spring.profiles.active>dev</spring.profiles.active>
+
+                <server.port>9068</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>test</id>
+            <properties>
+                <spring.profiles.active>test</spring.profiles.active>
+
+                <server.port>9068</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>prod</id>
+            <properties>
+                <spring.profiles.active>prod</spring.profiles.active>
+
+                <server.port>9068</server.port>
+
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+    </profiles>
+
+</project>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/UserApplication.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/UserApplication.java
new file mode 100644
index 000000000..851d91f25
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/UserApplication.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+/**
+ * APP用户模块
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.1.0
+ */
+@SpringBootApplication
+@EnableDiscoveryClient
+@EnableFeignClients
+public class UserApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(UserApplication.class, args);
+    }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
new file mode 100644
index 000000000..f4d2ecc9d
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.config;
+
+import com.elink.esua.epdc.commons.tools.config.ModuleConfig;
+import org.springframework.stereotype.Service;
+
+/**
+ * 模块配置信息-生活服务模块
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Service
+public class ModuleConfigImpl implements ModuleConfig {
+    @Override
+    public String getName() {
+        return "user";
+    }
+}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml
new file mode 100644
index 000000000..30e59bb36
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml
@@ -0,0 +1,65 @@
+server:
+  port: @server.port@
+  servlet:
+    context-path: /app-user
+
+spring:
+  application:
+    name: epdc-user-server
+  # 环境 dev|test|prod
+  profiles:
+    active: @spring.profiles.active@
+  messages:
+    encoding: UTF-8
+    basename: i18n/messages,i18n/messages_common
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+  redis:
+    database: 0
+    host: @spring.redis.host@
+    timeout: 30s
+    port: @spring.redis.port@
+    password: @spring.redis.password@
+  cloud:
+    nacos:
+      discovery:
+        server-addr: @nacos.server-addr@
+        register-enabled: @nacos.register-enabled@
+  datasource:
+    druid:
+      driver-class-name: com.mysql.jdbc.Driver
+      url: @spring.datasource.druid.url@
+      username: @spring.datasource.druid.username@
+      password: @spring.datasource.druid.password@
+
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+  endpoint:
+    health:
+      show-details: ALWAYS
+
+mybatis-plus:
+  mapper-locations: classpath:/mapper/**/*.xml
+  #实体扫描，多个package用逗号或者分号分隔
+  typeAliasesPackage: io.renren.entity;com.elink.esua.epdc.entity
+  global-config:
+    #数据库相关配置
+    db-config:
+      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
+      id-type: ID_WORKER
+      #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
+      field-strategy: NOT_NULL
+      #驼峰下划线转换
+      column-underline: true
+    banner: false
+  #原生配置
+  configuration:
+    map-underscore-to-camel-case: true
+    cache-enabled: false
+    call-setters-on-nulls: true
+    jdbc-type-for-null: 'null'
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages.properties b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages_en_US.properties b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages_en_US.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages_zh_CN.properties b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages_zh_CN.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages_zh_TW.properties b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages_zh_TW.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/validation.properties b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/validation.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/validation_en_US.properties b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/validation_en_US.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/validation_zh_CN.properties b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/validation_zh_CN.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/validation_zh_TW.properties b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/validation_zh_TW.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/logback-spring.xml
new file mode 100644
index 000000000..43b52215c
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/logback-spring.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+
+    <property name="log.path" value="logs/app-user"/>
+
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+
+    <!--1. 输出到控制台-->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>debug</level>
+        </filter>
+        <encoder>
+            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+            <!-- 设置字符集 -->
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!--2. 输出到文档-->
+    <!-- 2.1 level为 DEBUG 日志，时间滚动输出  -->
+    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/debug.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志归档 -->
+            <fileNamePattern>${log.path}/debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录debug级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>debug</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.2 level为 INFO 日志，时间滚动输出  -->
+    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/info.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 每天日志归档路径以及格式 -->
+            <fileNamePattern>${log.path}/info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.3 level为 WARN 日志，时间滚动输出  -->
+    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/warn.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录warn级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>warn</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.4 level为 ERROR 日志，时间滚动输出  -->
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${log.path}/error.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文档保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文档只记录ERROR级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 开发、测试环境 -->
+    <springProfile name="dev,test">
+        <logger name="org.springframework.web" level="INFO"/>
+        <logger name="org.springboot.sample" level="INFO"/>
+        <logger name="com.elink.esua.epdc" level="INFO"/>
+        <logger name="com.elink.esua.epdc.dao" level="DEBUG"/>
+        <root level="INFO">
+            <appender-ref ref="DEBUG_FILE"/>
+            <appender-ref ref="INFO_FILE"/>
+            <appender-ref ref="WARN_FILE"/>
+            <appender-ref ref="ERROR_FILE"/>
+        </root>
+    </springProfile>
+
+    <!-- 生产环境 -->
+    <springProfile name="prod">
+        <logger name="org.springframework.web" level="ERROR"/>
+        <logger name="org.springboot.sample" level="ERROR"/>
+        <logger name="com.elink.esua.epdc" level="ERROR"/>
+        <root level="ERROR">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="DEBUG_FILE"/>
+            <appender-ref ref="INFO_FILE"/>
+            <appender-ref ref="WARN_FILE"/>
+            <appender-ref ref="ERROR_FILE"/>
+        </root>
+    </springProfile>
+
+</configuration>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-user/pom.xml b/esua-epdc/epdc-module/epdc-user/pom.xml
new file mode 100644
index 000000000..458822958
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-user/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>epdc-module</artifactId>
+        <groupId>com.esua.epdc</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>epdc-user</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>epdc-user-client</module>
+        <module>epdc-user-server</module>
+    </modules>
+
+
+</project>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/pom.xml b/esua-epdc/epdc-module/pom.xml
index d68ea69ef..50d7b61a6 100644
--- a/esua-epdc/epdc-module/pom.xml
+++ b/esua-epdc/epdc-module/pom.xml
@@ -25,6 +25,7 @@
         <module>epdc-neighbor</module>
         <module>epdc-services</module>
         <module>epdc-app</module>
+        <module>epdc-user</module>
     </modules>
 
 </project>

From 8b9cbb7190ee5fcb152ee2758d74475d720fd27a Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Wed, 21 Aug 2019 09:46:33 +0800
Subject: [PATCH 5/5] =?UTF-8?q?redis=E6=95=B0=E6=8D=AE=E5=BA=93=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-dev.yml    |  2 +-
 .../src/main/resources/application-prod.yml   |  2 +-
 .../src/main/resources/application-test.yml   |  2 +-
 esua-epdc/epdc-auth/pom.xml                   |  3 +++
 .../src/main/resources/application.yml        |  2 +-
 .../epdc/commons/tools/redis/RedisKeys.java   | 20 +++++++++----------
 esua-epdc/epdc-gateway/pom.xml                | 11 ++++++----
 .../src/main/resources/application.yml        |  2 +-
 .../epdc-app/epdc-app-server/pom.xml          |  3 +++
 .../src/main/resources/application.yml        |  2 +-
 .../epdc-heart/epdc-heart-server/pom.xml      |  3 +++
 .../src/main/resources/application.yml        |  2 +-
 .../epdc-job/epdc-job-server/pom.xml          |  3 +++
 .../src/main/resources/application.yml        |  2 +-
 .../epdc-message/epdc-message-server/pom.xml  |  3 +++
 .../src/main/resources/application.yml        |  2 +-
 .../epdc-neighbor-server/pom.xml              |  3 +++
 .../src/main/resources/application.yml        |  2 +-
 .../epdc-news/epdc-news-server/pom.xml        |  3 +++
 .../src/main/resources/application.yml        |  2 +-
 .../epdc-oss/epdc-oss-server/pom.xml          |  3 +++
 .../src/main/resources/application.yml        |  2 +-
 .../epdc-party/epdc-party-server/pom.xml      |  3 +++
 .../src/main/resources/application.yml        |  2 +-
 .../epdc-services-server/pom.xml              |  3 +++
 .../src/main/resources/application.yml        |  2 +-
 .../epdc-user/epdc-user-server/pom.xml        |  3 +++
 .../src/main/resources/application.yml        |  2 +-
 28 files changed, 64 insertions(+), 30 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-dev.yml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-dev.yml
index 6bbf4f1eb..d270fc002 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-dev.yml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-dev.yml
@@ -1,6 +1,6 @@
 spring:
   redis:
-    database: 0
+    database: 2
     host: 47.104.224.45
     timeout: 30s
     port: 6379
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-prod.yml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-prod.yml
index 0470b8574..f63f14cb3 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-prod.yml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-prod.yml
@@ -1,6 +1,6 @@
 spring:
   redis:
-    database: 0
+    database: 2
     host: redis
     timeout: 30s
     port: 6379
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-test.yml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-test.yml
index 0470b8574..f63f14cb3 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-test.yml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-test.yml
@@ -1,6 +1,6 @@
 spring:
   redis:
-    database: 0
+    database: 2
     host: redis
     timeout: 30s
     port: 6379
diff --git a/esua-epdc/epdc-auth/pom.xml b/esua-epdc/epdc-auth/pom.xml
index b55835234..d60930b98 100644
--- a/esua-epdc/epdc-auth/pom.xml
+++ b/esua-epdc/epdc-auth/pom.xml
@@ -88,6 +88,7 @@
                 <spring.profiles.active>dev</spring.profiles.active>
 
                 <!-- redis配置 -->
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
@@ -104,6 +105,7 @@
                 <spring.profiles.active>test</spring.profiles.active>
 
                 <!-- redis配置 -->
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
@@ -120,6 +122,7 @@
                 <spring.profiles.active>prod</spring.profiles.active>
 
                 <!-- redis配置 -->
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
diff --git a/esua-epdc/epdc-auth/src/main/resources/application.yml b/esua-epdc/epdc-auth/src/main/resources/application.yml
index c978fa2bf..c5e84b24d 100644
--- a/esua-epdc/epdc-auth/src/main/resources/application.yml
+++ b/esua-epdc/epdc-auth/src/main/resources/application.yml
@@ -17,7 +17,7 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
-    database: 0
+    database: @spring.redis.index@
     host: @spring.redis.host@
     timeout: 30s
     port: @spring.redis.port@
diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java
index 64682ac20..ae522f7c5 100644
--- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java
@@ -14,65 +14,63 @@ package com.elink.esua.epdc.commons.tools.redis;
  */
 public class RedisKeys {
 
-    private final static String MODULE_FLAG = "epdc:";
-
     /**
      * 系统参数Key
      */
     public static String getSysParamsKey() {
-        return MODULE_FLAG + "sys:params";
+        return "sys:params";
     }
 
     /**
      * 登录验证码Key
      */
     public static String getLoginCaptchaKey(String uuid) {
-        return MODULE_FLAG + "sys:captcha:" + uuid;
+        return "sys:captcha:" + uuid;
     }
 
     /**
      * 登录用户Key
      */
     public static String getSecurityUserKey(Long id) {
-        return MODULE_FLAG + "sys:security:user:" + id;
+        return "sys:security:user:" + id;
     }
 
     /**
      * 系统日志Key
      */
     public static String getSysLogKey() {
-        return MODULE_FLAG + "sys:log";
+        return "sys:log";
     }
 
     /**
      * 系统资源Key
      */
     public static String getSysResourceKey() {
-        return MODULE_FLAG + "sys:resource";
+        return "sys:resource";
     }
 
     /**
      * 用户菜单导航Key
      */
     public static String getUserMenuNavKey(Long userId, String language) {
-        return MODULE_FLAG + "sys:user:nav:" + userId + "_" + language;
+        return "sys:user:nav:" + userId + "_" + language;
     }
 
     /**
      * 用户菜单导航Key
      */
     public static String getUserMenuNavKey(Long userId) {
-        return MODULE_FLAG + "sys:user:nav:" + userId + "_*";
+        return "sys:user:nav:" + userId + "_*";
     }
 
     /**
      * 用户权限标识Key
      */
     public static String getUserPermissionsKey(Long userId) {
-        return MODULE_FLAG + "sys:user:permissions:" + userId;
+        return "sys:user:permissions:" + userId;
     }
 
     public static String getCpUserKey(String id) {
-        return MODULE_FLAG + "sys:security:cpuser:" + id;
+        return "sys:security:cpuser:" + id;
     }
 }
diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml
index 0c9e9c81c..d144b59c4 100644
--- a/esua-epdc/epdc-gateway/pom.xml
+++ b/esua-epdc/epdc-gateway/pom.xml
@@ -68,15 +68,16 @@
                 <server.port>9094</server.port>
 
                 <!-- redis配置 -->
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <!-- gateway routes -->
-                <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
-<!--                <gateway.routes.epdc-auth-server.uri>http://127.0.0.1:9091</gateway.routes.epdc-auth-server.uri>-->
-                <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
-<!--                <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>-->
+<!--                <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>-->
+                <gateway.routes.epdc-auth-server.uri>http://127.0.0.1:9091</gateway.routes.epdc-auth-server.uri>
+<!--                <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>-->
+                <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>
                 <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server</gateway.routes.epdc-activiti-server.uri>
                 <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
                 <gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
@@ -109,6 +110,7 @@
                 <server.port>9094</server.port>
 
                 <!-- redis配置 -->
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
@@ -140,6 +142,7 @@
                 <server.port>9002</server.port>
 
                 <!-- redis配置 -->
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml
index ac8e81c47..c62805584 100644
--- a/esua-epdc/epdc-gateway/src/main/resources/application.yml
+++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml
@@ -5,7 +5,7 @@ spring:
   application:
     name: epdc-gateway-server
   redis:
-    database: 0
+    database: @spring.redis.index@
     host: @spring.redis.host@
     timeout: 30s
     port: @spring.redis.port@
diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-server/pom.xml b/esua-epdc/epdc-module/epdc-app/epdc-app-server/pom.xml
index 864ee1c86..e81072ca7 100644
--- a/esua-epdc/epdc-module/epdc-app/epdc-app-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-app/epdc-app-server/pom.xml
@@ -80,6 +80,7 @@
 
                 <server.port>9058</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
@@ -102,6 +103,7 @@
 
                 <server.port>9058</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
@@ -124,6 +126,7 @@
 
                 <server.port>9058</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/application.yml
index bdb3aa82a..2e38a195a 100644
--- a/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-app/epdc-app-server/src/main/resources/application.yml
@@ -16,7 +16,7 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
-    database: 0
+    database: @spring.redis.index@
     host: @spring.redis.host@
     timeout: 30s
     port: @spring.redis.port@
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
index c06e167d0..a46e09e90 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
@@ -80,6 +80,7 @@
 
                 <server.port>9060</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
@@ -102,6 +103,7 @@
 
                 <server.port>9060</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
@@ -124,6 +126,7 @@
 
                 <server.port>9060</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml
index f7061b3e9..81774510b 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml
@@ -16,7 +16,7 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
-    database: 0
+    database: @spring.redis.index@
     host: @spring.redis.host@
     timeout: 30s
     port: @spring.redis.port@
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
index f128d3464..be3236e25 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
@@ -109,6 +109,7 @@
 
                 <server.port>9061</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
@@ -131,6 +132,7 @@
 
                 <server.port>9061</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
@@ -153,6 +155,7 @@
 
                 <server.port>9061</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml
index c009ed353..7196c93c2 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml
@@ -16,7 +16,7 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
-    database: 0
+    database: @spring.redis.index@
     host: @spring.redis.host@
     timeout: 30s
     port: @spring.redis.port@
diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
index 67539c47b..3e8a66a7a 100644
--- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
@@ -115,6 +115,7 @@
 
                 <server.port>9062</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
@@ -137,6 +138,7 @@
 
                 <server.port>9062</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
@@ -159,6 +161,7 @@
 
                 <server.port>9062</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/application.yml
index b1b1931bd..863382852 100644
--- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/application.yml
@@ -16,7 +16,7 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
-    database: 0
+    database: @spring.redis.index@
     host: @spring.redis.host@
     timeout: 30s
     port: @spring.redis.port@
diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/pom.xml b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/pom.xml
index 96a2fc29d..b95f3ed7d 100644
--- a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/pom.xml
@@ -80,6 +80,7 @@
 
                 <server.port>9063</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
@@ -102,6 +103,7 @@
 
                 <server.port>9063</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
@@ -124,6 +126,7 @@
 
                 <server.port>9063</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/application.yml
index bbf98fa49..d8c580a31 100644
--- a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/application.yml
@@ -16,7 +16,7 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
-    database: 0
+    database: @spring.redis.index@
     host: @spring.redis.host@
     timeout: 30s
     port: @spring.redis.port@
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
index 528cd69af..f593d7112 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
@@ -80,6 +80,7 @@
 
                 <server.port>9064</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
@@ -102,6 +103,7 @@
 
                 <server.port>9064</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
@@ -124,6 +126,7 @@
 
                 <server.port>9064</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml
index 03d86c1cc..7d628be9b 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml
@@ -16,7 +16,7 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
-    database: 0
+    database: @spring.redis.index@
     host: @spring.redis.host@
     timeout: 30s
     port: @spring.redis.port@
diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
index 64cf3c844..6ac5138dd 100644
--- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
@@ -123,6 +123,7 @@
 
                 <server.port>9065</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
@@ -145,6 +146,7 @@
 
                 <server.port>9065</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
@@ -167,6 +169,7 @@
 
                 <server.port>9065</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml
index 6a844d52a..fb12748b3 100644
--- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml
@@ -21,7 +21,7 @@ spring:
       max-request-size: 1024MB
       enabled: true
   redis:
-    database: 0
+    database: @spring.redis.index@
     host: @spring.redis.host@
     timeout: 30s
     port: @spring.redis.port@
diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/pom.xml b/esua-epdc/epdc-module/epdc-party/epdc-party-server/pom.xml
index 675bcee63..81bc78c89 100644
--- a/esua-epdc/epdc-module/epdc-party/epdc-party-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-party/epdc-party-server/pom.xml
@@ -80,6 +80,7 @@
 
                 <server.port>9066</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
@@ -102,6 +103,7 @@
 
                 <server.port>9066</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
@@ -124,6 +126,7 @@
 
                 <server.port>9066</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/application.yml
index 2d2b41f22..d75b3e9aa 100644
--- a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/application.yml
@@ -16,7 +16,7 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
-    database: 0
+    database: @spring.redis.index@
     host: @spring.redis.host@
     timeout: 30s
     port: @spring.redis.port@
diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/pom.xml b/esua-epdc/epdc-module/epdc-services/epdc-services-server/pom.xml
index 18d36ca66..c3b3307b9 100644
--- a/esua-epdc/epdc-module/epdc-services/epdc-services-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-services/epdc-services-server/pom.xml
@@ -80,6 +80,7 @@
 
                 <server.port>9067</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
@@ -102,6 +103,7 @@
 
                 <server.port>9067</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
@@ -124,6 +126,7 @@
 
                 <server.port>9067</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/application.yml
index 82e71dcf4..5cb96ea74 100644
--- a/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-services/epdc-services-server/src/main/resources/application.yml
@@ -16,7 +16,7 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
-    database: 0
+    database: @spring.redis.index@
     host: @spring.redis.host@
     timeout: 30s
     port: @spring.redis.port@
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
index 27da1f565..8f991068c 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
@@ -80,6 +80,7 @@
 
                 <server.port>9068</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
@@ -102,6 +103,7 @@
 
                 <server.port>9068</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
@@ -124,6 +126,7 @@
 
                 <server.port>9068</server.port>
 
+                <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>elink@888</spring.redis.password>
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml
index 30e59bb36..1bc23e826 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml
@@ -16,7 +16,7 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
-    database: 0
+    database: @spring.redis.index@
     host: @spring.redis.host@
     timeout: 30s
     port: @spring.redis.port@