wuhongshuang 3 tahun lalu
induk
melakukan
24e44301cd

+ 11 - 29
pom.xml

@@ -16,7 +16,7 @@
 		<groupId>cn.com.crbank.ommo</groupId>
 		<artifactId>ommo-spring-boot-parent</artifactId>
 		<version>1.0.2</version>
-		<relativePath /> <!-- lookup parent from repository -->
+		<relativePath />
 	</parent>
 
 	<properties>
@@ -35,16 +35,21 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-config-server</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
+		</dependency>
 
+		<!--- 文件配置改为mysql -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
+			<artifactId>spring-boot-starter-jdbc</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
 		</dependency>
+
 	</dependencies>
 
 	<build>
@@ -54,29 +59,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<layout>ZIP</layout>
-<!-- 					去除在生产环境中不变的依赖 -->
-<!--					<excludeGroupIds>-->
-<!--						aopalliance,ch.qos.logback,com.alibaba,com.amazonaws,com.fasterxml,-->
-<!--						com.fasterxml.jackson.core,com.fasterxml.jackson.dataformat,com.fasterxml.jackson.module,-->
-<!--						com.fasterxml.woodstox,com.github.jsqlparser,com.github.pagehelper,-->
-<!--						com.google.code.findbugs,com.googlecode.javaewah,com.google.guava,com.google.inject,-->
-<!--						com.jcraft,commons-beanutils,commons-codec,commons-collections,commons-configuration,-->
-<!--						commons-lang,commons-logging,com.netflix.archaius,com.netflix.eureka,com.netflix.feign,-->
-<!--						com.netflix.governator,com.netflix.hystrix,com.netflix.netflix-commons,com.netflix.ribbon,-->
-<!--						com.netflix.servo,com.sun.jersey,com.sun.jersey.contribs,com.thoughtworks.xstream,com.trilead,-->
-<!--						de.regnis.q.sequence,io.netty,io.reactivex,javax.inject,javax.validation,javax.ws.rs,-->
-<!--						javax.xml.stream,net.java.dev.jna,net.sf.ehcache,org.antlr,org.apache.commons,-->
-<!--						org.apache.httpcomponents,org.apache.shiro,org.apache.tomcat.embed,org.aspectj,org.bouncycastle,-->
-<!--						org.codehaus.jettison,org.codehaus.woodstox,org.eclipse.jgit,org.freemarker,org.hdrhistogram,-->
-<!--						org.hibernate,org.jasig.cas.client,org.jboss.logging,org.jvnet,org.opensymphony.quartz,org.ow2.asm,-->
-<!--						org.slf4j,org.springframework,org.springframework.boot,org.springframework.cloud,-->
-<!--						org.springframework.security,org.tmatesoft.sqljet,org.tmatesoft.svnkit,org.yaml,stax,xmlpull,xpp3,-->
-<!--						io.github.openfeign,com.fasterxml.jackson.datatype,org.apache.logging.log4j,com.github.vlsi.compactmap,-->
-<!--						javax.annotation,javax.annotation-api,com.github.andrewoma.dexx,com.google.code.gson,commons-jxpath,-->
-<!--						antlr,joda-time,org.hibernate.validator,com.zaxxer,org.latencyutils,org.projectlombok,io.micrometer,-->
-<!--						org.mybatis.spring.boot,org.mybatis,mysql,org.synchronoss.cloud,org.reactivestreams,io.projectreactor,-->
-<!--						io.projectreactor.addons,io.projectreactor.ipc-->
-<!--					</excludeGroupIds>-->
 				</configuration>
 			</plugin>
 		</plugins>
@@ -84,7 +66,7 @@
 	<repositories>
 		<repository>
 			<id>nexus</id>
-			<url>http://10.241.21.242:8180/repository/maven-public/</url>
+			<url>http://www.redouble.store:1888/repository/maven-public/</url>
 			<releases>
 				<enabled>true</enabled>
 			</releases>

+ 18 - 17
src/main/resources/bootstrap.properties

@@ -1,7 +1,23 @@
-server.port=49015
+server.port=59015
 
 spring.application.name=config-server
 
+# eureka
+eureka.instance.hostname=config-server
+eureka.instance.prefer-ip-address=true
+eureka.client.service-url.defaultZone=http://112.74.63.148:49014/eureka/
+#eureka.client.service-url.defaultZone=@eureka-url@
+#eureka.instance.instance-id=${eureka.instance.hostname}:${server.port}
+#eureka.instance.ip-address=10.241.20.241
+# config
+spring.profiles.active=jdbc
+spring.cloud.config.server.jdbc.sql=SELECT config_key as KEY, config_value as VALUE from sys_properties where (APPLICATION=? or application='application-default') and PROFILE=? and LABEL=? and status='1'
+spring.datasource.url=jdbc:mysql://rm-wz995mu26a1479kz0so.mysql.rds.aliyuncs.com:3306/szwl
+spring.datasource.username=root
+spring.datasource.password=sunzee@020
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+
+
 #Log levels (TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF)
 logging.level.root=INFO
 logging.level.org.springframework=INFO
@@ -11,19 +27,4 @@ logging.level.com.shawn=TRACE
 # File output
 logging.file.max-size=100MB
 logging.file.max-history=30
-logging.file=/app/applogs/${spring.application.name}/${spring.application.name}.log
-
-# config  
-#默认在系统临时目录下面,需要调整一下避免临时文件被系统自动清理  
-#spring.cloud.config.server.svn.basedir=/data   
-# /app/appconfig/        D:/test
-spring.cloud.config.server.native.search-locations=file:/app/appconfig/
-spring.profiles.active=native
-#spring.cloud.config.uri=http://localhost:52000
-
-# eureka
-eureka.instance.hostname=config-server
-eureka.instance.prefer-ip-address=true
-eureka.client.service-url.defaultZone=http://eureka1:49014/eureka/,http://eureka2:49014/eureka/,http://eureka3:49014/eureka/
-#eureka.instance.instance-id=${eureka.instance.hostname}:${server.port}
-eureka.instance.ip-address=127.0.0.1
+logging.file.name=/app/applogs/${spring.application.name}/${spring.application.name}.log

+ 0 - 16
src/test/java/com/shawn/ConfigServerApplicationTests.java

@@ -1,16 +0,0 @@
-package com.shawn;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class ConfigServerApplicationTests {
-
-	@Test
-	public void contextLoads() {
-	}
-
-}