From da5e6b48ed814a516477d3c782577d38453337bc Mon Sep 17 00:00:00 2001
From: "udf_admin@163.com" <udf_admin@163.com>
Date: Sun, 11 Nov 2018 14:22:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 udf-server/pom.xml                            |  2 +-
 udf-server/udf-eureka-server/pom.xml          | 58 -------------------
 .../server/UdfEurekaServerApplication.java    | 15 -----
 .../src/main/resources/banner.txt             | 11 ----
 .../main/resources/bootstrap-dev.properties   | 11 ----
 .../src/main/resources/bootstrap.properties   | 34 -----------
 .../src/main/resources/logback.xml            |  5 --
 7 files changed, 1 insertion(+), 135 deletions(-)
 delete mode 100644 udf-server/udf-eureka-server/pom.xml
 delete mode 100644 udf-server/udf-eureka-server/src/main/java/org/itkk/udf/eureka/server/UdfEurekaServerApplication.java
 delete mode 100644 udf-server/udf-eureka-server/src/main/resources/banner.txt
 delete mode 100644 udf-server/udf-eureka-server/src/main/resources/bootstrap-dev.properties
 delete mode 100644 udf-server/udf-eureka-server/src/main/resources/bootstrap.properties
 delete mode 100644 udf-server/udf-eureka-server/src/main/resources/logback.xml

diff --git a/udf-server/pom.xml b/udf-server/pom.xml
index 8f943ab..959d23b 100644
--- a/udf-server/pom.xml
+++ b/udf-server/pom.xml
@@ -22,7 +22,7 @@
     </properties>
     <!--子模块 -->
     <modules>
-        <module>udf-eureka-server</module>
+        <module>udf-eureka-config-server</module>
     </modules>
     <!-- 依赖管理 -->
     <dependencyManagement>
diff --git a/udf-server/udf-eureka-server/pom.xml b/udf-server/udf-eureka-server/pom.xml
deleted file mode 100644
index b5ec2e9..0000000
--- a/udf-server/udf-eureka-server/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-         xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <!-- maven坐标 -->
-    <artifactId>udf-eureka-server</artifactId>
-    <name>udf-eureka-server</name>
-    <packaging>jar</packaging>
-    <url>http://itkk.org:81</url>
-    <!-- 父依赖 -->
-    <parent>
-        <groupId>org.itkk.udf</groupId>
-        <artifactId>udf-server</artifactId>
-        <version>1.0</version>
-    </parent>
-    <!-- 参数 -->
-    <properties>
-        <server.port>9001</server.port>
-        <management.port>8001</management.port>
-    </properties>
-    <!-- 依赖 -->
-    <dependencies>
-        <!-- spring cloud starter eureka server -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
-        </dependency>
-        <!-- udf-starter-core -->
-        <dependency>
-            <groupId>org.itkk.udf</groupId>
-            <artifactId>udf-starter-core</artifactId>
-        </dependency>
-    </dependencies>
-    <!-- 构建 -->
-    <build>
-        <resources>
-            <resource>
-                <directory>${project.basedir}/src/main/resources/</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <!-- package -->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${springboot.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/udf-server/udf-eureka-server/src/main/java/org/itkk/udf/eureka/server/UdfEurekaServerApplication.java b/udf-server/udf-eureka-server/src/main/java/org/itkk/udf/eureka/server/UdfEurekaServerApplication.java
deleted file mode 100644
index 1607e3b..0000000
--- a/udf-server/udf-eureka-server/src/main/java/org/itkk/udf/eureka/server/UdfEurekaServerApplication.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.itkk.udf.eureka.server;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.cloud.client.SpringCloudApplication;
-import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
-
-@SpringCloudApplication
-@EnableEurekaServer
-public class UdfEurekaServerApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(UdfEurekaServerApplication.class, args);
-    }
-
-}
diff --git a/udf-server/udf-eureka-server/src/main/resources/banner.txt b/udf-server/udf-eureka-server/src/main/resources/banner.txt
deleted file mode 100644
index 1b84812..0000000
--- a/udf-server/udf-eureka-server/src/main/resources/banner.txt
+++ /dev/null
@@ -1,11 +0,0 @@
- .----------------.  .----------------.  .----------------.
-| .--------------. || .--------------. || .--------------. |
-| | _____  _____ | || |  ________    | || |  _________   | |
-| ||_   _||_   _|| || | |_   ___ `.  | || | |_   ___  |  | |
-| |  | |    | |  | || |   | |   `. \ | || |   | |_  \_|  | |
-| |  | '    ' |  | || |   | |    | | | || |   |  _|      | |
-| |   \ `--' /   | || |  _| |___.' / | || |  _| |_       | |
-| |    `.__.'    | || | |________.'  | || | |_____|      | |
-| |              | || |              | || |              | |
-| '--------------' || '--------------' || '--------------' |
- '----------------'  '----------------'  '----------------'
\ No newline at end of file
diff --git a/udf-server/udf-eureka-server/src/main/resources/bootstrap-dev.properties b/udf-server/udf-eureka-server/src/main/resources/bootstrap-dev.properties
deleted file mode 100644
index 33018a5..0000000
--- a/udf-server/udf-eureka-server/src/main/resources/bootstrap-dev.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# EUREKA.ENVIRONMENT ( EurekaServerBootstrap )
-eureka.environment=${spring.profiles.active}
-# EUREKA.INSTANCE ( EurekaInstanceConfigBean )
-eureka.instance.preferIpAddress=true
-# EUREKA.CLIENT (EurekaClientConfigBean , EurekaServerConfigBean )
-eureka.client.enabled=true
-eureka.client.serviceUrl.defaultZone=http://admin:123456@127.0.0.1:${server.port}/eureka/
-eureka.client.register-with-eureka=true
-eureka.client.fetch-registry=true
-# LOGGING
-logging.file=d:/develop/application-log/${spring.application.name}_${server.port}_${spring.profiles.active}/base.log
\ No newline at end of file
diff --git a/udf-server/udf-eureka-server/src/main/resources/bootstrap.properties b/udf-server/udf-eureka-server/src/main/resources/bootstrap.properties
deleted file mode 100644
index 2ae004f..0000000
--- a/udf-server/udf-eureka-server/src/main/resources/bootstrap.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-# INFO
-info.build.group=${project.groupId}
-info.build.artifact=${project.artifactId}
-info.build.version=${project.version}
-info.build.name=${project.name}
-info.build.env=${spring.profiles.active}
-info.build.time=${project.build.date}
-info.build.encoding=${project.build.sourceEncoding}
-info.build.java.source=${java.version}
-info.build.java.target=${java.version}
-# SPRING
-spring.application.name=${project.name}
-# HTTP SERVER
-server.port=${server.port}
-# MANAGEMENT HTTP SERVER (ManagementServerProperties)
-#management.server.address=127.0.0.1
-management.server.port=${management.port}
-# ENDPOINTS WEB CONFIGURATION (WebEndpointProperties)
-management.endpoints.web.exposure.include=*
-# ENDPOINT
-management.endpoint.health.showDetails=always
-management.endpoint.shutdown.enabled=true
-management.endpoint.restart.enabled=true
-management.endpoint.pause.enabled=true
-management.endpoint.resume.enabled=true
-# JACKSON
-#spring.jackson.dateFormat=${org.itkk.application.config.dateFormat}
-#spring.jackson.jodaDateTimeFormat=${org.itkk.application.config.dateFormat}
-spring.jackson.timeZone=Asia/Shanghai
-spring.jackson.serialization.INDENT_OUTPUT=true
-spring.jackson.serialization.FAIL_ON_EMPTY_BEANS=true
-spring.jackson.deserialization.FAIL_ON_UNKNOWN_PROPERTIES=true
-spring.jackson.parser.ALLOW_SINGLE_QUOTES=true
-spring.jackson.parser.ALLOW_UNQUOTED_CONTROL_CHARS=true
\ No newline at end of file
diff --git a/udf-server/udf-eureka-server/src/main/resources/logback.xml b/udf-server/udf-eureka-server/src/main/resources/logback.xml
deleted file mode 100644
index 049dc97..0000000
--- a/udf-server/udf-eureka-server/src/main/resources/logback.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-  <include resource="org/springframework/boot/logging/logback/base.xml" />
-  <jmxConfigurator />
-</configuration>
\ No newline at end of file