From 1d8f58a26c4570dd8eb87738460198df9ebcf23b Mon Sep 17 00:00:00 2001
From: rongchao <rongchao@elink-cn.com>
Date: Wed, 11 Dec 2019 15:35:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4neighbor=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc-neighbor-client/pom.xml              |  16 --
 .../java/com/elink/esua/epdc/epdc.gitkeep     |   0
 .../epdc-neighbor-server/Dockerfile           |  20 ---
 .../epdc-neighbor-server/pom.xml              | 153 -----------------
 .../elink/esua/epdc/NeighborApplication.java  |  31 ----
 .../esua/epdc/config/ModuleConfigImpl.java    |  26 ---
 .../src/main/resources/application.yml        |  68 --------
 .../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 ------------------
 .../src/main/resources/registry.conf          |  21 ---
 esua-epdc/epdc-module/epdc-neighbor/pom.xml   |  20 ---
 esua-epdc/epdc-module/pom.xml                 |   1 -
 19 files changed, 515 deletions(-)
 delete mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-client/pom.xml
 delete mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep
 delete mode 100755 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/Dockerfile
 delete mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/pom.xml
 delete mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/java/com/elink/esua/epdc/NeighborApplication.java
 delete mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
 delete mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/application.yml
 delete mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/messages.properties
 delete mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/messages_en_US.properties
 delete mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/messages_zh_CN.properties
 delete mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/messages_zh_TW.properties
 delete mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/validation.properties
 delete mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/validation_en_US.properties
 delete mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/validation_zh_CN.properties
 delete mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/i18n/validation_zh_TW.properties
 delete mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/logback-spring.xml
 delete mode 100644 esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/registry.conf
 delete mode 100644 esua-epdc/epdc-module/epdc-neighbor/pom.xml

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
deleted file mode 100644
index cb0fce014..000000000
--- a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-client/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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
deleted file mode 100644
index e69de29bb..000000000
diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/Dockerfile b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/Dockerfile
deleted file mode 100755
index d9a1f64c6..000000000
--- a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-# 基础镜像
-FROM adoptopenjdk/openjdk11
-# 作者
-MAINTAINER rongchao@elink-cn.com
-# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值
-ARG JAR_FILE
-# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_NAME的值
-ARG JAR_NAME
-# 对应pom.xml文件中的dockerfile-maven-plugin插件SERVER_PORT的值
-ARG SERVER_PORT
-# 复制打包完成后的jar文件到/opt目录下
-ENV JAR_PATH /mnt/epdc/${JAR_NAME}.jar
-ADD ${JAR_FILE} $JAR_PATH
-# /data设为环境变量
-ENV DATAPATH /data
-# 挂载/data目录到主机
-VOLUME $DATAPATH
-# 启动容器时执行
-ENTRYPOINT java -jar -Xmx1024m $JAR_PATH
-EXPOSE ${SERVER_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
deleted file mode 100644
index 3abbeb50c..000000000
--- a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/pom.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?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>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-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.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>
-
-                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </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.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>
-
-                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </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.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>
-
-                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </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-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
deleted file mode 100644
index 9e021c6ee..000000000
--- a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/java/com/elink/esua/epdc/NeighborApplication.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * 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
deleted file mode 100644
index 2d13dec56..000000000
--- a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * 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
deleted file mode 100644
index 1e4d7fd0e..000000000
--- a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/application.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-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: @spring.redis.index@
-    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@
-    alibaba:
-      seata:
-        tx-service-group: epdc-neighbor-server-fescar-service-group
-  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
deleted file mode 100644
index e69de29bb..000000000
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
deleted file mode 100644
index e69de29bb..000000000
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
deleted file mode 100644
index e69de29bb..000000000
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
deleted file mode 100644
index e69de29bb..000000000
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
deleted file mode 100644
index e69de29bb..000000000
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
deleted file mode 100644
index e69de29bb..000000000
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
deleted file mode 100644
index e69de29bb..000000000
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
deleted file mode 100644
index e69de29bb..000000000
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
deleted file mode 100644
index b6a877871..000000000
--- a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/logback-spring.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?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/registry.conf b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/registry.conf
deleted file mode 100644
index 9cfedf9cc..000000000
--- a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/src/main/resources/registry.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-registry {
-  # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa
-  type = "nacos"
-
-  nacos {
-    serverAddr = "47.104.224.45"
-    namespace = "public"
-    cluster = "default"
-  }
-}
-
-config {
-  # file、nacos 、apollo、zk、consul、etcd3
-  type = "nacos"
-
-  nacos {
-    serverAddr = "47.104.224.45"
-    namespace = "public"
-    cluster = "default"
-  }
-}
diff --git a/esua-epdc/epdc-module/epdc-neighbor/pom.xml b/esua-epdc/epdc-module/epdc-neighbor/pom.xml
deleted file mode 100644
index 744cca83b..000000000
--- a/esua-epdc/epdc-module/epdc-neighbor/pom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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/pom.xml b/esua-epdc/epdc-module/pom.xml
index d18565c7e..f8cce83e5 100644
--- a/esua-epdc/epdc-module/pom.xml
+++ b/esua-epdc/epdc-module/pom.xml
@@ -22,7 +22,6 @@
         <module>epdc-heart</module>
         <module>epdc-news</module>
         <module>epdc-events</module>
-        <module>epdc-neighbor</module>
         <module>epdc-services</module>
         <module>epdc-user</module>
         <module>epdc-demo</module>