--no commit message

config-server/src/main/resources/application.yml

-eureka:
-  instance:
-    preferIpAddress: true
-  client:
-    serviceUrl:
-      defaultZone: http://localhost:8761/eureka/
+
 

config-server/src/main/resources/assembly.xml

-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
-<id>package</id>
-<formats>
+	<id>package</id>
+	<formats>
 		<format>zip</format>
-</formats>
-<includeBaseDirectory>false</includeBaseDirectory>
-<fileSets>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<fileSets>
 		<fileSet>
 			<directory>${basedir}/src/main/resources</directory>
 			<includes>
 				<include>*.yml</include>
+				<include>*.xml</include>
+				<include>static/**</include>
+				<include>templates/**</include>
+				<include>*.properties</include>
+				<include>*.txt</include>
 			</includes>
 			<filtered>true</filtered>
 			<outputDirectory>${file.separator}${project.artifactId}</outputDirectory>
@@ -22,17 +28,17 @@
 		</fileSet>
 		<fileSet>
 			<directory>${project.build.directory}/lib</directory>
-        <outputDirectory>${file.separator}lib</outputDirectory>
+			<outputDirectory>${file.separator}${project.artifactId}/lib</outputDirectory>
 			<includes>
 				<include>*.jar</include>
 			</includes>
 		</fileSet>
 		<fileSet>
-        <directory>${project.build.directory}//${project.artifactId}</directory>
+			<directory>${project.build.directory}/</directory>
 			<outputDirectory>${file.separator}${project.artifactId}</outputDirectory>
 			<includes>
 				<include>*.jar</include>
 			</includes>
 		</fileSet>
-</fileSets>
+	</fileSets>
 </assembly>
\ No newline at end of file

config-server/src/main/resources/bootstrap.yml

@@ -8,3 +8,9 @@ spring:
       server:
         native:
           search-locations: classpath:/properties/
+eureka:
+  instance:
+    preferIpAddress: true
+  client:
+    serviceUrl:
+      defaultZone: http://localhost:8761/eureka/
\ No newline at end of file

config-server/src/main/resources/logback.xml

@@ -3,9 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://www.padual.com/java/logback.xsd"
     debug="false" scan="true" scanPeriod="30 second">
-	<!--读取配置中心的属性-->
-    <springProperty scope="context" name="name" source="spring.application.name"/>
-    <property name="ROOT" value="/opt/logs/config-server/" />
+    <property name="ROOT" value="/opt/logs/master/config/" />
     <property name="FILESIZE" value="50MB" />
     <property name="MAXHISTORY" value="100" />
     <property name="DATETIME" value="yyyy-MM-dd HH:mm:ss" />

config-server/src/main/resources/properties/application-prod.yml

@@ -36,7 +36,7 @@ default:
   spring-sleuth-sampler-percentage: 1.0
   #数据库连接信息
   spring-datasource-driver-class-name: com.mysql.jdbc.Driver
-  spring-datasource-url: jdbc:mysql://192.168.2.151:3306/
+  spring-datasource-url: jdbc:mysql://localhost:3306/
   spring-datasource-username: root
   spring-datasource-password: root
   spring-datasource-initialize: true

config-server/src/main/resources/properties/file-prod.yml

-server:
-  port: ${file-port}
 spring:
   application:
     name: file #服务名称

config-server/src/main/resources/properties/member-prod.yml

@@ -8,7 +8,7 @@ spring:
       percentage: ${default.spring-sleuth-sampler-percentage} 
   datasource:
     driver-class-name: ${default.spring-datasource-driver-class-name}
-    url: ${default.spring-datasource-url}zrqx-member
+    url: ${default.spring-datasource-url}zrqx-member?serverTimezone=GMT
     username: ${default.spring-datasource-username}
     password: ${default.spring-datasource-password}
     initialize: ${default.spring-datasource-initialize}

config-server/src/main/resources/properties/order-prod.yml

-server:
-  port: ${order-port}
 spring:
   application:
     name: order #服务名称

config-server/src/main/resources/properties/resource-prod.yml

-server:
-  port: ${resource-port}
 spring:
   application:
     name: resource #服务名称

config-server/src/main/resources/properties/third-prod.yml

-server:
-  port: ${third-port}
 spring:
   application:
     name: third #服务名称