diff --git a/build.gradle b/build.gradle index 9a70ad3..51a9f30 100644 --- a/build.gradle +++ b/build.gradle @@ -3,21 +3,25 @@ buildscript { springBootVersion = '1.5.3.RELEASE' } repositories { - mavenLocal() - maven{ - url 'http://localhost:8077/nexus/content/groups/public/' - } - } + mavenLocal() //1.优先查找本地maven库,性能最好 + maven{//2.其次查找aliyun maven库 + url'http://maven.aliyun.com/nexus/content/groups/public/' + } + mavenCentral()//3.最后查找maven中央库 + } dependencies { classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") classpath('se.transmode.gradle:gradle-docker:1.2') } } + + task wrapper(type: Wrapper) { - gradleVersion = '3.0' + gradleVersion = '3.5' } + //task buildDocker(type: Docker, dependsOn: build) { // push = true // applicationName = jar.baseName @@ -71,8 +75,13 @@ configure(allprojects) { project -> apply plugin: 'org.springframework.boot' apply plugin: 'docker' + repositories { - maven { url "http://localhost:8077/nexus/content/groups/public/" } + mavenLocal() //1.优先查找本地maven库,性能最好 + maven{//2.其次查找aliyun maven库 + url'http://maven.aliyun.com/nexus/content/groups/public/' + } + mavenCentral()//3.最后查找maven中央库 } dependencies { @@ -91,6 +100,7 @@ project("xbin-store-cloud-eureka") { dependencies { compile("org.springframework.cloud:spring-cloud-starter-eureka-server") + compile files('libs/fastdfs_client-1.24.jar') } } project("xbin-store-cloud-config") { @@ -121,14 +131,17 @@ project("xbin-store-cloud-sleuth") { } project("xbin-store-cloud-common") { description = "xbin-store-cloud-common" - + + dependencies { + testCompile ([fileTree(dir: "${System.properties['java.home']}/../lib", include: '*tools.jar'),fileTree(dir: "lib/test", include: '*.jar') ]) + compile files('libs/fastdfs_client-1.24.jar') compileOnly("javax.servlet:javax.servlet-api:${servletapiVersion}") compileOnly("redis.clients:jedis:${jedisVersion}") compile("org.apache.commons:commons-lang3:${commonslang3Version}") compile("commons-lang:commons-lang:${commonslangVersion}") compile("com.alibaba:fastjson:${fastjsonVersion}") - compile("org.csource:fastdfs:${fastdfsVersion}") + //compile("org.csource:fastdfs:${fastdfsVersion}") compile("org.slf4j:slf4j-api:${slf4jVersion}") compile("io.springfox:springfox-swagger-ui:${swagger2Version}") compile("io.springfox:springfox-swagger2:${swagger2Version}") diff --git a/gradle.properties b/gradle.properties index 19327cf..b36b04a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,3 @@ version=1.0.0 -activated=dev \ No newline at end of file +activated=dev +org.gradle.java.home=F:/java/jdk1.8.0_05 \ No newline at end of file diff --git a/libs/fastdfs_client-1.24.jar b/libs/fastdfs_client-1.24.jar new file mode 100644 index 0000000..ea4b106 Binary files /dev/null and b/libs/fastdfs_client-1.24.jar differ diff --git a/xbin-store-cloud-common/build/resources/main/fastdfs_client.conf b/xbin-store-cloud-common/build/resources/main/fastdfs_client.conf new file mode 100644 index 0000000..4212a0d --- /dev/null +++ b/xbin-store-cloud-common/build/resources/main/fastdfs_client.conf @@ -0,0 +1,4 @@ +tracker_server = 192.168.125.129:22122 +tracker_server=192.168.125.129:22122 + + diff --git a/xbin-store-cloud-common/build/resources/main/log4j.properties b/xbin-store-cloud-common/build/resources/main/log4j.properties new file mode 100644 index 0000000..26b0638 --- /dev/null +++ b/xbin-store-cloud-common/build/resources/main/log4j.properties @@ -0,0 +1,12 @@ +log4j.rootLogger=INFO, console, file + +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d %p [%c] - %m%n + +log4j.appender.file=org.apache.log4j.DailyRollingFileAppender +log4j.appender.file.File=logs/xbin-store-cloud-service-common.log +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern=%d %p [%c] - %m%n + +log4j.logger.org.springframework=WARN diff --git a/xbin-store-cloud-common/libs/fastdfs_client-1.24.jar b/xbin-store-cloud-common/libs/fastdfs_client-1.24.jar new file mode 100644 index 0000000..ea4b106 Binary files /dev/null and b/xbin-store-cloud-common/libs/fastdfs_client-1.24.jar differ