From a16424821829d19ebd95c5cea6108f07800550e7 Mon Sep 17 00:00:00 2001
From: shimingxy <shimingxy@163.com>
Date: Thu, 12 Dec 2019 22:21:56 +0800
Subject: [PATCH] build r

---
 build.gradle                                  | 20 +++++++++----------
 buildrelease.bat                              |  3 ---
 .../spring/applicationContext-database.xml    |  6 +++---
 setenv.bat                                    |  3 +++
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2cd30a024..58095aa6f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -122,21 +122,21 @@ subprojects {
 	   	 }
 	}
    repositories {  
-       	mavenLocal()
+        mavenLocal()
         mavenCentral()
         jcenter()
-       
-        maven { url "https://maven.eveoh.nl/content/repositories/releases" }
+		maven { url "https://repo1.maven.org/maven2/" }
+		maven { url "https://mvnrepository.com/repos/central/" }
+        maven { url "http://jcenter.bintray.com" }
         maven { url "http://mvn.gt.igexin.com/nexus/content/repositories/releases"}
         maven { url "https://plugins.gradle.org/m2/" }        
-        maven { url "http://repo.spring.io/plugins-release" }
+        maven { url "https://repo.spring.io/plugins-release/" }
         maven { url "https://repo.spring.io/milestone" }
-        maven { url "https://repo.spring.io/snapshot" }
-        maven { url "https://repo1.maven.org/maven2/" }
         maven { url "https://oss.sonatype.org/content/repositories/releases/" }
         maven { url "https://maven.repository.redhat.com/ga/" }
+		maven { url "https://repository.apache.org/content/repositories/releases/" }
     }  
-  
+
 	dependencies {  
 		 testCompile 'junit:junit:4.11' 
     	 compileOnly 'junit:junit:4.11'  
@@ -234,9 +234,9 @@ subprojects {
          compile group: 'javax.validation', name: 'validation-api', version: '2.0.1.Final'
          compile group: 'javax.xml', name: 'jsr173', version: '1.0'
 		 compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
-		 compile group: 'javax.xml.bind', name: 'jaxb-core', version: '2.3.0.1'
-		 compile group: 'javax.xml.bind', name: 'jaxb-impl', version: '2.3.0.1'
-		 compile group: 'javax.xml.bind', name: 'jaxb-xjc', version: '2.3.0.1'
+		 compile group: 'com.sun.xml.bind', name: 'jaxb-core', version: '2.3.0.1'
+		 compile group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.3.2'
+		 compile group: 'com.sun.xml.bind', name: 'jaxb-xjc',  version: '2.3.2'
          
          compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: "${bouncycastleVersion}"
          compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: "${bouncycastleVersion}"
diff --git a/buildrelease.bat b/buildrelease.bat
index 64b4f09d8..dc1e8f159 100644
--- a/buildrelease.bat
+++ b/buildrelease.bat
@@ -3,9 +3,6 @@ call setenv.bat
 set START_TIME="%date:~0,10% %time:~0,2%:%time:~3,5%"
 echo start time %START_TIME%
 
-call %JAVA_HOME%/bin/java -version
-call %GRADLE_HOME%/bin/gradle -version
-
 call %GRADLE_HOME%/bin/gradle checkenv
 
 call %GRADLE_HOME%/bin/gradle
diff --git a/maxkey-dao/src/test/resources/spring/applicationContext-database.xml b/maxkey-dao/src/test/resources/spring/applicationContext-database.xml
index a06136dcd..7f6f024e7 100644
--- a/maxkey-dao/src/test/resources/spring/applicationContext-database.xml
+++ b/maxkey-dao/src/test/resources/spring/applicationContext-database.xml
@@ -21,9 +21,9 @@
 	<!-- dataSource configuration -->
 	<bean id="dataSource" class="com.alibaba.druid.pool.DruidDataSource"  destroy-method="close" >      
 	   <!--  <property name="driverClass" value="#{dataSoruceConfig.driverClass}"/>     -->  
-	    <property name="url" value="#{dataSoruceConfig.url}"/>      
-	    <property name="username" value="#{dataSoruceConfig.username}"/>      
-	    <property name="password" value="#{dataSoruceConfig.password}"/>      
+	    <property name="url" value="${config.datasource.url}"/>      
+	    <property name="username" value="${config.datasource.username}"/>      
+	    <property name="password" value="${config.datasource.password}"/>       
 	</bean> 
 
 </beans>
\ No newline at end of file
diff --git a/setenv.bat b/setenv.bat
index e9b47d12a..129a1f23c 100644
--- a/setenv.bat
+++ b/setenv.bat
@@ -2,3 +2,6 @@ echo off
 echo set env
 set JAVA_HOME=D:\JavaIDE\jdk1.8.0_91
 set GRADLE_HOME=D:\JavaIDE\gradle-5.4.1
+
+call %JAVA_HOME%/bin/java -version
+call %GRADLE_HOME%/bin/gradle -version